Skip to content

Commit

Permalink
Merge pull request #114 from laminas/renovate/laminas
Browse files Browse the repository at this point in the history
Dropped PHP 7.3 support, update dependency laminas/laminas-coding-standard to ^2.4.0, removed prophecy mocks
  • Loading branch information
Ocramius authored Aug 25, 2022
2 parents ae65bbf + 5d5cd33 commit de9cd9c
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 217 deletions.
10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"sort-packages": true,
"platform": {
"php": "7.3.99"
"php": "7.4.99"
}
},
"extra": {
Expand All @@ -34,7 +34,7 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
Expand All @@ -44,10 +44,9 @@
"ext-gd": "*",
"ext-libxml": "*",
"http-interop/http-factory-tests": "^0.9.0",
"laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-coding-standard": "^2.4.0",
"php-http/psr7-integration-tests": "^1.1.1",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.5.23",
"psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.24.0"
},
Expand All @@ -56,7 +55,6 @@
"psr/http-message-implementation": "1.0"
},
"conflict": {
"phpspec/prophecy": "<1.9.0",
"zendframework/zend-diactoros": "*"
},
"autoload": {
Expand Down
153 changes: 18 additions & 135 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.24.0@06dd975cb55d36af80f242561738f16c5f58264f">
<files psalm-version="4.26.0@6998fabb2bf528b65777bf9941920888d23c03ac">
<file src="src/CallbackStream.php">
<ImplementedReturnTypeMismatch occurrences="1">
<code>null|callable</code>
Expand Down
Loading

0 comments on commit de9cd9c

Please sign in to comment.