From f4d5fe36b6e2be5c0c19b11d76b96fde4e0f16b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Nov 2022 14:29:23 +0100 Subject: update to 2.25.0 (no change) --- composer.json | 34 ++++++++++++-------------- php-laminas-view.spec | 66 +++++++++++++++++++++++++-------------------------- 2 files changed, 48 insertions(+), 52 deletions(-) diff --git a/composer.json b/composer.json index 1abfbc0..d00c789 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "ext-dom": "*", "ext-filter": "*", "ext-json": "*", - "container-interop/container-interop": "^1.2", "laminas/laminas-escaper": "^2.5", "laminas/laminas-eventmanager": "^3.4", "laminas/laminas-json": "^3.3", @@ -38,36 +37,34 @@ "psr/container": "^1 || ^2" }, "require-dev": { - "laminas/laminas-authentication": "^2.12", + "laminas/laminas-authentication": "^2.13", "laminas/laminas-coding-standard": "~2.4.0", "laminas/laminas-console": "^2.8", - "laminas/laminas-feed": "^2.18.2", - "laminas/laminas-filter": "^2.23", - "laminas/laminas-http": "^2.16", + "laminas/laminas-feed": "^2.19", + "laminas/laminas-filter": "^2.25", + "laminas/laminas-http": "^2.17", "laminas/laminas-i18n": "^2.19", - "laminas/laminas-modulemanager": "^2.12", - "laminas/laminas-mvc": "^3.3.5", - "laminas/laminas-mvc-i18n": "^1.4", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.8.1", - "laminas/laminas-navigation": "^2.15", - "laminas/laminas-paginator": "^2.13", - "laminas/laminas-permissions-acl": "^2.10", + "laminas/laminas-modulemanager": "^2.14", + "laminas/laminas-mvc": "^3.5", + "laminas/laminas-mvc-i18n": "^1.6", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.9", + "laminas/laminas-navigation": "^2.16", + "laminas/laminas-paginator": "^2.15", + "laminas/laminas-permissions-acl": "^2.12", "laminas/laminas-router": "^3.10", - "laminas/laminas-uri": "^2.9.1", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.28" + "laminas/laminas-uri": "^2.10", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^4.30" }, "conflict": { "container-interop/container-interop": "<1.2", - "laminas/laminas-servicemanager": "<3.3", "laminas/laminas-session": "<2.12", "laminas/laminas-router": "<3.0.1", "zendframework/zend-view": "*" }, "suggest": { "laminas/laminas-authentication": "Laminas\\Authentication component", - "laminas/laminas-escaper": "Laminas\\Escaper component", "laminas/laminas-feed": "Laminas\\Feed component", "laminas/laminas-filter": "Laminas\\Filter component", "laminas/laminas-http": "Laminas\\Http component", @@ -77,7 +74,6 @@ "laminas/laminas-navigation": "Laminas\\Navigation component", "laminas/laminas-paginator": "Laminas\\Paginator component", "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component", - "laminas/laminas-servicemanager": "Laminas\\ServiceManager component", "laminas/laminas-uri": "Laminas\\Uri component" }, "autoload": { diff --git a/php-laminas-view.spec b/php-laminas-view.spec index e0a9995..c9a4ec3 100644 --- a/php-laminas-view.spec +++ b/php-laminas-view.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 50ae82af3e2da96108490ceb474480e6df226993 +%global gh_commit 77a4b6d78445ae2f30625c5af09a05ad4e4434eb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-view @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.24.0 +Version: 2.25.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -48,42 +48,42 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10 BuildRequires: (php-composer(psr/container) >= 1 with php-composer(psr/container) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { -# "laminas/laminas-authentication": "^2.12", +# "laminas/laminas-authentication": "^2.13", # "laminas/laminas-coding-standard": "~2.4.0", # "laminas/laminas-console": "^2.8", -# "laminas/laminas-feed": "^2.18.2", -# "laminas/laminas-filter": "^2.23", -# "laminas/laminas-http": "^2.16", +# "laminas/laminas-feed": "^2.19", +# "laminas/laminas-filter": "^2.25", +# "laminas/laminas-http": "^2.17", # "laminas/laminas-i18n": "^2.19", -# "laminas/laminas-modulemanager": "^2.12", -# "laminas/laminas-mvc": "^3.3.5", -# "laminas/laminas-mvc-i18n": "^1.4", -# "laminas/laminas-mvc-plugin-flashmessenger": "^1.8.1", -# "laminas/laminas-navigation": "^2.15", -# "laminas/laminas-paginator": "^2.13", -# "laminas/laminas-permissions-acl": "^2.10", +# "laminas/laminas-modulemanager": "^2.14", +# "laminas/laminas-mvc": "^3.5", +# "laminas/laminas-mvc-i18n": "^1.6", +# "laminas/laminas-mvc-plugin-flashmessenger": "^1.9", +# "laminas/laminas-navigation": "^2.16", +# "laminas/laminas-paginator": "^2.15", +# "laminas/laminas-permissions-acl": "^2.12", # "laminas/laminas-router": "^3.10", -# "laminas/laminas-uri": "^2.9.1", -# "phpunit/phpunit": "^9.5.25", -# "psalm/plugin-phpunit": "^0.17.0", -# "vimeo/psalm": "^4.28" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-authentication) >= 2.12 with php-autoloader(%{gh_owner}/laminas-authentication) < 3) +# "laminas/laminas-uri": "^2.10", +# "phpunit/phpunit": "^9.5.26", +# "psalm/plugin-phpunit": "^0.18.3", +# "vimeo/psalm": "^4.30" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-authentication) >= 2.13 with php-autoloader(%{gh_owner}/laminas-authentication) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.8 with php-autoloader(%{gh_owner}/laminas-console) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-feed) >= 2.18.2 with php-autoloader(%{gh_owner}/laminas-feed) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.23 with php-autoloader(%{gh_owner}/laminas-filter) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.16 with php-autoloader(%{gh_owner}/laminas-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-feed) >= 2.19 with php-autoloader(%{gh_owner}/laminas-feed) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.25 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.17 with php-autoloader(%{gh_owner}/laminas-http) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.19 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.12 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.14 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) %if ! %{bootstrap} -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.3.5 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-i18n) >= 1.4 with php-autoloader(%{gh_owner}/laminas-mvc-i18n) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.8.1 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-navigation) >= 2.15 with php-autoloader(%{gh_owner}/laminas-navigation) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.13 with php-autoloader(%{gh_owner}/laminas-paginator) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.10 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.5 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-i18n) >= 1.6 with php-autoloader(%{gh_owner}/laminas-mvc-i18n) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.9 with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-navigation) >= 2.16 with php-autoloader(%{gh_owner}/laminas-navigation) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-paginator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.12 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) %endif BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.10 with php-autoloader(%{gh_owner}/laminas-router) < 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-uri) >= 2.10 with php-autoloader(%{gh_owner}/laminas-uri) < 3) # remirepo:27 %else BuildRequires: php-laminas-eventmanager @@ -112,7 +112,7 @@ BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-uri BuildRequires: php-psr-container2 %endif -BuildRequires: phpunit9 >= 9.5.25 +BuildRequires: phpunit9 >= 9.5.26 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -122,7 +122,6 @@ BuildRequires: php-fedora-autoloader-devel # "ext-dom": "*", # "ext-filter": "*", # "ext-json": "*", -# "container-interop/container-interop": "^1.2", # "laminas/laminas-escaper": "^2.5", # "laminas/laminas-eventmanager": "^3.4", # "laminas/laminas-json": "^3.3", @@ -146,7 +145,6 @@ Requires: (php-composer(psr/container) >= 1 Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-authentication": "Laminas\\Authentication component", -# "laminas/laminas-escaper": "Laminas\\Escaper component", # "laminas/laminas-feed": "Laminas\\Feed component", # "laminas/laminas-filter": "Laminas\\Filter component", # "laminas/laminas-http": "Laminas\\Http component", @@ -156,7 +154,6 @@ Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "laminas/laminas-navigation": "Laminas\\Navigation component", # "laminas/laminas-paginator": "Laminas\\Paginator component", # "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component", -# "laminas/laminas-servicemanager": "Laminas\\ServiceManager component", # "laminas/laminas-uri": "Laminas\\Uri component" Suggests: php-composer(%{gh_owner}/laminas-authentication) Suggests: php-composer(%{gh_owner}/laminas-feed) @@ -323,6 +320,9 @@ exit $ret %changelog +* Mon Nov 7 2022 Remi Collet - 2.25.0-1 +- update to 2.25.0 (no change) + * Wed Oct 12 2022 Remi Collet - 2.24.0-1 - update to 2.24.0 - raise dependency on PHP 8.0 -- cgit