Merge pull request #1169 from phpDocumentor/backport/1.x/pr-1168

Backport/1.x/pr 1168

Author: jaapio

.github/workflows/integrate.yaml

@@ -49,7 +49,7 @@ jobs:
 
   static-analysis:
     name: "Static analysis"
-    uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.6"
+    uses: "phpDocumentor/.github/.github/workflows/static-analysis.yml@v0.8"
     with:
       php-version: "8.2"
       composer-root-version: "1.x-dev"

Makefile

@@ -13,7 +13,7 @@ fix-code-style: add-license
 	$(PHP_BIN) vendor/bin/phpcbf
 
 .PHONY: static-code-analysis
-static-code-analysis: vendor phpstan psalm test-architecture ## Runs a static code analysis with phpstan/phpstan and vimeo/psalm
+static-code-analysis: vendor phpstan test-architecture ## Runs a static code analysis with phpstan/phpstan and vimeo/psalm
 
 .PHONY: phpstan-baseline
 phpstan-baseline:
@@ -23,10 +23,6 @@ phpstan-baseline:
 phpstan:
 	$(PHP_BIN) -d memory_limit=1024M vendor/bin/phpstan --configuration=phpstan.neon
 
-.PHONY: psalm
-psalm:
-	$(PHP_BIN) vendor/bin/psalm --update-baseline
-
 .PHONY: test
 test: test-unit test-functional test-integration test-xml test-docs## Runs all test suites with phpunit/phpunit
 

composer.json

@@ -63,13 +63,11 @@
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpstan/phpstan-webmozart-assert": "^1.2",
         "phpunit/phpunit": "^10.5",
-        "psalm/plugin-phpunit": "^0.18.4",
         "qossmic/deptrac-shim": "^1.0.2",
         "rector/rector": "^1.0.1",
         "squizlabs/php_codesniffer": "^3.9",
         "symfony/finder": "^6.4.0 || ^7.0",
-        "symplify/phpstan-rules": "^12.4",
-        "vimeo/psalm": "^5.22"
+        "symplify/phpstan-rules": "^12.4"
     },
     "suggest": {
         "league/csv:": "To use the CSV tables"