diff options
| -rw-r--r-- | composer.json | 12 | ||||
| -rw-r--r-- | php-laminas-loader.spec | 33 |
2 files changed, 22 insertions, 23 deletions
diff --git a/composer.json b/composer.json index c9874b4..06f7b42 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,13 @@ "config": { "sort-packages": true }, - "extra": { - "branch-alias": { - "dev-master": "2.6.x-dev", - "dev-develop": "2.7.x-dev" - } - }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.3 || ~8.0.0", "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" + "phpunit/phpunit": "^9.3" }, "autoload": { "psr-4": { @@ -53,6 +47,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-loader": "self.version" + "zendframework/zend-loader": "^2.6.1" } } diff --git a/php-laminas-loader.spec b/php-laminas-loader.spec index 9a780c7..5ff8327 100644 --- a/php-laminas-loader.spec +++ b/php-laminas-loader.spec @@ -1,12 +1,12 @@ # remirepo/Fedora spec file for php-laminas-loader # -# 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 gh_commit 5d01c2c237ae9e68bec262f339947e2ea18979bc +%global gh_commit bcf8a566cb9925a2e7cc41a16db09235ec9fb616 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-loader @@ -17,8 +17,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: Laminas Framework %{library} component License: BSD @@ -29,7 +29,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) @@ -39,17 +39,17 @@ BuildRequires: php-laminas-zendframework-bridge %endif # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~1.0.0", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.4 +# "phpunit/phpunit": "^9.3" +%global phpunit %{_bindir}/phpunit8 +BuildRequires: phpunit9 >= 9.3 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", +# "php": "^7.3 || ~8.0.0", # "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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) @@ -67,8 +67,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.6.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 2.6.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} @@ -122,10 +122,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 @@ -152,6 +152,11 @@ exit $ret %changelog +* Mon Feb 15 2021 Remi Collet <remi@remirepo.net> - 2.7.0-1 +- update to 2.7.0 +- raise dependency on PHP 7.3 +- switch to phpunit9 + * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.6.1-2 - cleanup |