Merge pull request #7596 from azjezz/chore/enable-psl

vimeo · Feb 20, 2022 · 6cc3da8 · 6cc3da8
2 parents b8cda9e + d47c014
commit 6cc3da8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -71,10 +71,9 @@ jobs:
       - run:
           name: Analyse PHPUnit
           command: bin/test-with-real-projects.sh phpunit
-      # PSL requires its own plugin that is not yet compatible with Psalm 5
-      # - run:
-          # name: Analyse Psl
-          # command: bin/test-with-real-projects.sh psl
+      - run:
+          name: Analyse Psl
+          command: bin/test-with-real-projects.sh psl
       - run:
           name: Analyse Collections
           command: bin/test-with-real-projects.sh collections

diff --git a/bin/test-with-real-projects.sh b/bin/test-with-real-projects.sh
@@ -32,7 +32,7 @@ psl)
 	git clone git@github.com:psalm/endtoend-test-psl.git
 	cd endtoend-test-psl
 	git checkout 1.9.x
-	composer require --dev php-standard-library/psalm-plugin --ignore-platform-reqs
+	composer require --dev php-standard-library/psalm-plugin:^1.1.4 --ignore-platform-reqs
 	cd tools/phpbench && composer install --ignore-platform-reqs && cd ../..
 	"$PSALM" --monochrome --config=tools/psalm/psalm.xml
 	;;