diff --git a/.gitattributes b/.gitattributes index 05c24c5..2a3f0bd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,5 @@ /phpcs.xml.dist export-ignore /phpstan.neon.dist export-ignore /phpunit.xml.dist export-ignore -/psalm.xml.dist export-ignore /renovate.json export-ignore /tests export-ignore diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f32eb75..d285ec8 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -28,29 +28,3 @@ jobs: - name: "Run a static analysis with phpstan/phpstan" run: "vendor/bin/phpstan --error-format=checkstyle | cs2pr" - - static-analysis-psalm: - name: "Static Analysis with Psalm" - runs-on: "ubuntu-22.04" - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: "Install PHP" - uses: "shivammathur/setup-php@v2" - with: - coverage: "none" - php-version: "${{ matrix.php-version }}" - tools: "cs2pr" - - - name: "Install dependencies with Composer" - uses: "ramsey/composer-install@v1" - - - name: "Run a static analysis with vimeo/psalm" - run: "vendor/bin/psalm --output-format=github --shepherd --taint-analysis --report=results.sarif" - - - name: Upload Security Analysis results to GitHub - uses: github/codeql-action/upload-sarif@v3 - with: - sarif_file: results.sarif diff --git a/.gitignore b/.gitignore index 0fb3701..6f24d73 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ /phpcs.xml /phpstan.neon /phpunit.xml -/psalm.xml /vendor/ diff --git a/composer.json b/composer.json index 15a2c34..1aed1b3 100644 --- a/composer.json +++ b/composer.json @@ -26,9 +26,7 @@ "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^10.4", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.0" + "phpunit/phpunit": "^10.4" }, "autoload": { "psr-4": { diff --git a/psalm.xml.dist b/psalm.xml.dist deleted file mode 100644 index 76933f8..0000000 --- a/psalm.xml.dist +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/src/ClassExtractor.php b/src/ClassExtractor.php index 78385d0..a5e5ce9 100644 --- a/src/ClassExtractor.php +++ b/src/ClassExtractor.php @@ -68,7 +68,7 @@ public static function all(string $filePathName): array } $className = $tokens[$i][1]; - /** @psalm-var class-string $fqn */ + /** @phpstan-var class-string $fqn */ $fqn = $namespace . '\\' . $className; $classes[] = $fqn; } diff --git a/src/EnumExtractor.php b/src/EnumExtractor.php index 0b8f9c6..f5aca78 100644 --- a/src/EnumExtractor.php +++ b/src/EnumExtractor.php @@ -68,7 +68,7 @@ public static function all(string $filePathName): array } $enumName = $tokens[$i][1]; - /** @psalm-var class-string $fqn */ + /** @phpstan-var class-string $fqn */ $fqn = $namespace . '\\' . $enumName; $enums[] = $fqn; }