Skip to content

Commit

Permalink
Merge pull request #82 from gsteel/psalm-5.22
Browse files Browse the repository at this point in the history
Upgrade Psalm to 5.22.x, Re-enable a number of tests
  • Loading branch information
Ocramius committed Mar 8, 2024
2 parents cbcd9f7 + 580685a commit 16876aa
Show file tree
Hide file tree
Showing 22 changed files with 918 additions and 933 deletions.
68 changes: 66 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,69 @@ on:
tags:

jobs:
ci:
uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
matrix:
name: Generate job matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.matrix.outputs.matrix }}
steps:
- name: Gather CI configuration
id: matrix
uses: laminas/laminas-ci-matrix-action@v1

qa:
name: QA Checks
needs: [matrix]
runs-on: ${{ matrix.operatingSystem }}
services:
mongo:
image: mongo
mysql:
image: mysql:8
env:
MYSQL_ROOT_PASSWORD: 'password'
MYSQL_ROOT_HOST: '%'
MYSQL_USER: 'gha'
MYSQL_PASSWORD: 'password'
MYSQL_DATABASE: 'laminas_session'
options: >-
--health-cmd="mysqladmin ping"
--health-interval 10s
--health-timeout 5s
--health-retries 3
ports:
- 3306
postgres:
image: postgres
env:
POSTGRES_USER: 'gha'
POSTGRES_PASSWORD: 'password'
POSTGRES_DB: 'laminas_session'
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 3
ports:
- 5432
strategy:
fail-fast: false
matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
steps:
- name: ${{ matrix.name }}
uses: laminas/laminas-continuous-integration-action@v1
with:
job: ${{ matrix.job }}
env:
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB: true
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB_CONNECTION_STRING: mongodb://mongo/
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL: true
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_HOSTNAME: mysql
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_USERNAME: gha
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_PASSWORD: password
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_DATABASE: laminas_session
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL: true
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_HOSTNAME: postgres
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_USERNAME: gha
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_PASSWORD: password
TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_DATABASE: laminas_session
8 changes: 5 additions & 3 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
"extensions": [
"mongodb",
"mysql",
"pgsql"
"pgsql",
"xdebug"
],
"ignore_php_platform_requirements": {
"8.3": true
}
"8.3": false
},
"backwardCompatibilityCheck": true
}
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@
"laminas/laminas-stdlib": "^3.18"
},
"require-dev": {
"laminas/laminas-cache": "^3.12.0",
"ext-xdebug": "*",
"laminas/laminas-cache": "^3.12.1",
"laminas/laminas-cache-storage-adapter-memory": "^2.3",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-db": "^2.18.0",
"laminas/laminas-db": "^2.19.0",
"laminas/laminas-http": "^2.19",
"laminas/laminas-validator": "^2.46.0",
"laminas/laminas-validator": "^2.49.0",
"mongodb/mongodb": "~1.17.0",
"phpunit/phpunit": "^9.6.15",
"phpunit/phpunit": "^9.6.17",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.18"
"vimeo/psalm": "^5.22.2"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component",
Expand Down
Loading

0 comments on commit 16876aa

Please sign in to comment.