Skip to content

Commit

Permalink
Merge pull request #45 from laminas/2.6.x-merge-up-into-2.7.x_wQBkQdn9
Browse files Browse the repository at this point in the history
Merge release 2.6.1 into 2.7.x
  • Loading branch information
gsteel committed May 5, 2023
2 parents 0fa3cb8 + 0028f06 commit 2e172c1
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 50 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-diactoros": "^2.25.1",
"phpunit/phpunit": "^10.0.19",
"laminas/laminas-diactoros": "^2.25.2",
"phpunit/phpunit": "^10.1.2",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^5.11"
},
"autoload": {
"psr-4": {
Expand Down
90 changes: 45 additions & 45 deletions composer.lock

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

4 changes: 2 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
displayDetailsOnTestsThatTriggerNotices="true"
displayDetailsOnTestsThatTriggerWarnings="true"
>
<coverage>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
</source>
<testsuites>
<testsuite name="laminas-httphandlerrunner">
<directory>./test</directory>
Expand Down

0 comments on commit 2e172c1

Please sign in to comment.