diff options
| -rw-r--r-- | composer.json | 25 | ||||
| -rw-r--r-- | php-laminas-recaptcha.spec | 74 |
2 files changed, 52 insertions, 47 deletions
diff --git a/composer.json b/composer.json index a289014..e842b20 100644 --- a/composer.json +++ b/composer.json @@ -19,23 +19,20 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev", - "dev-develop": "3.3.x-dev" - } }, "require": { - "php": "^5.6 || ^7.0", - "laminas/laminas-http": "^2.5.4", - "laminas/laminas-json": "^2.6.1 || ^3.0", - "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0" + "php": "^7.3 || ~8.0.0", + "ext-json": "*", + "laminas/laminas-http": "^2.14", + "laminas/laminas-json": "^3.2", + "laminas/laminas-stdlib": "^3.3", + "laminas/laminas-zendframework-bridge": "^1.1" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-config": "^2.0", - "laminas/laminas-validator": "^2.8.2", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5" + "laminas/laminas-coding-standard": "~2.1.4", + "laminas/laminas-config": "^3.4", + "laminas/laminas-validator": "^2.14", + "phpunit/phpunit": "^9.4.3" }, "suggest": { "laminas/laminas-validator": "~2.0, if using ReCaptcha's Mailhide API" @@ -61,6 +58,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zendservice-recaptcha": "self.version" + "zendframework/zendservice-recaptcha": "^3.2.0" } } diff --git a/php-laminas-recaptcha.spec b/php-laminas-recaptcha.spec index 708ddb5..31d4be7 100644 --- a/php-laminas-recaptcha.spec +++ b/php-laminas-recaptcha.spec @@ -1,12 +1,12 @@ # remirepo/Fedora spec file for php-laminas-recaptcha # -# 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 f84222c958c9784db8bcc5b37a8021e5ffcb9557 +%global gh_commit 3275b19ee8a58007e508b2ea3fd2160582abdb73 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-recaptcha @@ -17,7 +17,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 3.2.0 +Version: 3.3.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -29,49 +29,51 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.3 BuildRequires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.0 with php-autoloader(%{gh_owner}/laminas-json) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.14 with php-autoloader(%{gh_owner}/laminas-http) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.2 with php-autoloader(%{gh_owner}/laminas-json) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer.json, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-config": "^2.0", -# "laminas/laminas-validator": "^2.8.2", -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 2.0 with php-autoloader(%{gh_owner}/laminas-config) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.8.2 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +# "laminas/laminas-coding-standard": "~2.1.4", +# "laminas/laminas-config": "^3.4", +# "laminas/laminas-validator": "^2.14", +# "phpunit/phpunit": "^9.4.3" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.4 with php-autoloader(%{gh_owner}/laminas-config) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3) # remirepo:8 %else BuildRequires: php-laminas-http BuildRequires: php-laminas-json BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge -BuildRequires: php-laminas-config +BuildRequires: php-laminas-config3 BuildRequires: php-laminas-validator %endif -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.5 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.4.3 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", -# "laminas/laminas-http": "^2.5.4", -# "laminas/laminas-json": "^2.6.1 || ^3.0", -# "laminas/laminas-stdlib": "^3.2.1", +# "php": "^7.3 || ~8.0.0", +# "ext-json": "*", +# "laminas/laminas-http": "^2.14", +# "laminas/laminas-json": "^3.2", +# "laminas/laminas-stdlib": "^3.3", # "laminas/laminas-zendframework-bridge": "^1.0" -Requires: php(language) >= 5.6 +Requires: php(language) >= 7.3 +Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.5.4 with php-autoloader(%{gh_owner}/laminas-http) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.0 with php-autoloader(%{gh_owner}/laminas-json) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 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) +Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.14 with php-autoloader(%{gh_owner}/laminas-http) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.2 with php-autoloader(%{gh_owner}/laminas-json) < 4) +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.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-validator": "~2.0, if using ReCaptcha's Mailhide API" Suggests: php-autoloader(%{gh_owner}/laminas-validator) @@ -84,12 +86,10 @@ Requires: php-laminas-zendframework-bridge %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 3.2.0 (mcrypt is optional) -Requires: php-json # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 3.2.0-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 3.2.1 +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} @@ -151,7 +151,7 @@ cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{namespace}/Config/autoload.php', + '%{php_home}/%{namespace}/Config3/autoload.php', '%{php_home}/%{namespace}/Validator/autoload.php', ]); \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); @@ -165,10 +165,10 @@ exit (class_exists("\\ZendService\\%{library}\\ReCaptcha") ? 0 : 1); : 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} --exclude online --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit9} --exclude online --verbose || ret=1 fi done exit $ret @@ -189,6 +189,14 @@ exit $ret %changelog +* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 3.3.0-1 +- update to 3.3.0 +- raise dependency on PHP 7.3 +- raise dependency on laminas-http 2.14 +- raise dependency on laminas-json 3.2 +- raise dependency on laminas-stdlib 3.3 +- raise dependency on laminas-zendframework-bridge 1.1 + * Mon Jan 13 2020 Remi Collet <remi@remirepo.net> - 3.2.0-1 - switch to Laminas |