sirbrillig · sirbrillig · Apr 23, 2020 · Apr 19, 2020 · Apr 19, 2020 · Apr 20, 2020
diff --git a/.gitattributes b/.gitattributes
@@ -13,7 +13,7 @@
 /phpunit.xml.dist export-ignore
 /phpunit.circleci.xml export-ignore
 /.circleci/ export-ignore
-/VariableAnalysis/Tests/ export-ignore
+/Tests/ export-ignore
 
 #
 # Auto detect text files and perform LF normalization

diff --git a/VariableAnalysis/Tests/BaseTestCase.php → Tests/BaseTestCase.php b/VariableAnalysis/Tests/BaseTestCase.php → Tests/BaseTestCase.php
@@ -8,7 +8,7 @@
 
 class BaseTestCase extends TestCase {
   const STANDARD_NAME = 'VariableAnalysis';
-  const SNIFF_FILE = __DIR__ . '/../Sniffs/CodeAnalysis/VariableAnalysisSniff.php';
+  const SNIFF_FILE = __DIR__ . '/../VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php';
 
   public function prepareLocalFileForSniffs($fixtureFile) {
     $config            = new Config();
@@ -41,6 +41,6 @@ public function getErrorLineNumbersFromFile(LocalFile $phpcsFile) {
   }
 
   public function getFixture($fixtureFilename) {
-    return realpath(__DIR__ . '/CodeAnalysis/fixtures/' . $fixtureFilename);
+    return realpath(__DIR__ . '/VariableAnalysisSniff/fixtures/' . $fixtureFilename);
   }
 }
diff --git a/...sts/CodeAnalysis/VariableAnalysisTest.php → ...bleAnalysisSniff/VariableAnalysisTest.php b/...sts/CodeAnalysis/VariableAnalysisTest.php → ...bleAnalysisSniff/VariableAnalysisTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace VariableAnalysis\Tests\CodeAnalysis;
+namespace VariableAnalysis\Tests\VariableAnalysisSniff;
 
 use VariableAnalysis\Tests\BaseTestCase;
 

diff --git a/...alysis/fixtures/AnonymousClassFixture.php → ...sSniff/fixtures/AnonymousClassFixture.php b/...alysis/fixtures/AnonymousClassFixture.php → ...sSniff/fixtures/AnonymousClassFixture.php
diff --git a/...s/AnonymousClassWithPropertiesFixture.php → ...s/AnonymousClassWithPropertiesFixture.php b/...s/AnonymousClassWithPropertiesFixture.php → ...s/AnonymousClassWithPropertiesFixture.php
diff --git a/...fixtures/AssignmentByReferenceFixture.php → ...fixtures/AssignmentByReferenceFixture.php b/...fixtures/AssignmentByReferenceFixture.php → ...fixtures/AssignmentByReferenceFixture.php
diff --git a/...alysis/fixtures/ClassReferenceFixture.php → ...sSniff/fixtures/ClassReferenceFixture.php b/...alysis/fixtures/ClassReferenceFixture.php → ...sSniff/fixtures/ClassReferenceFixture.php
diff --git a/...ysis/fixtures/ClassWithMembersFixture.php → ...niff/fixtures/ClassWithMembersFixture.php b/...ysis/fixtures/ClassWithMembersFixture.php → ...niff/fixtures/ClassWithMembersFixture.php
diff --git a/.../CodeAnalysis/fixtures/CompactFixture.php → ...AnalysisSniff/fixtures/CompactFixture.php b/.../CodeAnalysis/fixtures/CompactFixture.php → ...AnalysisSniff/fixtures/CompactFixture.php
diff --git a/...nalysis/fixtures/DestructuringFixture.php → ...isSniff/fixtures/DestructuringFixture.php b/...nalysis/fixtures/DestructuringFixture.php → ...isSniff/fixtures/DestructuringFixture.php
diff --git a/...s/fixtures/FunctionWithClosureFixture.php → ...f/fixtures/FunctionWithClosureFixture.php b/...s/fixtures/FunctionWithClosureFixture.php → ...f/fixtures/FunctionWithClosureFixture.php
diff --git a/...tures/FunctionWithDefaultParamFixture.php → ...tures/FunctionWithDefaultParamFixture.php b/...tures/FunctionWithDefaultParamFixture.php → ...tures/FunctionWithDefaultParamFixture.php
diff --git a/...s/fixtures/FunctionWithForeachFixture.php → ...f/fixtures/FunctionWithForeachFixture.php b/...s/fixtures/FunctionWithForeachFixture.php → ...f/fixtures/FunctionWithForeachFixture.php
diff --git a/...fixtures/FunctionWithGlobalVarFixture.php → ...fixtures/FunctionWithGlobalVarFixture.php b/...fixtures/FunctionWithGlobalVarFixture.php → ...fixtures/FunctionWithGlobalVarFixture.php
diff --git a/...tures/FunctionWithInlineAssignFixture.php → ...tures/FunctionWithInlineAssignFixture.php b/...tures/FunctionWithInlineAssignFixture.php → ...tures/FunctionWithInlineAssignFixture.php
diff --git a/...res/FunctionWithRedeclarationsFixture.php → ...res/FunctionWithRedeclarationsFixture.php b/...res/FunctionWithRedeclarationsFixture.php → ...res/FunctionWithRedeclarationsFixture.php
diff --git a/...fixtures/FunctionWithReferenceFixture.php → ...fixtures/FunctionWithReferenceFixture.php b/...fixtures/FunctionWithReferenceFixture.php → ...fixtures/FunctionWithReferenceFixture.php
diff --git a/.../fixtures/FunctionWithTryCatchFixture.php → .../fixtures/FunctionWithTryCatchFixture.php b/.../fixtures/FunctionWithTryCatchFixture.php → .../fixtures/FunctionWithTryCatchFixture.php
diff --git a/...tures/FunctionWithUnusedParamsFixture.php → ...tures/FunctionWithUnusedParamsFixture.php b/...tures/FunctionWithUnusedParamsFixture.php → ...tures/FunctionWithUnusedParamsFixture.php
diff --git a/...tures/FunctionWithUseReferenceFixture.php → ...tures/FunctionWithUseReferenceFixture.php b/...tures/FunctionWithUseReferenceFixture.php → ...tures/FunctionWithUseReferenceFixture.php
diff --git a/...tures/FunctionWithVariableCallFixture.php → ...tures/FunctionWithVariableCallFixture.php b/...tures/FunctionWithVariableCallFixture.php → ...tures/FunctionWithVariableCallFixture.php
diff --git a/.../fixtures/FunctionWithoutParamFixture.php → .../fixtures/FunctionWithoutParamFixture.php b/.../fixtures/FunctionWithoutParamFixture.php → .../fixtures/FunctionWithoutParamFixture.php
diff --git a/...fixtures/FunctionsOutsideClassFixture.php → ...fixtures/FunctionsOutsideClassFixture.php b/...fixtures/FunctionsOutsideClassFixture.php → ...fixtures/FunctionsOutsideClassFixture.php
diff --git a/...alysis/fixtures/GetDefinedVarsFixture.php → ...sSniff/fixtures/GetDefinedVarsFixture.php b/...alysis/fixtures/GetDefinedVarsFixture.php → ...sSniff/fixtures/GetDefinedVarsFixture.php
diff --git a/.../CodeAnalysis/fixtures/HeredocFixture.php → ...AnalysisSniff/fixtures/HeredocFixture.php b/.../CodeAnalysis/fixtures/HeredocFixture.php → ...AnalysisSniff/fixtures/HeredocFixture.php
diff --git a/...eAnalysis/fixtures/PregReplaceFixture.php → ...ysisSniff/fixtures/PregReplaceFixture.php b/...eAnalysis/fixtures/PregReplaceFixture.php → ...ysisSniff/fixtures/PregReplaceFixture.php
diff --git a/...es/ThisWithinNestedClosedScopeFixture.php → ...es/ThisWithinNestedClosedScopeFixture.php b/...es/ThisWithinNestedClosedScopeFixture.php → ...es/ThisWithinNestedClosedScopeFixture.php
diff --git a/...ts/CodeAnalysis/fixtures/TraitFixture.php → ...leAnalysisSniff/fixtures/TraitFixture.php b/...ts/CodeAnalysis/fixtures/TraitFixture.php → ...leAnalysisSniff/fixtures/TraitFixture.php
diff --git a/...ysis/fixtures/TraitWithMembersFixture.php → ...niff/fixtures/TraitWithMembersFixture.php b/...ysis/fixtures/TraitWithMembersFixture.php → ...niff/fixtures/TraitWithMembersFixture.php
diff --git a/...s/fixtures/TraitWithPropertiesFixture.php → ...f/fixtures/TraitWithPropertiesFixture.php b/...s/fixtures/TraitWithPropertiesFixture.php → ...f/fixtures/TraitWithPropertiesFixture.php
diff --git a/...lysis/fixtures/UnusedAfterUsedFixture.php → ...Sniff/fixtures/UnusedAfterUsedFixture.php b/...lysis/fixtures/UnusedAfterUsedFixture.php → ...Sniff/fixtures/UnusedAfterUsedFixture.php
diff --git a/...nalysis/fixtures/UnusedForeachFixture.php → ...isSniff/fixtures/UnusedForeachFixture.php b/...nalysis/fixtures/UnusedForeachFixture.php → ...isSniff/fixtures/UnusedForeachFixture.php
diff --git a/...tures/UnusedVarWithValueChangeFixture.php → ...tures/UnusedVarWithValueChangeFixture.php b/...tures/UnusedVarWithValueChangeFixture.php → ...tures/UnusedVarWithValueChangeFixture.php
diff --git a/...sis/fixtures/VariableVariablesFixture.php → ...iff/fixtures/VariableVariablesFixture.php b/...sis/fixtures/VariableVariablesFixture.php → ...iff/fixtures/VariableVariablesFixture.php
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+require_once(__DIR__ . '/../vendor/squizlabs/php_codesniffer/tests/bootstrap.php');
+require_once(__DIR__ . '/BaseTestCase.php');
diff --git a/VariableAnalysis/Tests/bootstrap.php b/VariableAnalysis/Tests/bootstrap.php
diff --git a/composer.circleci.json b/composer.circleci.json
@@ -26,6 +26,11 @@
             "VariableAnalysis\\": "VariableAnalysis/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "VariableAnalysis\\Tests\\": "Tests/"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {

diff --git a/composer.json b/composer.json
@@ -26,6 +26,11 @@
             "VariableAnalysis\\": "VariableAnalysis/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "VariableAnalysis\\Tests\\": "Tests/"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -1,14 +1,9 @@
 <?xml version="1.0"?>
 <ruleset name="PaytonsStandard">
-    <description>
-        Originally from https://gist.github.com/Ovsyanka/e2ab2ff76e7c0d7e75a1e4213a03ff95
-        PSR2 with changes:
-            - bracers on end of line instead new line
-            - two space indentation
-    </description>
-
     <file>./VariableAnalysis/</file>
-    <exclude-pattern>./VariableAnalysis/Tests/CodeAnalysis/fixtures/</exclude-pattern>
+    <file>./Tests/</file>
+    <exclude-pattern>./Tests/VariableAnalysisSniff/fixtures/</exclude-pattern>
+    <exclude-pattern>./vendor/</exclude-pattern>
 
     <!-- Only check PHP files. -->
     <arg name="extensions" value="php"/>

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,6 +6,6 @@ parameters:
   paths:
     - %currentWorkingDirectory%/VariableAnalysis/
   excludes_analyse:
-    - %currentWorkingDirectory%/VariableAnalysis/Tests/
+    - %currentWorkingDirectory%/Tests/
   ignoreErrors:
     - '~^Constant T_\w+ not found.$~'
diff --git a/phpunit.circleci.xml b/phpunit.circleci.xml
@@ -1,9 +1,9 @@
 <phpunit
-	bootstrap="VariableAnalysis/Tests/bootstrap.php"
+	bootstrap="Tests/bootstrap.php"
 	>
 	<testsuites>
 		<testsuite name="VariableAnalysis">
-			<directory>VariableAnalysis/Tests</directory>
+			<directory>Tests</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,10 @@
 <phpunit
-	bootstrap="VariableAnalysis/Tests/bootstrap.php"
+	bootstrap="Tests/bootstrap.php"
 	printerClass="LimeDeck\Testing\Printer"
 	>
 	<testsuites>
 		<testsuite name="VariableAnalysis">
-			<directory>VariableAnalysis/Tests</directory>
+			<directory>Tests</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>