diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rw-r--r-- | php-laminas-httphandlerrunner.spec | 25 |
2 files changed, 20 insertions, 15 deletions
diff --git a/composer.json b/composer.json index 067bc88..d85d92b 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ } }, "require": { - "php": "^7.3 || ~8.0.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "laminas/laminas-zendframework-bridge": "^1.0", "psr/http-message": "^1.0", "psr/http-message-implementation": "^1.0", @@ -35,10 +35,10 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-diactoros": "^2.1.1", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.15.1", - "vimeo/psalm": "^4.6" + "laminas/laminas-diactoros": "^2.8.0", + "phpunit/phpunit": "^9.5.9", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.10.0" }, "autoload": { "psr-4": { diff --git a/php-laminas-httphandlerrunner.spec b/php-laminas-httphandlerrunner.spec index ada29e5..1e447f3 100644 --- a/php-laminas-httphandlerrunner.spec +++ b/php-laminas-httphandlerrunner.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 6a2dd33e4166469ade07ad1283b45924383b224b +%global gh_commit 5f94e55d93f756e8ad07b9049aeb3d6d84582d0e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-httphandlerrunner @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 1.4.0 +Version: 1.5.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -42,11 +42,11 @@ BuildRequires: (php-composer(psr/http-message) >= 1.0 BuildRequires: (php-composer(psr/http-server-handler) >= 1.0 with php-composer(psr/http-server-handler) < 2) # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-diactoros": "^2.1.1", -# "phpunit/phpunit": "^9.3", -# "psalm/plugin-phpunit": "^0.15.1", -# "vimeo/psalm": "^4.6" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-diactoros) >= 2.1.1 with php-autoloader(%{gh_owner}/laminas-diactoros) < 3) +# "laminas/laminas-diactoros": "^2.8", +# "phpunit/phpunit": "^9.5.9", +# "psalm/plugin-phpunit": "^0.16.1", +# "vimeo/psalm": "^4.10" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-diactoros) >= 2.8 with php-autoloader(%{gh_owner}/laminas-diactoros) < 3) # remirepo:6 %else BuildRequires: php-laminas-zendframework-bridge @@ -55,7 +55,7 @@ BuildRequires: php-psr-http-server-handler BuildRequires: php-laminas-diactoros2 %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 >= 9.5.9 BuildRequires: php-pcre BuildRequires: php-spl %endif @@ -63,7 +63,7 @@ BuildRequires: php-spl BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0", +# "php": "^7.3 || ~8.0.0 || ~8.1.0", # "laminas/laminas-zendframework-bridge": "^1.0", # "psr/http-message": "^1.0", # "psr/http-message-implementation": "^1.0", @@ -165,7 +165,7 @@ rm -r test/Emitter/ : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} || ret=1 @@ -188,6 +188,11 @@ exit $ret %changelog +* Thu Sep 30 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 +- raise build dependency on laminas-diactoros 2.8 +- raise build dependency on phpunit 9.5.9 + * Fri Apr 9 2021 Remi Collet <remi@remirepo.net> - 1.4.0-1 - update to 1.4.0 |