Modernize PHPStan workflow

pmmp · May 31, 2023 · a2f36e8 · a2f36e8
1 parent 04444e3
commit a2f36e8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -36,7 +36,9 @@ jobs:
           restore-keys: "php-${{ matrix.php }}-composer-"
 
       - name: Install PHPStan Composer dependencies
-        run: COMPOSER=phpstan-composer.json composer install --prefer-dist --no-interaction
+        working-directory: phpstan
+        run: composer install --prefer-dist --no-interaction
 
       - name: Run PHPStan
+        working-directory: phpstan
         run: vendor/bin/phpstan analyze
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .idea/
 *.phar
-/vendor
-/phpstan-composer.lock
-/phpstan.neon
+/vendor/
+/phpstan/vendor
+/phpstan/composer.lock
+/phpstan/phpstan.neon
diff --git a/phpstan-composer.json → phpstan/composer.json b/phpstan-composer.json → phpstan/composer.json
@@ -1,14 +1,14 @@
 {
    "name": "pocketmine/phpstan-plugin-config",
    "require": {
-      "phpstan/phpstan": "1.2.0",
-      "pocketmine/pocketmine-mp": "^4.0.0",
+      "phpstan/phpstan": "^1.10.0",
+      "pocketmine/pocketmine-mp": "4.0.0",
       "phpstan/phpstan-strict-rules": "^1.0.0",
       "phpstan/extension-installer": "^1.0"
    },
    "autoload": {
       "psr-4": {
-         "DevTools\\": "./src"
+         "DevTools\\": "../src"
       }
    },
    "config": {

diff --git a/phpstan.neon.dist → phpstan/phpstan.neon.dist b/phpstan.neon.dist → phpstan/phpstan.neon.dist
@@ -1,6 +1,6 @@
 parameters:
 	level: 6
 	paths:
-		- src
+		- ../src
 	scanFiles:
-		- src/ConsoleScript.php
+		- ../src/ConsoleScript.php