From 33e444d5ee5fc7198b33dcdd17d6dd0d39742994 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 15:03:07 +0200 Subject: update to 2.20.0 add dependency on laminas-escaper, laminas-servicemanager, container-interop/container-interop and psr/container --- composer.json | 19 +++++++++++++----- php-laminas-view.spec | 55 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index bdcbbaa..2fcc7df 100644 --- a/composer.json +++ b/composer.json @@ -16,21 +16,31 @@ "forum": "https://discourse.laminas.dev" }, "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "7.4" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "require": { "php": "^7.4 || ~8.0.0 || ~8.1.0", + "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", - "laminas/laminas-stdlib": "^3.6" + "laminas/laminas-servicemanager": "^3.10", + "laminas/laminas-stdlib": "^3.6", + "psr/container": "^1 || ^2" }, "require-dev": { - "ext-dom": "*", "laminas/laminas-authentication": "^2.5", "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-console": "^2.6", - "laminas/laminas-escaper": "^2.5", "laminas/laminas-feed": "^2.15", "laminas/laminas-filter": "^2.13.0", "laminas/laminas-http": "^2.15", @@ -43,7 +53,6 @@ "laminas/laminas-paginator": "^2.11.0", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", - "laminas/laminas-servicemanager": "^3.4", "laminas/laminas-uri": "^2.5", "phpspec/prophecy": "^1.12", "phpspec/prophecy-phpunit": "^2.0", diff --git a/php-laminas-view.spec b/php-laminas-view.spec index ee577ec..ef504e6 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 5f2ed1af896543e986090afb6433e32409c99d4d +%global gh_commit 2cd6973a3e042be3d244260fe93f435668f5c2b4 %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.19.1 +Version: 2.20.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -39,17 +39,19 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.3 with php-autoloader(%{gh_owner}/laminas-json) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +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": { -# "ext-dom": "*", # "laminas/laminas-authentication": "^2.5", # "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-console": "^2.6", -# "laminas/laminas-escaper": "^2.5", # "laminas/laminas-feed": "^2.15", # "laminas/laminas-filter": "^2.13.0", # "laminas/laminas-http": "^2.15", @@ -62,7 +64,6 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "laminas/laminas-paginator": "^2.11.0", # "laminas/laminas-permissions-acl": "^2.6", # "laminas/laminas-router": "^3.0.1", -# "laminas/laminas-servicemanager": "^3.4", # "laminas/laminas-uri": "^2.5", # "phpspec/prophecy": "^1.12", # "phpspec/prophecy-phpunit": "^2.0", @@ -71,7 +72,6 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "vimeo/psalm": "^4.10" BuildRequires: (php-autoloader(%{gh_owner}/laminas-authentication) >= 2.5 with php-autoloader(%{gh_owner}/laminas-authentication) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-feed) >= 2.15 with php-autoloader(%{gh_owner}/laminas-feed) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.13.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3) @@ -86,11 +86,10 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-paginator) >= 2.11 BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) %endif BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.1 with php-autoloader(%{gh_owner}/laminas-router) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3) BuildRequires: (php-composer(phpspec/prophecy) >= 1.12.0 with php-composer(phpspec/prophecy) < 2) BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) -# remirepo:28 +# remirepo:30 %else BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-json @@ -118,6 +117,8 @@ BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-uri BuildRequires: php-phpspec-prophecy BuildRequires: php-phpspec-prophecy-phpunit +BuildRequires: php-container-interop +BuildRequires: php-psr-container2 %endif BuildRequires: phpunit9 >= 9.5.5 %endif @@ -126,19 +127,31 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^7.4 || ~8.0.0 || ~8.1.0", +# "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", # "laminas/laminas-loader": "^2.5", -# "laminas/laminas-stdlib": "^3.6" +# "laminas/laminas-servicemanager": "^3.10", +# "laminas/laminas-stdlib": "^3.6", +# "psr/container": "^1 || ^2" Requires: php(language) >= 7.4 +Requires: php-dom +Requires: php-filter Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.3 with php-autoloader(%{gh_owner}/laminas-json) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-composer(psr/container) >= 1 with php-composer(psr/container) < 3) 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", @@ -155,7 +168,6 @@ Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "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-escaper) Suggests: php-composer(%{gh_owner}/laminas-feed) Suggests: php-composer(%{gh_owner}/laminas-filter) Suggests: php-composer(%{gh_owner}/laminas-http) @@ -165,15 +177,18 @@ Suggests: php-composer(%{gh_owner}/laminas-mvc-plugin-flashmessenger) Suggests: php-composer(%{gh_owner}/laminas-navigation) Suggests: php-composer(%{gh_owner}/laminas-paginator) Suggests: php-composer(%{gh_owner}/laminas-permissions-acl) -Suggests: php-composer(%{gh_owner}/laminas-servicemanager) Suggests: php-composer(%{gh_owner}/laminas-uri) -# remirepo:7 +# remirepo:11 %else +Requires: php-laminas-escaper Requires: php-laminas-eventmanager Requires: php-laminas-json Requires: php-laminas-loader +Requires: php-laminas-servicemanager Requires: php-laminas-stdlib Requires: php-laminas-zendframework-bridge +Requires: php-container-interop +Requires: php-psr-container2 %endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -181,8 +196,6 @@ Requires: php-composer(fedora/autoloader) Requires: php-cli Requires: php-reflection Requires: php-date -Requires: php-dom -Requires: php-filter Requires: php-pcre Requires: php-spl @@ -217,13 +230,19 @@ mv LICENSE.md LICENSE phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ + '%{php_home}/Interop/Container/autoload.php', + [ + '%{php_home}/Psr/Container2/autoload.php', + '%{php_home}/Psr/Container/autoload.php', + ], + '%{php_home}/%{namespace}/Escaper/autoload.php', '%{php_home}/%{namespace}/EventManager/autoload.php', '%{php_home}/%{namespace}/Loader/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ '%{php_home}/%{namespace}/Authentication/autoload.php', - '%{php_home}/%{namespace}/Escaper/autoload.php', '%{php_home}/%{namespace}/Feed/autoload.php', '%{php_home}/%{namespace}/Filter/autoload.php', '%{php_home}/%{namespace}/Http/autoload.php', @@ -233,7 +252,6 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/%{namespace}/Navigation/autoload.php', '%{php_home}/%{namespace}/Paginator/autoload.php', '%{php_home}/%{namespace}/Permissions/Acl/autoload.php', - '%{php_home}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Uri/autoload.php', ]); EOF @@ -320,6 +338,11 @@ exit $ret %changelog +* Wed Mar 30 2022 Remi Collet - 2.20.0-1 +- update to 2.20.0 +- add dependency on laminas-escaper, laminas-servicemanager, + container-interop/container-interop and psr/container + * Thu Jan 13 2022 Remi Collet - 2.19.1-1 - update to 2.19.1 (no change) -- cgit