From 851aab97eee7ee07b79689fa31ac0b57dd6b436e Mon Sep 17 00:00:00 2001 From: azjezz Date: Sun, 6 Feb 2022 19:35:25 +0100 Subject: [PATCH] chore: enable psl tests again Signed-off-by: azjezz --- .circleci/config.yml | 7 +++---- bin/test-with-real-projects.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 076772c419e..edb010e442f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,10 +68,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 index 0419d304d56..eb4e84d300b 100755 --- 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 ;;