From 1dbde770222e658afea68438a67978f15d4097ce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Dec 2021 10:50:04 +0100 Subject: update to 2.13.1 raise dependency on PHP 7.4 --- composer.json | 38 ++++++++++---------- php-laminas-navigation.spec | 87 +++++++++++++++++++++------------------------ 2 files changed, 58 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index e0df8eb..aebc3ad 100644 --- a/composer.json +++ b/composer.json @@ -25,31 +25,29 @@ } }, "require": { - "php": "^7.3 || ~8.0.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", "laminas/laminas-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-config": "^2.6 || ^3.1", - "laminas/laminas-console": "^2.6", - "laminas/laminas-http": "^2.6", - "laminas/laminas-i18n": "^2.7.3", - "laminas/laminas-log": "^2.9.1", - "laminas/laminas-mvc": "^2.7.9 || ^3.0.4", - "laminas/laminas-permissions-acl": "^2.6", - "laminas/laminas-router": "^3.0.2", - "laminas/laminas-servicemanager": "^3.2.1", - "laminas/laminas-uri": "^2.5.2", - "laminas/laminas-view": "^2.9", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.4.1" + "laminas/laminas-coding-standard": "^2.3.0", + "laminas/laminas-config": "^3.7.0", + "laminas/laminas-http": "^2.15.1", + "laminas/laminas-i18n": "^2.13.0", + "laminas/laminas-mvc": "^3.3.0", + "laminas/laminas-permissions-acl": "^2.9.0", + "laminas/laminas-router": "^3.5.0", + "laminas/laminas-servicemanager": "^3.10.0", + "laminas/laminas-uri": "^2.9.1", + "laminas/laminas-view": "^2.14.2", + "phpspec/prophecy-phpunit": "^2.0.1", + "phpunit/phpunit": "^9.5.10" }, "suggest": { - "laminas/laminas-config": "^2.6 || ^3.1, to provide page configuration (optional, as arrays and Traversables are also allowed)", - "laminas/laminas-permissions-acl": "^2.6, to provide ACL-based access restrictions to pages", - "laminas/laminas-router": "^3.0, to use router-based URI generation with Mvc pages", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to use the navigation factories", - "laminas/laminas-view": "^2.8.1, to use the navigation view helpers" + "laminas/laminas-config": "^3.7, to provide page configuration (optional, as arrays and Traversables are also allowed)", + "laminas/laminas-permissions-acl": "^2.9, to provide ACL-based access restrictions to pages", + "laminas/laminas-router": "^3.5, to use router-based URI generation with Mvc pages", + "laminas/laminas-servicemanager": "^3.10, to use the navigation factories", + "laminas/laminas-view": "^2.14, to use the navigation view helpers" }, "autoload": { "psr-4": { diff --git a/php-laminas-navigation.spec b/php-laminas-navigation.spec index ac0c679..06799ab 100644 --- a/php-laminas-navigation.spec +++ b/php-laminas-navigation.spec @@ -8,7 +8,7 @@ # # when build without permission-acl %global bootstrap 0 -%global gh_commit 1d29047b49ea978756e6f10921ec3e96f5bc6147 +%global gh_commit a4343098b50942df1edcc2b035780068bac17ed5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-navigation @@ -19,7 +19,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.12.0 +Version: 2.13.1 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -31,51 +31,45 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-config": "^2.6 || ^3.1", -# "laminas/laminas-console": "^2.6", -# "laminas/laminas-http": "^2.6", -# "laminas/laminas-i18n": "^2.7.3", -# "laminas/laminas-log": "^2.9.1", -# "laminas/laminas-mvc": "^2.7.9 || ^3.0.4", -# "laminas/laminas-permissions-acl": "^2.6", -# "laminas/laminas-router": "^3.0.2", -# "laminas/laminas-servicemanager": "^3.2.1", -# "laminas/laminas-uri": "^2.5.2", -# "laminas/laminas-view": "^2.9", -# "phpspec/prophecy-phpunit": "^2.0", -# "phpunit/phpunit": "^9.4.1" +# "laminas/laminas-coding-standard": "~2.3.0", +# "laminas/laminas-config": "^3.7", +# "laminas/laminas-http": "^2.15.1", +# "laminas/laminas-i18n": "^2.13.0", +# "laminas/laminas-mvc": "^3.3.0", +# "laminas/laminas-permissions-acl": "^2.9.0", +# "laminas/laminas-router": "^3.5", +# "laminas/laminas-servicemanager": "^3.10.0", +# "laminas/laminas-uri": "^2.9.1", +# "laminas/laminas-view": "^2.14.2", +# "phpspec/prophecy-phpunit": "^2.0.1", +# "phpunit/phpunit": "^9.5.10" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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-config) >= 2.6 with php-autoloader(%{gh_owner}/laminas-config) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.6 with php-autoloader(%{gh_owner}/laminas-http) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.7.3 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-log) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-log) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0.4 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.7 with php-autoloader(%{gh_owner}/laminas-config) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15.1 with php-autoloader(%{gh_owner}/laminas-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.13 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.3 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) %if ! %{bootstrap} -BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.9 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) %endif -BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.2 with php-autoloader(%{gh_owner}/laminas-router) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-uri) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.9 with php-autoloader(%{gh_owner}/laminas-view) < 3) -BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) -# remirepo:18 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.5 with php-autoloader(%{gh_owner}/laminas-router) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.10 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-uri) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.14.2 with php-autoloader(%{gh_owner}/laminas-view) < 3) +BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0.1 with php-composer(phpspec/prophecy-phpunit) < 3) +# remirepo:16 %else BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-laminas-config -BuildRequires: php-laminas-console BuildRequires: php-laminas-http BuildRequires: php-laminas-i18n -BuildRequires: php-laminas-log BuildRequires: php-laminas-mvc %if ! %{bootstrap} BuildRequires: php-laminas-permissions-acl @@ -87,25 +81,25 @@ BuildRequires: php-laminas-view BuildRequires: php-phpspec-prophecy-phpunit %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.4.1 +BuildRequires: phpunit9 >= 9.5.10 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0", +# "php": "^7.4 || ~8.0.0 || ~8.1.0", # "laminas/laminas-stdlib": "^2.7 || ^3.0" -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) # From composer, "suggest": { -# "laminas/laminas-config": "^2.6 || ^3.1, to provide page configuration (optional, as arrays and Traversables are also allowed)", -# "laminas/laminas-permissions-acl": "^2.6, to provide ACL-based access restrictions to pages", -# "laminas/laminas-router": "^3.0, to use router-based URI generation with Mvc pages", -# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to use the navigation factories", -# "laminas/laminas-view": "^2.8.1, to use the navigation view helpers" +# "laminas/laminas-config": "^3.7, to provide page configuration (optional, as arrays and Traversables are also allowed)", +# "laminas/laminas-permissions-acl": "^2.9, to provide ACL-based access restrictions to pages", +# "laminas/laminas-router": "^3.5, to use router-based URI generation with Mvc pages", +# "laminas/laminas-servicemanager": "^3.10, to use the navigation factories", +# "laminas/laminas-view": "^2.14, to use the navigation view helpers" Suggests: php-autoloader(%{gh_owner}/laminas-config) Suggests: php-autoloader(%{gh_owner}/laminas-permissions-acl) Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) @@ -157,10 +151,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - [ - '%{php_home}/%{namespace}/Config3/autoload.php', - '%{php_home}/%{namespace}/Config/autoload.php', - ], + '%{php_home}/%{namespace}/Config3/autoload.php', '%{php_home}/%{namespace}/Permissions/Acl/autoload.php', '%{php_home}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Router/autoload.php', @@ -195,10 +186,8 @@ cat << 'EOF' | tee vendor/autoload.php - 2.13.1-1 +- update to 2.13.1 +- raise dependency on PHP 7.4 + * Tue Dec 7 2021 Remi Collet - 2.12.0-1 - update to 2.12.0 - keep compatibility using laminas-zendframework-bridge -- cgit