Skip to content

Commit

Permalink
Merge pull request #54 from mezzio/3.16.x-merge-up-into-3.17.x_dVKwTaXz
Browse files Browse the repository at this point in the history
Merge release 3.16.1 into 3.17.x
  • Loading branch information
Ocramius authored Apr 24, 2023
2 parents 773d370 + b83d61a commit 08b6a08
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 27 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-diactoros": "^2.24",
"laminas/laminas-diactoros": "^2.25.2",
"laminas/laminas-servicemanager": "^3.20.0",
"laminas/laminas-stratigility": "^3.9.0",
"phpunit/phpunit": "^10.0.19",
"phpunit/phpunit": "^10.1.2",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.8"
"vimeo/psalm": "^5.9"
},
"suggest": {
"mezzio/mezzio-aurarouter": "^3.0 to use the Aura.Router routing adapter",
Expand Down
45 changes: 23 additions & 22 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 @@ -15,12 +15,12 @@
<directory>./test</directory>
</testsuite>
</testsuites>
<coverage>
<source>
<include>
<directory suffix=".php">src</directory>
</include>
<exclude>
<directory>src/Test</directory>
</exclude>
</coverage>
</source>
</phpunit>

0 comments on commit 08b6a08

Please sign in to comment.