Move PHPStan extension config file to PHPStan component

lkrms · lkrms · commit 61d99743703d · 2024-08-01T17:43:06.000+10:00
diff --git a/.gitattributes b/.gitattributes
@@ -11,7 +11,6 @@
 /phpstan* export-ignore
 /phpstan-baseline-7.4.neon linguist-generated
 /phpstan-baseline-8.3.neon linguist-generated
-/phpstan.extension.neon -export-ignore
 /phpunit* export-ignore
 /scripts export-ignore
 /src/Toolkit/Cli/CliOptionBuilder.php linguist-generated
diff --git a/composer.json b/composer.json
@@ -119,7 +119,7 @@
     "extra": {
         "phpstan": {
             "includes": [
-                "phpstan.extension.neon"
+                "src/Toolkit/PHPStan/phpstan.extension.neon"
             ]
         }
     }
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 includes:
-	- phpstan.extension.neon
+	- src/Toolkit/PHPStan/phpstan.extension.neon
 	- tests/phpstan-conditional.php
 
 parameters:
diff --git a/src/Toolkit/PHPStan/composer.json b/src/Toolkit/PHPStan/composer.json
@@ -25,5 +25,12 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "extra": {
+        "phpstan": {
+            "includes": [
+                "phpstan.extension.neon"
+            ]
+        }
     }
 }
diff --git a/src/Toolkit/PHPStan/phpstan.extension.neon b/src/Toolkit/PHPStan/phpstan.extension.neon
diff --git a/tests/unit/Toolkit/PHPStan/Type/ReturnTypeExtensionTestCase.php b/tests/unit/Toolkit/PHPStan/Type/ReturnTypeExtensionTestCase.php
@@ -24,6 +24,6 @@ public function testAssertions(): void
      */
     public static function getAdditionalConfigFiles(): array
     {
-        return [TestCase::getPackagePath() . '/phpstan.extension.neon'];
+        return [TestCase::getPackagePath() . '/src/Toolkit/PHPStan/phpstan.extension.neon'];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@`
`119`	`119`	`"extra": {`
`120`	`120`	`"phpstan": {`
`121`	`121`	`"includes": [`
`122`		`- "phpstan.extension.neon"`
	`122`	`+ "src/Toolkit/PHPStan/phpstan.extension.neon"`
`123`	`123`	`]`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,12 @@`
`25`	`25`	`},`
`26`	`26`	`"config": {`
`27`	`27`	`"sort-packages": true`
	`28`	`+ },`
	`29`	`+ "extra": {`
	`30`	`+ "phpstan": {`
	`31`	`+ "includes": [`
	`32`	`+ "phpstan.extension.neon"`
	`33`	`+ ]`
	`34`	`+ }`
`28`	`35`	`}`
`29`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ public function testAssertions(): void`
`24`	`24`	`*/`
`25`	`25`	`public static function getAdditionalConfigFiles(): array`
`26`	`26`	`{`
`27`		`- return [TestCase::getPackagePath() . '/phpstan.extension.neon'];`
	`27`	`+ return [TestCase::getPackagePath() . '/src/Toolkit/PHPStan/phpstan.extension.neon'];`
`28`	`28`	`}`
`29`	`29`	`}`