Browse Source

Keep PHPStan as local require-dev.

mscherer 2 years ago
parent
commit
e484a5c3c8
2 changed files with 7 additions and 5 deletions
  1. 0 1
      .phive/phars.xml
  2. 7 4
      composer.json

+ 0 - 1
.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.38" installed="1.10.38" location="./tools/phpstan" copy="false"/>
   <phar name="psalm" version="5.15.0" installed="5.15.0" location="./tools/psalm" copy="false"/>
 </phive>

+ 7 - 4
composer.json

@@ -62,6 +62,9 @@
         "mikey179/vfsstream": "^1.6.10",
         "mockery/mockery": "^1.6",
         "paragonie/csp-builder": "^2.3 || ^3.0",
+        "phpstan/phpstan": "^1.10.30",
+        "phpstan/extension-installer": "^1.3",
+        "symplify/phpstan-rules": "^12.4",
         "phpunit/phpunit": "^10.1.0 <=10.5.3"
     },
     "suggest": {
@@ -122,16 +125,16 @@
         ],
         "cs-check": "phpcs --colors --parallel=16 -p src/ tests/",
         "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
-        "phpstan": "tools/phpstan analyse",
+        "phpstan": "phpstan analyse",
         "psalm": "tools/psalm --show-info=false",
         "stan": [
             "@phpstan",
             "@psalm"
         ],
-        "phpstan-tests": "tools/phpstan analyze -c tests/phpstan.neon",
-        "phpstan-baseline": "tools/phpstan --generate-baseline",
+        "phpstan-tests": "phpstan analyze -c tests/phpstan.neon",
+        "phpstan-baseline": "phpstan --generate-baseline",
         "psalm-baseline": "tools/psalm  --set-baseline=psalm-baseline.xml",
-        "stan-setup": "phive install && cp composer.json composer.backup && composer require --dev phpstan/extension-installer symplify/phpstan-rules && mv composer.backup composer.json",
+        "stan-setup": "phive install",
         "lowest": "validate-prefer-lowest",
         "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
         "test": "phpunit",