diff options
| -rw-r--r-- | composer.json | 12 | ||||
| -rw-r--r-- | php-laminas-stdlib.spec | 33 |
2 files changed, 25 insertions, 20 deletions
diff --git a/composer.json b/composer.json index b374590..3f3031d 100644 --- a/composer.json +++ b/composer.json @@ -20,18 +20,18 @@ }, "extra": { "branch-alias": { - "dev-master": "3.2.x-dev", - "dev-develop": "3.3.x-dev" + "dev-master": "3.3.x-dev", + "dev-develop": "3.4.x-dev" } }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.3 || ^8.0", "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "phpbench/phpbench": "^0.13", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + "phpbench/phpbench": "^0.17.1", + "phpunit/phpunit": "^9.3.7" }, "autoload": { "psr-4": { @@ -55,6 +55,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-stdlib": "self.version" + "zendframework/zend-stdlib": "^3.2.1" } } diff --git a/php-laminas-stdlib.spec b/php-laminas-stdlib.spec index de0aac4..53cf6e9 100644 --- a/php-laminas-stdlib.spec +++ b/php-laminas-stdlib.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 2b18347625a2f06a1a485acfbc870f699dbe51c6 +%global gh_commit b9d84eaa39fde733356ea948cdef36c631f202b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-stdlib @@ -22,8 +22,8 @@ %endif Name: php-%{gh_project} -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: Laminas Framework %{library} component License: BSD @@ -34,7 +34,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-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) @@ -50,18 +50,18 @@ BuildRequires: php-posix BuildRequires: php-spl # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~1.0.0", -# "phpbench/phpbench": "^0.13", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.2 +# "phpbench/phpbench": "^0.17.1", +# "phpunit/phpunit": "^9.3.7" +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.3.7 # Autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer, "require": { -# "php": "^5.6 || ^7.0", +# "php": "^7.3 || ^8.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-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) @@ -83,8 +83,8 @@ Requires: php-composer(fedora/autoloader) Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 3.2.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 3.2.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} @@ -142,10 +142,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 @@ -172,6 +172,11 @@ exit $ret %changelog +* Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 3.3.0-1 +- update to 3.3.0 +- raise dependency on PHP 7.3 +- switch to phpunit 9.3 + * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 3.2.1-3 - cleanup |