diff options
| -rw-r--r-- | composer.json | 25 | ||||
| -rw-r--r-- | php-laminas-captcha.spec | 61 |
2 files changed, 51 insertions, 35 deletions
diff --git a/composer.json b/composer.json index 6bd5b52..e56585e 100644 --- a/composer.json +++ b/composer.json @@ -18,24 +18,27 @@ "config": { "sort-packages": true, "platform": { - "php": "7.3.99" + "php": "7.4.99" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true } }, "extra": {}, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", - "laminas/laminas-math": "^2.7 || ^3.0", - "laminas/laminas-recaptcha": "^3.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "laminas/laminas-recaptcha": "^3.4.0", "laminas/laminas-session": "^2.12", - "laminas/laminas-stdlib": "^3.6", - "laminas/laminas-text": "^2.8", - "laminas/laminas-validator": "^2.14" + "laminas/laminas-stdlib": "^3.10.1", + "laminas/laminas-text": "^2.9.0", + "laminas/laminas-validator": "^2.19.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.1.4", - "phpunit/phpunit": "^9.4.3", - "psalm/plugin-phpunit": "^0.15.1", - "vimeo/psalm": "^4.6" + "ext-gd": "*", + "laminas/laminas-coding-standard": "~2.3.0", + "phpunit/phpunit": "^9.5.21", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "suggest": { "laminas/laminas-i18n-resources": "Translations of captcha messages" diff --git a/php-laminas-captcha.spec b/php-laminas-captcha.spec index b84e90d..2f07c13 100644 --- a/php-laminas-captcha.spec +++ b/php-laminas-captcha.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b07e499a7df73795768aa89e0138757a7ddb9195 +%global gh_commit debd6783ce593cb2e4cf74c3028baf1730918d85 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-captcha @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.12.0 +Version: 2.13.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -34,24 +34,25 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-date BuildRequires: php-gd BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/laminas-math) >= 2.7 with php-autoloader(%{gh_owner}/laminas-math) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.4.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.8 with php-autoloader(%{gh_owner}/laminas-text) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-text) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.19.0 with php-autoloader(%{gh_owner}/laminas-validator) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~2.1.4", -# "phpunit/phpunit": "^9.4.3", -# "psalm/plugin-phpunit": "^0.15.1", -# "vimeo/psalm": "^4.6" +# "ext-gd": "*", +# "laminas/laminas-coding-standard": "~2.3.0", +# "phpunit/phpunit": "^9.5.21", +# "psalm/plugin-phpunit": "^0.17.0", +# "vimeo/psalm": "^4.24.0" # remirepo:9 %else BuildRequires: php-laminas-math @@ -62,30 +63,31 @@ BuildRequires: php-laminas-session BuildRequires: php-laminas-text BuildRequires: php-laminas-validator %endif +BuildRequires: php-gd %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.4.3 +BuildRequires: phpunit9 >= 9.5.21 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "php": "^7.4 || ~8.0.0 || ~8.1.0", # "laminas/laminas-math": "^2.7 || ^3.0", -# "laminas/laminas-recaptcha": "^3.0", +# "laminas/laminas-recaptcha": "^3.4.0", # "laminas/laminas-session": "^2.12", -# "laminas/laminas-stdlib": "^3.6", -# "laminas/laminas-text": "^2.8", -# "laminas/laminas-validator": "^2.14" -Requires: php(language) >= 7.3 +# "laminas/laminas-stdlib": "^3.10.1", +# "laminas/laminas-text": "^2.9.0", +# "laminas/laminas-validator": "^2.19.0" +Requires: php(language) >= 7.4 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-math) >= 2.7 with php-autoloader(%{gh_owner}/laminas-math) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.4.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.8 with php-autoloader(%{gh_owner}/laminas-text) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-text) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.19.0 with php-autoloader(%{gh_owner}/laminas-validator) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "laminas/laminas-i18n-resources": "Translations of captcha messages", @@ -190,13 +192,16 @@ exit (class_exists("\\Zend\\%{library}\\Image") ? 0 : 1); ' # No TESTS_LAMINAS_CAPTCHA_RECAPTCHA_SUPPORT as online +# and skip online tests: testValidationForDifferentElementNametest, testValidationForResponseElementName : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(testValidationForDifferentElementName|testValidationForResponseElementName)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -216,6 +221,14 @@ exit $ret %changelog +* Mon Jul 25 2022 Remi Collet <remi@remirepo.net> - 2.13.0-1 +- update to 2.13.0 +- raise dependency on PHP 7.4 +- raise dependency on laminas-recaptcha 3.4.0 +- raise dependency on laminas-stdlib 3.10.1 +- raise dependency on laminas-text 2.9.0 +- raise dependency on laminas-validator 2.19.0 + * Thu Apr 7 2022 Remi Collet <remi@remirepo.net> - 2.12.0-1 - update to 2.12.0 (no change) - add mandatory dependencies on recaptcha, session, text and validator |