Skip to content

Commit

Permalink
Merge pull request #367 from netglue/1.10.x-merge-up-into-2.0.x_YVIGzXOH
Browse files Browse the repository at this point in the history
Merge release 1.10.0 into 2.0.x
  • Loading branch information
gsteel authored Dec 6, 2023
2 parents e9482d1 + 413f8a6 commit 1adb8b5
Show file tree
Hide file tree
Showing 5 changed files with 335 additions and 287 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
name: PHPUnit Coverage
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@2.26.0
- uses: actions/checkout@v4.1.1
- uses: shivammathur/setup-php@2.28.0
with:
php-version: 8.1
extensions: pcov
Expand All @@ -38,8 +38,8 @@ jobs:
runs-on: "ubuntu-latest"

steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@2.26.0
- uses: actions/checkout@v4.1.1
- uses: shivammathur/setup-php@2.28.0
with:
php-version: 8.1
- uses: "ramsey/[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.3": true
"8.3": false
}
}
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,16 @@
"require-dev": {
"ext-curl": "*",
"doctrine/coding-standard": "^12.0",
"laminas/laminas-diactoros": "^3.2.0",
"php-http/cache-plugin": "^1.8",
"php-http/curl-client": "^2.3",
"laminas/laminas-diactoros": "^3.3.0",
"php-http/cache-plugin": "^1.8.1",
"php-http/curl-client": "^2.3.1",
"php-http/mock-client": "^1.6",
"phpunit/phpunit": "^10.3.4",
"phpunit/phpunit": "^10.5.0",
"psalm/plugin-phpunit": "^0.18.4",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.7.2",
"symfony/cache": "^5.4.15 || ^6.3.4",
"symfony/options-resolver": "^5.4.11 || ^6.3",
"vimeo/psalm": "^5.15.0"
"symfony/cache": "^6.4 || ^7.0",
"vimeo/psalm": "^5.16.0"
},
"scripts": {
"check": [
Expand Down
Loading

0 comments on commit 1adb8b5

Please sign in to comment.