Skip to content

Commit

Permalink
Merge pull request #182 from gsteel/drop-php-8.0-upgrade-phpunit
Browse files Browse the repository at this point in the history
Remove support for PHP 8.0, Upgrade PHPUnit to 10.1.x
  • Loading branch information
gsteel authored May 19, 2023
2 parents b904e5d + fd807c9 commit 48b755f
Show file tree
Hide file tree
Showing 85 changed files with 3,313 additions and 3,183 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/.phpcs-cache
/.phpunit.result.cache
/.phpunit.cache
/clover.xml
/docs/html/
/laminas-mkdoc-theme.tgz
Expand Down
3 changes: 0 additions & 3 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
{
"ignore_php_platform_requirements": {
"8.2": true
}
}
2 changes: 1 addition & 1 deletion .psr-container.php.stub
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ namespace Psr\Container {
* @psalm-param string|class-string<T> $id
* @psalm-return ($id is class-string ? T : mixed)
*/
public function get(string $id): object;
public function get(string $id): mixed;
}
}
1 change: 0 additions & 1 deletion bin/update_hostname_validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ function getPunycodeDecoder()
$hostnameValidator = new Hostname();
$reflection = new ReflectionClass(get_class($hostnameValidator));
$decodePunyCode = $reflection->getMethod('decodePunycode');
$decodePunyCode->setAccessible(true);

return function ($encode) use ($hostnameValidator, $decodePunyCode) {
if (strpos($encode, 'xn--') === 0) {
Expand Down
26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "8.0.99"
"php": "8.1.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -31,24 +31,24 @@
}
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"laminas/laminas-servicemanager": "^3.12.0",
"php": "~8.1.0 || ~8.2.0",
"laminas/laminas-servicemanager": "^3.21.0",
"laminas/laminas-stdlib": "^3.13",
"psr/http-message": "^1.0.1"
},
"require-dev": {
"laminas/laminas-coding-standard": "^2.4.0",
"laminas/laminas-db": "^2.16",
"laminas/laminas-filter": "^2.28.1",
"laminas/laminas-coding-standard": "^2.5",
"laminas/laminas-db": "^2.18",
"laminas/laminas-filter": "^2.32",
"laminas/laminas-http": "^2.18",
"laminas/laminas-i18n": "^2.19",
"laminas/laminas-session": "^2.15",
"laminas/laminas-i18n": "^2.23",
"laminas/laminas-session": "^2.16",
"laminas/laminas-uri": "^2.10.0",
"phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.18.3",
"psr/http-client": "^1.0.1",
"psr/http-factory": "^1.0.1",
"vimeo/psalm": "^5.0"
"phpunit/phpunit": "^10.1.3",
"psalm/plugin-phpunit": "^0.18.4",
"psr/http-client": "^1.0.2",
"psr/http-factory": "^1.0.2",
"vimeo/psalm": "^5.11"
},
"suggest": {
"laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
Expand Down
Loading

0 comments on commit 48b755f

Please sign in to comment.