diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 1e43a0eb7..690f97032 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -9,26 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.1.0 - - name: Change PHP version - run: | - sudo update-alternatives --set php /usr/bin/php8.0 - sudo update-alternatives --set phar /usr/bin/phar8.0 - sudo update-alternatives --set phpdbg /usr/bin/phpdbg8.0 - sudo update-alternatives --set php-cgi /usr/bin/php-cgi8.0 - sudo update-alternatives --set phar.phar /usr/bin/phar.phar8.0 - php -version - - name: Validate composer.json and composer.lock - run: composer validate - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v3.0.11 + + - name: Install composer + uses: php-actions/composer@v6 + + - name: Run PHPStan + uses: php-actions/phpstan@v3 with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- - - name: Install dependencies - if: steps.composer-cache.outputs.cache-hit != 'true' - run: composer install --prefer-dist --no-progress --no-suggest - - name: Run phpstan - run: composer run-script phpstan + configuration: phpstan.neon.dist + memory_limit: 256M + diff --git a/composer.json b/composer.json index 119e8c2eb..e14afd814 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "Pi-hole Dashboard for stats and more", "require": { "php": ">=5.4", - "phpstan/phpstan": "^0.12.42" + "phpstan/phpstan": "1.*" }, "license": "EUPL-1.2", "minimum-stability": "stable", @@ -12,8 +12,5 @@ "files": [ "scripts/vendor/qrcode.php" ] - }, - "scripts": { - "phpstan": "vendor/phpstan/phpstan/phpstan analyse -c phpstan.neon.dist" } } diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 63d892854..6f5fe642a 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,6 +1,6 @@ parameters: level: 0 - excludes_analyse: + excludePaths: - vendor scanDirectories: - .