diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9d82ac..3cef90d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' tools: composer:v2 coverage: none env: @@ -77,7 +77,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' tools: composer:v2, cs2pr coverage: none env: @@ -132,7 +132,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['8.1', '8.2', '8.3', '8.4', '8.5'] + php: ['8.2', '8.3', '8.4', '8.5'] deps: ['high', 'low', 'stable'] exclude: - php: 8.4 diff --git a/composer.json b/composer.json index 8eecb96..fc30228 100644 --- a/composer.json +++ b/composer.json @@ -26,10 +26,10 @@ } ], "require": { - "php": "^8", + "php": "^8.2", "composer-runtime-api": "^2", "psalm/psalm-plugin-api": "^0.4", - "vimeo/psalm": "^7|dev-master" + "vimeo/psalm": "^7.0.0-rc28|dev-master" }, "conflict": { "doctrine/collections": "<1.8", diff --git a/tests/acceptance/Tainting.feature b/tests/acceptance/Tainting.feature index 918f02d..5899fbd 100644 --- a/tests/acceptance/Tainting.feature +++ b/tests/acceptance/Tainting.feature @@ -107,12 +107,9 @@ Feature: Tainting Scenario Outline: A result of an ORM query is printed Given I have the following code """ - /** - * @psalm-suppress InvalidReturnType - * @return \Doctrine\ORM\Query - * @psalm-capabilities read-props - */ - function query() {} + function query(): \Doctrine\ORM\Query { + throw new \RuntimeException(); + } echo (string) ; """