diff --git a/.gitattributes b/.gitattributes index 4821ede3..002e7a8b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,5 +7,3 @@ /phpstan.dist.neon export-ignore /phpstan-baseline.neon export-ignore /phpunit.dist.xml export-ignore -/psalm.dist.xml export-ignore -/psalm-baseline.xml export-ignore diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index 0df80d47..09880c56 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -52,31 +52,9 @@ jobs: - name: PHP Coding Standards Fixer run: php-cs-fixer fix --dry-run --format checkstyle | cs2pr - psalm: - runs-on: ubuntu-latest - name: Static Analysis (Psalm) - steps: - - name: Checkout - uses: actions/checkout@v6 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ env.PHP_VERSION }} - coverage: none - tools: psalm - - - name: Install Dependencies - uses: ramsey/composer-install@v3 - with: - composer-options: '--prefer-dist' - - - name: Run Psalm - run: psalm --long-progress --no-diff --output-format=github - phpstan: runs-on: ubuntu-latest - name: Static Analysis (PHPStan) + name: Static Analysis steps: - name: Checkout uses: actions/checkout@v6 diff --git a/.gitignore b/.gitignore index 0ec1cc97..f2a51e48 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,5 @@ vendor/ .phpunit.cache phpunit.xml -# Psalm -psalm.xml +# PHPStan +phpstan.neon diff --git a/composer.json b/composer.json index 19344677..47b0737c 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,6 @@ "run-checks": [ "php-cs-fixer fix -vvv", "phpunit", - "psalm --no-cache", "phpstan" ] }, diff --git a/psalm-baseline.xml b/psalm-baseline.xml deleted file mode 100644 index a69be826..00000000 --- a/psalm-baseline.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - getPath()]]> - - - getPath()]]> - - - - - - - - - - buildRouteParam(...)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - addTag( - name: 'purgatory.expression_language_function', - attributes: [ - 'function' => $attribute->functionName, - 'method' => $reflection instanceof \ReflectionMethod - ? $reflection->name - : ($reflection->hasMethod('__invoke') ? '__invoke' - : throw new RuntimeException(\sprintf('Invalid expression language function, the method "%s::__invoke()" does not exist.', $reflection->name))), - ], - ); - }]]> - addTag( - name: 'purgatory.route_parameter_service', - attributes: [ - 'alias' => $attribute->alias, - 'method' => $reflection instanceof \ReflectionMethod - ? $reflection->name - : ($reflection->hasMethod('__invoke') ? '__invoke' - : throw new RuntimeException(\sprintf('Invalid route parameter service, the method "%s::__invoke()" does not exist.', $reflection->name))), - ], - ); - }]]> - addTag( - name: 'purgatory.purge_on', - attributes: [ - 'class' => $reflection instanceof \ReflectionMethod ? $reflection->class : $reflection->name, - ], - ); - }]]> - - - - - - - - diff --git a/psalm.dist.xml b/psalm.dist.xml deleted file mode 100644 index a0b0001b..00000000 --- a/psalm.dist.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - -