diff options
| -rw-r--r-- | composer.json | 18 | ||||
| -rw-r--r-- | php-laminas-test.spec | 55 |
2 files changed, 39 insertions, 34 deletions
diff --git a/composer.json b/composer.json index 8821516..844bd54 100644 --- a/composer.json +++ b/composer.json @@ -24,28 +24,28 @@ "extra": { }, "require": { - "php": "^7.3 || ~8.0.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "laminas/laminas-console": "^2.6", "laminas/laminas-eventmanager": "^3.0", - "laminas/laminas-http": "^2.13", - "laminas/laminas-mvc": "^3.0", + "laminas/laminas-http": "^2.15.0", + "laminas/laminas-mvc": "^3.3.0", "laminas/laminas-servicemanager": "^3.0.3", - "laminas/laminas-stdlib": "^3.3", "laminas/laminas-uri": "^2.5", - "laminas/laminas-view": "^2.6.3", - "phpunit/phpunit": "^8.4.3 || ^9.0", + "laminas/laminas-view": "^2.13.1", + "phpunit/phpunit": "^8.5.14 || ^9.0", "symfony/css-selector": "^5.4 || ^6.0", "symfony/dom-crawler": "^5.4 || ^6.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", + "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-i18n": "^2.6", "laminas/laminas-log": "^2.7.1", "laminas/laminas-modulemanager": "^2.7.1", "laminas/laminas-mvc-console": "^1.1.8", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.0", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.4.0", "laminas/laminas-serializer": "^2.6.1", - "laminas/laminas-session": "^2.8.5", + "laminas/laminas-session": "^2.12.0", + "laminas/laminas-stdlib": "^3.6.0", "laminas/laminas-validator": "^2.8", "mikey179/vfsstream": "^1.6.8", "psalm/plugin-phpunit": "^0.16.0", diff --git a/php-laminas-test.spec b/php-laminas-test.spec index f36e9df..830bc9b 100644 --- a/php-laminas-test.spec +++ b/php-laminas-test.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 6b7b17d0e13837cfd301884c16e5f4712e267344 +%global gh_commit ae49929c0060800f0e516cb984620674dfb74458 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-test @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 3.7.0 +Version: 3.8.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -36,30 +36,30 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 7.3 BuildRequires: php-pcre -BuildRequires: phpunit8 +BuildRequires: phpunit8 >= 8.5.14 BuildRequires: phpunit9 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.13 with php-autoloader(%{gh_owner}/laminas-http) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.3 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.3 with php-autoloader(%{gh_owner}/laminas-view) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.13.1 with php-autoloader(%{gh_owner}/laminas-view) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) BuildRequires: (php-composer(symfony/css-selector) >= 4 with php-composer(symfony/css-selector) < 7) BuildRequires: (php-composer(symfony/dom-crawler) >= 4 with php-composer(symfony/dom-crawler) < 7) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~2.2.1", +# "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-i18n": "^2.6", # "laminas/laminas-log": "^2.7.1", # "laminas/laminas-modulemanager": "^2.7.1", # "laminas/laminas-mvc-console": "^1.1.8", -# "laminas/laminas-mvc-plugin-flashmessenger": "^1.0", +# "laminas/laminas-mvc-plugin-flashmessenger": "^1.4.0", # "laminas/laminas-serializer": "^2.6.1", -# "laminas/laminas-session": "^2.8.5", +# "laminas/laminas-session": "^2.12.0", +# "laminas/laminas-stdlib": "^3.6.0", # "laminas/laminas-validator": "^2.8", # "mikey179/vfsstream": "^1.6.8", # "psalm/plugin-phpunit": "^0.16.0", @@ -68,9 +68,10 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 BuildRequires: (php-autoloader(%{gh_owner}/laminas-log) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-log) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-console) >= 1.1.8 with php-autoloader(%{gh_owner}/laminas-mvc-console) < 2) -BuildRequires: php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0 +BuildRequires: php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.4.0 BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-serializer) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.5 with php-autoloader(%{gh_owner}/laminas-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.8 with php-autoloader(%{gh_owner}/laminas-validator) < 3) BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.8 with php-composer(mikey179/vfsstream) < 2) # remirepo:22 @@ -80,7 +81,6 @@ BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-http BuildRequires: php-laminas-mvc BuildRequires: php-laminas-servicemanager -BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-uri BuildRequires: php-laminas-view BuildRequires: php-laminas-zendframework-bridge @@ -92,6 +92,7 @@ BuildRequires: php-laminas-mvc-console BuildRequires: php-laminas-mvc-plugin-flashmessenger BuildRequires: php-laminas-serializer BuildRequires: php-laminas-session +BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-validator BuildRequires: php-symfony4-css-selector BuildRequires: php-symfony4-dom-crawler @@ -101,16 +102,15 @@ BuildRequires: php-symfony4-dom-crawler 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-console": "^2.6", # "laminas/laminas-eventmanager": "^3.0", -# "laminas/laminas-http": "^2.13", -# "laminas/laminas-mvc": "^3.0", +# "laminas/laminas-http": "^2.15.0", +# "laminas/laminas-mvc": "^3.3", # "laminas/laminas-servicemanager": "^3.0.3", -# "laminas/laminas-stdlib": "^3.3", # "laminas/laminas-uri": "^2.5", -# "laminas/laminas-view": "^2.6.3", -# "phpunit/phpunit": "^8.4.3 || ^9.0", +# "laminas/laminas-view": "^2.13.1", +# "phpunit/phpunit": "^8.5.14 || ^9.0", # "symfony/css-selector": "^5.4 || ^6.0", # "symfony/dom-crawler": "^5.4 || ^6.0" Requires: php(language) >= 7.3 @@ -121,12 +121,11 @@ Recommends: phpunit9 Recommends: phpunit8 Requires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.13 with php-autoloader(%{gh_owner}/laminas-http) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.3 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.3 with php-autoloader(%{gh_owner}/laminas-view) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.13.1 with php-autoloader(%{gh_owner}/laminas-view) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # ignore minimal version Requires: (php-composer(symfony/css-selector) >= 4 with php-composer(symfony/css-selector) < 7) @@ -134,14 +133,13 @@ Requires: (php-composer(symfony/dom-crawler) >= 4 # From composer.json, "suggest": { # "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration" Suggests: php-autoloader(%{gh_owner}/laminas-mvc-console) -# remirepo:13 +# remirepo:12 %else Requires: php-laminas-console Requires: php-laminas-eventmanager Requires: php-laminas-http Requires: php-laminas-mvc Requires: php-laminas-servicemanager -Requires: php-laminas-stdlib Requires: php-laminas-uri Requires: php-laminas-view Requires: php-laminas-zendframework-bridge @@ -289,6 +287,13 @@ exit $ret %changelog +* Wed Dec 8 2021 Remi Collet <remi@remirepo.net> - 3.8.0-1 +- update to 3.8.0 +- raise dependency on laminas-http 2.15 +- raise dependency on laminas-mvc 3.3 +- raise dependency on laminas-view 2.13.1 +- drop dependency on laminas-stdlib + * Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 3.7.0-1 - update to 3.7.0 - keep compatibility using laminas-zendframework-bridge |