diff options
| -rw-r--r-- | composer.json | 18 | ||||
| -rw-r--r-- | php-laminas-tag.spec | 51 |
2 files changed, 35 insertions, 34 deletions
diff --git a/composer.json b/composer.json index 545d2b8..c7496c2 100644 --- a/composer.json +++ b/composer.json @@ -18,22 +18,16 @@ "config": { "sort-packages": true }, - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" - } - }, "require": { - "php": "^5.6 || ^7.0", - "laminas/laminas-escaper": "^2.5", - "laminas/laminas-stdlib": "^2.7 || ^3.0", + "php": "^7.3 || ~8.0.0", + "laminas/laminas-escaper": "^2.7", + "laminas/laminas-stdlib": "^3.3", "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" + "laminas/laminas-servicemanager": "^3.4.1", + "phpunit/phpunit": "^9.3" }, "suggest": { "laminas/laminas-servicemanager": "Laminas\\ServiceManager component" @@ -59,6 +53,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-tag": "self.version" + "zendframework/zend-tag": "^2.7.1" } } diff --git a/php-laminas-tag.spec b/php-laminas-tag.spec index bfad7f4..8a1ddf8 100644 --- a/php-laminas-tag.spec +++ b/php-laminas-tag.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-tag # -# Copyright (c) 2015-2020 Remi Collet +# Copyright (c) 2015-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 6af061af4d7a54f3ee6ba94846c0f21ad284dc10 +%global gh_commit f8d754c800196375869b7a4fae870ca89ab91bfb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-tag @@ -22,8 +22,8 @@ %endif Name: php-%{gh_project} -Version: 2.7.1 -Release: 2%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: %{namespace} Framework %{library} component License: BSD @@ -34,18 +34,18 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.3 BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" +# "laminas/laminas-servicemanager": "^3.4.1", +# "phpunit/phpunit": "^9.3" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.7 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # remirepo:6 %else @@ -54,22 +54,22 @@ BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-zendframework-bridge %endif -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.4 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.3 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", -# "laminas/laminas-escaper": "^2.5", -# "laminas/laminas-stdlib": "^2.7 || ^3.0", +# "php": "^7.3 || ~8.0.0", +# "laminas/laminas-escaper": "^2.7", +# "laminas/laminas-stdlib": "^3.3", # "laminas/laminas-zendframework-bridge": "^1.0" -Requires: php(language) >= 5.6 +Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.7 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 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-servicemanager": "Laminas\\ServiceManager component" @@ -90,8 +90,8 @@ Requires: php-spl Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 2.7.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 2.7.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} @@ -157,10 +157,10 @@ EOF : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php72 php73 php74; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 fi done @@ -187,6 +187,13 @@ exit $ret %changelog +* Thu Feb 25 2021 Remi Collet <remi@remirepo.net> - 2.8.0-1 +- update to 2.8.0 (no change) +- raise dependency on PHP 7.3 +- raise dependency on laminas-escaper 2.7 +- raise dependency on laminas-stdlib 3.2 +- switch to phpunit9 + * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.7.2-2 - cleanup |