Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 3 additions & 6 deletions tests/acceptance/Tainting.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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) <expression>;
"""
Expand Down
Loading