Merge test libs dir into src (#227)

I couldn't tell where to put this file and that file and it makes no sense to have two locations to always decide one. Includes @ondrejmirtes' solution for phpstan/phpstan#10268 cherry-picked from #226, thanks!
spaze · Dec 9, 2023 · 67ea78d · 67ea78d
2 parents f0a6f69 + 007ee6c
commit 67ea78d
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 50 deletions.
diff --git a/composer.json b/composer.json
@@ -36,6 +36,9 @@
 	"autoload": {
 		"psr-4": {"Spaze\\PHPStan\\Rules\\Disallowed\\": "src"}
 	},
+	"autoload-dev": {
+		"classmap": ["tests/src"]
+	},
 	"scripts": {
 		"lint": "vendor/bin/parallel-lint --colors src/ tests/",
 		"lint-7.x": "vendor/bin/parallel-lint --colors src/ tests/ --exclude tests/src/TypesEverywhere.php --exclude tests/src/disallowed/functionCallsNamedParams.php --exclude tests/src/disallowed-allow/functionCallsNamedParams.php --exclude tests/src/disallowed/attributeUsages.php --exclude tests/src/disallowed-allow/attributeUsages.php",

diff --git a/phpcs.xml b/phpcs.xml
@@ -10,5 +10,5 @@
 		<exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall" />
 		<exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration" />
 	</rule>
-	<exclude-pattern>tests/libs/</exclude-pattern>
+	<exclude-pattern>tests/src/</exclude-pattern>
 </ruleset>
diff --git a/tests/BootstrapTest.php b/tests/BootstrapTest.php
diff --git a/tests/Calls/FunctionCallsAllowInFunctionsTest.php b/tests/Calls/FunctionCallsAllowInFunctionsTest.php
@@ -43,7 +43,7 @@ protected function getRule(): Rule
 	public function testRule(): void
 	{
 		// Based on the configuration above, in this file:
-		$this->analyse([__DIR__ . '/../libs/Functions.php'], [
+		$this->analyse([__DIR__ . '/../src/Functions.php'], [
 			[
 				// expect this error message:
 				'Calling sha1() is forbidden. [sha1() matches sha*()]',

diff --git a/tests/Calls/FunctionCallsAllowInMethodsTest.php b/tests/Calls/FunctionCallsAllowInMethodsTest.php
@@ -52,7 +52,7 @@ protected function getRule(): Rule
 	public function testRule(): void
 	{
 		// Based on the configuration above, in this file:
-		$this->analyse([__DIR__ . '/../libs/Royale.php'], [
+		$this->analyse([__DIR__ . '/../src/Royale.php'], [
 			[
 				// expect this error message:
 				'Calling sha1() is forbidden.',

diff --git a/tests/Calls/FunctionCallsDefinedInTest.php b/tests/Calls/FunctionCallsDefinedInTest.php
@@ -25,15 +25,15 @@ protected function getRule(): Rule
 			[
 				[
 					'function' => '\\Foo\\Bar\\Waldo\\f*()',
-					'definedIn' => __DIR__ . '/../libs/Fun*.php',
+					'definedIn' => __DIR__ . '/../src/Fun*.php',
 					'allowIn' => [
 						__DIR__ . '/../src/disallowed-allow/*.php',
 						__DIR__ . '/../src/*-allow/*.*',
 					],
 				],
 				[
 					'function' => '\\Foo\\Bar\\Waldo\\b*()',
-					'definedIn' => __DIR__ . '/../libs/ThisFileDoesNotExist.php',
+					'definedIn' => __DIR__ . '/../src/ThisFileDoesNotExist.php',
 					'allowIn' => [
 						__DIR__ . '/../src/disallowed-allow/*.php',
 						__DIR__ . '/../src/*-allow/*.*',

diff --git a/tests/Calls/MethodCallsDefinedInTest.php b/tests/Calls/MethodCallsDefinedInTest.php
@@ -24,7 +24,7 @@ protected function getRule(): Rule
 			[
 				[
 					'method' => '*',
-					'definedIn' => __DIR__ . '/../libs/Bl*',
+					'definedIn' => __DIR__ . '/../src/Bl*',
 					'allowIn' => [
 						__DIR__ . '/../src/disallowed-allow/*.php',
 						__DIR__ . '/../src/*-allow/*.*',

diff --git a/tests/Calls/NewCallsDefinedInTest.php b/tests/Calls/NewCallsDefinedInTest.php
@@ -24,7 +24,7 @@ protected function getRule(): Rule
 			[
 				[
 					'method' => '*',
-					'definedIn' => __DIR__ . '/../libs/Bl*',
+					'definedIn' => __DIR__ . '/../src/Bl*',
 					'allowIn' => [
 						__DIR__ . '/../src/disallowed-allow/*.php',
 						__DIR__ . '/../src/*-allow/*.*',

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,17 +2,3 @@
 declare(strict_types = 1);
 
 require __DIR__ . '/../vendor/autoload.php';
-require __DIR__ . '/libs/AttributeClass.php';
-require __DIR__ . '/libs/AttributeEntity.php';
-require __DIR__ . '/libs/Bar.php';
-require __DIR__ . '/libs/Blade.php';
-require __DIR__ . '/libs/Constructor.php';
-require __DIR__ . '/libs/Functions.php';
-require __DIR__ . '/libs/Inheritance.php';
-require __DIR__ . '/libs/Interfaces.php';
-require __DIR__ . '/libs/Option.php';
-require __DIR__ . '/libs/Royale.php';
-require __DIR__ . '/libs/SomeInterface.php';
-require __DIR__ . '/libs/TestException.php';
-require __DIR__ . '/libs/TestTrait.php';
-require __DIR__ . '/libs/Traits.php';
diff --git a/tests/libs/AttributeClass.php → tests/src/AttributeClass.php b/tests/libs/AttributeClass.php → tests/src/AttributeClass.php
diff --git a/tests/libs/AttributeEntity.php → tests/src/AttributeEntity.php b/tests/libs/AttributeEntity.php → tests/src/AttributeEntity.php
diff --git a/tests/libs/Bar.php → tests/src/Bar.php b/tests/libs/Bar.php → tests/src/Bar.php
diff --git a/tests/libs/Blade.php → tests/src/Blade.php b/tests/libs/Blade.php → tests/src/Blade.php
diff --git a/tests/libs/Constructor.php → tests/src/Constructor.php b/tests/libs/Constructor.php → tests/src/Constructor.php
diff --git a/tests/libs/Functions.php → tests/src/Functions.php b/tests/libs/Functions.php → tests/src/Functions.php
diff --git a/tests/libs/Inheritance.php → tests/src/Inheritance.php b/tests/libs/Inheritance.php → tests/src/Inheritance.php
diff --git a/tests/libs/Interfaces.php → tests/src/Interfaces.php b/tests/libs/Interfaces.php → tests/src/Interfaces.php
diff --git a/tests/libs/Option.php → tests/src/Option.php b/tests/libs/Option.php → tests/src/Option.php
diff --git a/tests/libs/Royale.php → tests/src/Royale.php b/tests/libs/Royale.php → tests/src/Royale.php
diff --git a/tests/libs/SomeInterface.php → tests/src/SomeInterface.php b/tests/libs/SomeInterface.php → tests/src/SomeInterface.php
diff --git a/tests/libs/TestException.php → tests/src/TestException.php b/tests/libs/TestException.php → tests/src/TestException.php
diff --git a/tests/libs/TestTrait.php → tests/src/TestTrait.php b/tests/libs/TestTrait.php → tests/src/TestTrait.php
diff --git a/tests/libs/Traits.php → tests/src/Traits.php b/tests/libs/Traits.php → tests/src/Traits.php