Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Support for PHP 7.3 #20

Merged
merged 1 commit into from
Sep 18, 2022
+450 −552
Merged

Drop Support for PHP 7.3 #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .coveralls.yml
View file

This file was deleted.

12 changes: 7 additions & 5 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/.coveralls.yml export-ignore
/.docheader export-ignore
/.gitattributes export-ignore
/.github/ export-ignore
/test/ export-ignore
/.gitignore export-ignore
/docs/ export-ignore
/.laminas-ci.json export-ignore
/composer.lock export-ignore
/renovate.json export-ignore
/.gitattributes export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/test/ export-ignore
/psalm.xml export-ignore
/psalm-baseline.xml export-ignore
14 changes: 7 additions & 7 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
"dealerdirect/phpcodesniffer-composer-installer": true
},
"platform": {
"php": "7.3.99"
"php": "7.4.99"
}
},
"extra": {
@@ -34,21 +34,21 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"fig/http-message-util": "^1.1.5",
"laminas/laminas-psr7bridge": "^0.2.2 || ^1.0.0",
"laminas/laminas-router": "^3.3.0",
"mezzio/mezzio-router": "^3.2",
"psr/http-message": "^1.0.1"
},
"require-dev": {
"laminas/laminas-coding-standard": "^2.3.0",
"laminas/laminas-i18n": "~2.12",
"laminas/laminas-stratigility": "^3.5",
"laminas/laminas-coding-standard": "~2.4.0",
"laminas/laminas-i18n": "~2.17",
"laminas/laminas-stratigility": "^3.8",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5.10",
"phpunit/phpunit": "^9.5.24",
"psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.24"
"vimeo/psalm": "^4.27"
},
"autoload": {
"psr-4": {
964 changes: 433 additions & 531 deletions composer.lock
View file

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions psalm-baseline.xml
View file
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.27.0@faf106e717c37b8c81721845dba9de3d8deed8ff">
<file src="src/LaminasRouter.php">
<MixedArgument occurrences="2">
<code>$this-&gt;allowedMethodsByPath[$params[self::METHOD_NOT_ALLOWED_ROUTE]]</code>
@@ -31,9 +31,6 @@
</RedundantCondition>
</file>
<file src="test/LaminasRouterTest.php">
<ArgumentTypeCoercion occurrences="1">
<code>$serverRequest</code>
</ArgumentTypeCoercion>
<InvalidArgument occurrences="4">
<code>Argument::type(LaminasRequest::class)</code>
<code>Argument::type(LaminasRequest::class)</code>
5 changes: 2 additions & 3 deletions src/LaminasRouter/ConfigProvider.php
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@

use Mezzio\Router\LaminasRouter;
use Mezzio\Router\RouterInterface;
use Zend\Expressive\Router\ZendRouter;

class ConfigProvider
{
@@ -24,8 +23,8 @@ public function getDependencies(): array
RouterInterface::class => LaminasRouter::class,

// Legacy Zend Framework aliases
\Zend\Expressive\Router\RouterInterface::class => RouterInterface::class,
ZendRouter::class => LaminasRouter::class,
'Zend\Expressive\Router\RouterInterface' => RouterInterface::class,
'Zend\Expressive\Router\ZendRouter' => LaminasRouter::class,
],
'invokables' => [
LaminasRouter::class => LaminasRouter::class,