From 6c55e6cfe7ee9b4bb784b5ab0f353e7396bbc11a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Dec 2020 11:08:21 +0100 Subject: update to 3.2.0 raise dependency on PHP 7.3 raise dependency on laminas-stdlib 3.2.1 raise dependency on laminas-view 2.11.3 switch to phpunit9 --- composer.json | 28 +++++++++-------------- php-laminas-mvc.spec | 64 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/composer.json b/composer.json index 3e2137b..483148d 100644 --- a/composer.json +++ b/composer.json @@ -19,45 +19,40 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" - } }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.3 || ~8.0.0", "container-interop/container-interop": "^1.2", "laminas/laminas-eventmanager": "^3.2", "laminas/laminas-http": "^2.7", "laminas/laminas-modulemanager": "^2.8", "laminas/laminas-router": "^3.0.2", "laminas/laminas-servicemanager": "^3.3", - "laminas/laminas-stdlib": "^3.1", - "laminas/laminas-view": "^2.9", + "laminas/laminas-stdlib": "^3.2.1", + "laminas/laminas-view": "^2.11.3", "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { "http-interop/http-middleware": "^0.4.1", - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "^1.0.0", "laminas/laminas-json": "^2.6.1 || ^3.0", "laminas/laminas-psr7bridge": "^1.0", - "laminas/laminas-stratigility": "^2.0.1", - "phpunit/phpunit": "^6.4.4 || ^5.7.14" + "laminas/laminas-stratigility": ">=2.0.1 <2.2", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.4.2" }, "suggest": { - "http-interop/http-middleware": "^0.4.1 to be used together with laminas-stratigility", "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", "laminas/laminas-log": "^2.9.1 To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager", "laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application", "laminas/laminas-mvc-i18n": "laminas-mvc-i18n provides integration with laminas-i18n, including a translation bridge and translatable route segments", + "laminas/laminas-mvc-middleware": "To dispatch middleware in your laminas-mvc application", "laminas/laminas-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", "laminas/laminas-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", "laminas/laminas-mvc-plugin-identity": "To access the authenticated identity (per laminas-authentication) in controllers", "laminas/laminas-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", "laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager", - "laminas/laminas-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", - "laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application", - "laminas/laminas-stratigility": "laminas-stratigility is required to use middleware pipes in the MiddlewareListener" + "laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application" }, "autoload": { "psr-4": { @@ -80,10 +75,9 @@ "cs-check": "phpcs", "cs-fix": "phpcbf", "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", - "upload-coverage": "coveralls -v" + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-mvc": "self.version" + "zendframework/zend-mvc": "^3.1.1" } } diff --git a/php-laminas-mvc.spec b/php-laminas-mvc.spec index 3ad5e40..049a360 100644 --- a/php-laminas-mvc.spec +++ b/php-laminas-mvc.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit ead09f8ab5ff0e562dbd0198c7f67523c2f61980 +%global gh_commit 88da7200cf8f5a970c35d91717a5c4db94981e5e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mvc @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 3.1.1 +Version: 3.2.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -47,21 +47,23 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.7 BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.8 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) 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.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.9 with php-autoloader(%{gh_owner}/laminas-view) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.11.3 with php-autoloader(%{gh_owner}/laminas-view) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # from composer.json, "require-dev": { # "http-interop/http-middleware": "^0.4.1", -# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-coding-standard": "^1.0.0", # "laminas/laminas-json": "^2.6.1 || ^3.0", # "laminas/laminas-psr7bridge": "^1.0", -# "laminas/laminas-stratigility": "^2.0.1", -# "phpunit/phpunit": "^6.4.4 || ^5.7.14" +# "laminas/laminas-stratigility": ">=2.0.1 <2.2", +# "phpspec/prophecy-phpunit": "^2.0", +# "phpunit/phpunit": "^9.4.2" BuildRequires: (php-composer(http-interop/http-middleware) >= 0.4.1 with php-composer(http-interop/http-middleware) < 1) BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.0 with php-autoloader(%{gh_owner}/laminas-json) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-psr7bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-psr7bridge) < 2) BuildRequires: (php-autoloader(%{gh_owner}/laminas-stratigility) >= 2.0.1 with php-autoloader(%{gh_owner}/laminas-stratigility) < 3) -# remirepo:11 +BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) +# remirepo:16 %else BuildRequires: php-container-interop BuildRequires: php-laminas-eventmanager @@ -76,23 +78,24 @@ BuildRequires: php-http-interop-http-middleware BuildRequires: php-laminas-json BuildRequires: php-laminas-psr7bridge BuildRequires: php-laminas-stratigility +BuildRequires: php-phpspec-prophecy-phpunit %endif -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.5 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.4.2 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", +# "php": "^7.3 || ~8.0.0", # "container-interop/container-interop": "^1.2", # "laminas/laminas-eventmanager": "^3.2", # "laminas/laminas-http": "^2.7", # "laminas/laminas-modulemanager": "^2.8", # "laminas/laminas-router": "^3.0.2", # "laminas/laminas-servicemanager": "^3.3", -# "laminas/laminas-stdlib": "^3.1", -# "laminas/laminas-view": "^2.9", +# "laminas/laminas-stdlib": "^3.2.1", +# "laminas/laminas-view": "^2.11.3", # "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 # remirepo:1 @@ -103,36 +106,32 @@ Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.7 Requires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.8 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.2 with php-autoloader(%{gh_owner}/laminas-router) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.9 with php-autoloader(%{gh_owner}/laminas-view) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.11.3 with php-autoloader(%{gh_owner}/laminas-view) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { -# "http-interop/http-middleware": "^0.4.1 to be used together with laminas-stratigility", # "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", # "laminas/laminas-log": "^2.9.1 To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager", # "laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application", # "laminas/laminas-mvc-i18n": "laminas-mvc-i18n provides integration with laminas-i18n, including a translation bridge and translatable route segments", +# "laminas/laminas-mvc-middleware": "To dispatch middleware in your laminas-mvc application", # "laminas/laminas-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads", # "laminas/laminas-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests", # "laminas/laminas-mvc-plugin-identity": "To access the authenticated identity (per laminas-authentication) in controllers", # "laminas/laminas-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers", # "laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager", -# "laminas/laminas-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow", -# "laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application", -# "laminas/laminas-stratigility": "laminas-stratigility is required to use middleware pipes in the MiddlewareListener" -Suggests: php-composer(http-interop/http-middleware) +# "laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application" Suggests: php-autoloader(%{gh_owner}/laminas-json) Suggests: php-autoloader(%{gh_owner}/laminas-log) Suggests: php-autoloader(%{gh_owner}/laminas-mvc-console) Suggests: php-autoloader(%{gh_owner}/laminas-mvc-i18n) +Suggests: php-autoloader(%{gh_owner}/laminas-mvc-middleware) Suggests: php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg) Suggests: php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) Suggests: php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity) Suggests: php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg) Suggests: php-autoloader(%{gh_owner}/laminas-paginator) -Suggests: php-autoloader(%{gh_owner}/laminas-psr7bridge) Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager-di) -Suggests: php-autoloader(%{gh_owner}/laminas-stratigility) # remirepo:11 %else Requires: php-container-interop @@ -153,11 +152,12 @@ Requires: php-json Requires: php-pcre Requires: php-spl +# remirepo:2 Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 3.1.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 3.1.2 +Provides: php-zendframework-%{zf_name} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} @@ -247,6 +247,9 @@ cat << 'EOF' | tee vendor/autoload.php - 2.12.0-1 +* Tue Dec 15 2020 Remi Collet - 3.2.0-1 +- update to 3.2.0 +- raise dependency on PHP 7.3 +- raise dependency on laminas-stdlib 3.2.1 +- raise dependency on laminas-view 2.11.3 +- switch to phpunit9 + +* Wed Jan 15 2020 Remi Collet - 3.1.1-1 - switch to Laminas - use range dependencies -- cgit