Revert "Issue #249: Switch phpstan to include phpstan.neon.dist (#627)"

This reverts commit cd5d5f6.
Lullabot · Aug 8, 2024 · ef469c6 · ef469c6
1 parent c3e6bb1
commit ef469c6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/TestStatic.yml b/.github/workflows/TestStatic.yml
@@ -53,7 +53,6 @@ jobs:
       - name: Verify files were created
         run: |
           test -f phpcs.xml.dist
-          test -f phpstan.neon.dist
 
       - name: Fix settings.php
         run: |

diff --git a/drainpipe-dev/composer.json b/drainpipe-dev/composer.json
@@ -48,8 +48,7 @@
                 "[web-root]/sites/sites.php": "scaffold/nightwatch/sites.php",
                 "[project-root]/.ddev/docker-compose.selenium.yaml": "scaffold/nightwatch/docker-compose.selenium.yaml",
                 "[project-root]/test/nightwatch/example.nightwatch.js": "scaffold/nightwatch/example.nightwatch.js",
-                "[project-root]/phpcs.xml.dist": "scaffold/phpcs.xml.dist",
-                "[project-root]/phpstan.neon.dist": "scaffold/phpstan.neon.dist"
+                "[project-root]/phpcs.xml.dist": "scaffold/phpcs.xml.dist"
             }
         }
     },

diff --git a/drainpipe-dev/scaffold/phpstan.neon.dist → drainpipe-dev/config/phpstan.neon b/drainpipe-dev/scaffold/phpstan.neon.dist → drainpipe-dev/config/phpstan.neon
@@ -1,6 +1,6 @@
 includes:
-    - ./vendor/mglaman/phpstan-drupal/extension.neon
-    - ./vendor/phpstan/phpstan-deprecation-rules/rules.neon
+    - ../../../mglaman/phpstan-drupal/extension.neon
+    - ../../../phpstan/phpstan-deprecation-rules/rules.neon
 
 parameters:
     excludePaths:

diff --git a/tasks/test.yml b/tasks/test.yml
@@ -92,11 +92,15 @@ tasks:
       - |
         {{ .FUNC_ENSURE_DIRS }}
       - |
+        CONFIG="phpstan.neon"
+        if [ ! -f phpstan.neon ]; then
+          CONFIG="vendor/lullabot/drainpipe/scaffold/phpstan.neon"
+        fi
         if [ "{{.format}}" == "junit" ]; then
           mkdir -p test_result
-          ./vendor/bin/phpstan analyse --error-format=junit {{.TEST_DIRS}} > test_result/phpstan.xml
+          ./vendor/bin/phpstan analyse --error-format=junit -c $CONFIG {{.TEST_DIRS}} > test_result/phpstan.xml
         else
-          ./vendor/bin/phpstan analyse {{.TEST_DIRS}}
+          ./vendor/bin/phpstan analyse -c $CONFIG {{.TEST_DIRS}}
         fi
   phpunit:
     desc: Runs PHPUnit