From 3a7613a397cd739e70fcf4b6858a7816da8d5ea3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 16 Apr 2021 15:20:35 +0200 Subject: update to 2.10.0 raise dependency on laminas-code 3.5.1 and allow v4 raise dependency on laminas-stdlib 3.3.1 raise dependency on laminas-zendframework-bridge 1.2.0 --- composer.json | 12 ++++++------ php-laminas-server.spec | 41 +++++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index c472c5c..6618daa 100644 --- a/composer.json +++ b/composer.json @@ -22,15 +22,15 @@ }, "require": { "php": "^7.3 || ~8.0.0", - "laminas/laminas-code": "^2.5 || ^3.0", - "laminas/laminas-stdlib": "^2.5 || ^3.0", - "laminas/laminas-zendframework-bridge": "^1.0" + "laminas/laminas-code": "^3.5.1 || ^4.0.0", + "laminas/laminas-stdlib": "^3.3.1", + "laminas/laminas-zendframework-bridge": "^1.2.0" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.13.0", - "vimeo/psalm": "^4.2" + "phpunit/phpunit": "^9.5.4", + "psalm/plugin-phpunit": "^0.15.1", + "vimeo/psalm": "^4.6.4" }, "autoload": { "psr-4": { diff --git a/php-laminas-server.spec b/php-laminas-server.spec index 5780070..a9933a1 100644 --- a/php-laminas-server.spec +++ b/php-laminas-server.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b91fd8aed71a6b45addc55eda4bb4c3adb21b698 +%global gh_commit e1fd6853223feed7a00555144d661e0a914124cd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-server @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.9.2 +Version: 2.10.0 Release: 1%{?dist} Summary: Laminas Framework %{library} component @@ -40,14 +40,14 @@ BuildRequires: php-spl BuildRequires: php-reflection # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~1.0.0", -# "phpunit/phpunit": "^9.3", -# "psalm/plugin-phpunit": "^0.13.0", -# "vimeo/psalm": "^4.2" +# "phpunit/phpunit": "^9.5.4", +# "psalm/plugin-phpunit": "^0.15.1", +#+ "vimeo/psalm": "^4.6.4" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.0 with php-autoloader(%{gh_owner}/laminas-code) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5.1 with php-autoloader(%{gh_owner}/laminas-code) < 5) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.2.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # remirepo:5 %else BuildRequires: php-laminas-code @@ -55,23 +55,23 @@ BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 >= 9.5.4 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^7.3 || ~8.0.0", -# "laminas/laminas-code": "^2.5 || ^3.0", -# "laminas/laminas-stdlib": "^2.5 || ^3.0", -# "laminas/laminas-zendframework-bridge": "^1.0" +# "laminas/laminas-code": "^3.5.1 || ^4.0.0", +# "laminas/laminas-stdlib": "^3.3.1", +# "laminas/laminas-zendframework-bridge": "^1.2.0" Requires: php(language) >= 7.3 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.0 with php-autoloader(%{gh_owner}/laminas-code) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5.1 with php-autoloader(%{gh_owner}/laminas-code) < 5) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.2.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # remirepo:5 %else Requires: php-laminas-code @@ -120,7 +120,10 @@ phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/%{namespace}/Stdlib/autoload.php', - '%{php_home}/%{namespace}/Code/autoload.php', + [ + '%{php_home}/%{namespace}/Code4/autoload.php', + '%{php_home}/%{namespace}/Code/autoload.php', + ], ]); EOF @@ -186,6 +189,12 @@ exit $ret %changelog +* Fri Apr 16 2021 Remi Collet - 2.10.0-1 +- update to 2.10.0 +- raise dependency on laminas-code 3.5.1 and allow v4 +- raise dependency on laminas-stdlib 3.3.1 +- raise dependency on laminas-zendframework-bridge 1.2.0 + * Fri Apr 9 2021 Remi Collet - 2.9.2-1 - update to 2.9.2 -- cgit