diff options
| -rw-r--r-- | composer.json | 62 | ||||
| -rw-r--r-- | php-laminas-form.spec | 138 |
2 files changed, 105 insertions, 95 deletions
diff --git a/composer.json b/composer.json index 54f2ad6..fdcbdb8 100644 --- a/composer.json +++ b/composer.json @@ -25,46 +25,44 @@ } }, "require": { - "php": "^5.6 || ^7.0", - "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0", - "laminas/laminas-inputfilter": "^2.8", - "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0" + "php": "^7.3 || ~8.0.0", + "laminas/laminas-hydrator": "^3.2 || ^4.0", + "laminas/laminas-inputfilter": "^2.10", + "laminas/laminas-stdlib": "^3.3", + "laminas/laminas-zendframework-bridge": "^1.1" }, "require-dev": { - "doctrine/annotations": "~1.0", - "laminas/laminas-cache": "^2.6.1", - "laminas/laminas-captcha": "^2.7.1", - "laminas/laminas-code": "^2.6 || ^3.0", - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-escaper": "^2.5", - "laminas/laminas-eventmanager": "^2.6.2 || ^3.0", - "laminas/laminas-filter": "^2.6", - "laminas/laminas-i18n": "^2.6", - "laminas/laminas-recaptcha": "^3.0.0", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", - "laminas/laminas-session": "^2.8.1", - "laminas/laminas-text": "^2.6", - "laminas/laminas-validator": "^2.6", - "laminas/laminas-view": "^2.6.2", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20" + "doctrine/annotations": "^1.10.4", + "laminas/laminas-cache": "^2.9.0", + "laminas/laminas-captcha": "^2.9.0", + "laminas/laminas-code": "^3.5.0", + "laminas/laminas-coding-standard": "^1.0.0", + "laminas/laminas-escaper": "^2.6.1", + "laminas/laminas-eventmanager": "^3.3.0", + "laminas/laminas-filter": "^2.9.4", + "laminas/laminas-i18n": "^2.10.3", + "laminas/laminas-recaptcha": "^3.2.0", + "laminas/laminas-servicemanager": "^3.4.1", + "laminas/laminas-session": "^2.9.3", + "laminas/laminas-text": "^2.7.1", + "laminas/laminas-validator": "^2.13.4", + "laminas/laminas-view": "^2.11.4", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.4.2" }, "suggest": { - "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements", - "laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support", - "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support", - "laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers", - "laminas/laminas-recaptcha": "in order to use the ReCaptcha form element", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services", - "laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers" + "laminas/laminas-captcha": "^2.9, required for using CAPTCHA form elements", + "laminas/laminas-code": "^3.5, required to use laminas-form annotations support", + "laminas/laminas-eventmanager": "^3.3, reuired for laminas-form annotations support", + "laminas/laminas-i18n": "^2.10, required when using laminas-form view helpers", + "laminas/laminas-recaptcha": "^3.2, in order to use the ReCaptcha form element", + "laminas/laminas-servicemanager": "^3.4.1, required to use the form factories or provide services", + "laminas/laminas-view": "^2.11.4, required for using the laminas-form view helpers" }, "autoload": { "psr-4": { "Laminas\\Form\\": "src/" - }, - "files": [ - "autoload/formElementManagerPolyfill.php" - ] + } }, "autoload-dev": { "files": [ diff --git a/php-laminas-form.spec b/php-laminas-form.spec index cc9f02e..c37c248 100644 --- a/php-laminas-form.spec +++ b/php-laminas-form.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 37c5f5ac9240159f5d93f52367d0e57fa96f9b22 +%global gh_commit 43e083923386918d228503c0b1e01490c75cbca1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-form @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project} -Version: 2.15.1 +Version: 2.16.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -43,41 +43,44 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.8 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 3 with php-autoloader(%{gh_owner}/laminas-hydrator) < 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) +# Only v3 for build +BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 3.2 with php-autoloader(%{gh_owner}/laminas-hydrator) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.10 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3) +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, "require-dev": { -# "doctrine/annotations": "~1.0", -# "laminas/laminas-cache": "^2.6.1", -# "laminas/laminas-captcha": "^2.7.1", -# "laminas/laminas-code": "^2.6 || ^3.0", -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-escaper": "^2.5", -# "laminas/laminas-eventmanager": "^2.6.2 || ^3.0", -# "laminas/laminas-filter": "^2.6", -# "laminas/laminas-i18n": "^2.6", -# "laminas/laminas-recaptcha": "^3.0.0", -# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", -# "laminas/laminas-session": "^2.8.1", -# "laminas/laminas-text": "^2.6", -# "laminas/laminas-validator": "^2.6", -# "laminas/laminas-view": "^2.6.2", -# "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20" -BuildRequires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-cache) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-captcha) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 2.6 with php-autoloader(%{gh_owner}/laminas-code) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.6 with php-autoloader(%{gh_owner}/laminas-filter) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.1 with php-autoloader(%{gh_owner}/laminas-session) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.6 with php-autoloader(%{gh_owner}/laminas-text) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.6 with php-autoloader(%{gh_owner}/laminas-validator) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.2 with php-autoloader(%{gh_owner}/laminas-view) < 3) -# remirepo:19 +# "doctrine/annotations": "^1.10.4", +# "laminas/laminas-cache": "^2.9.0", +# "laminas/laminas-captcha": "^2.9.0", +# "laminas/laminas-code": "^3.5.0", +# "laminas/laminas-coding-standard": "^1.0.0", +# "laminas/laminas-escaper": "^2.6.1", +# "laminas/laminas-eventmanager": "^3.3.0", +# "laminas/laminas-filter": "^2.9.4", +# "laminas/laminas-i18n": "^2.10.3", +# "laminas/laminas-recaptcha": "^3.2.0", +# "laminas/laminas-servicemanager": "^3.4.1", +# "laminas/laminas-session": "^2.9.3", +# "laminas/laminas-text": "^2.7.1", +# "laminas/laminas-validator": "^2.13.4", +# "laminas/laminas-view": "^2.11.4", +# "phpspec/prophecy-phpunit": "^2.0", +# "phpunit/phpunit": "^9.4.2" +BuildRequires: (php-composer(doctrine/annotations) >= 1.10.4 with php-composer(doctrine/annotations) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-cache) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-captcha) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.5.0 with php-autoloader(%{gh_owner}/laminas-code) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.9.4 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.10.3 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.9.3 with php-autoloader(%{gh_owner}/laminas-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-text) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.13.4 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.11.4 with php-autoloader(%{gh_owner}/laminas-view) < 3) +BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) +# remirepo:20 %else BuildRequires: php-laminas-inputfilter BuildRequires: php-laminas-hydrator @@ -96,37 +99,38 @@ BuildRequires: php-laminas-session BuildRequires: php-laminas-text BuildRequires: php-laminas-validator BuildRequires: php-laminas-view +BuildRequires: php-phpspec-prophecy-phpunit %endif -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.5.20 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.4.2 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", -# "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0", -# "laminas/laminas-inputfilter": "^2.8", -# "laminas/laminas-stdlib": "^3.2.1", -# "laminas/laminas-zendframework-bridge": "^1.0" -Requires: php(language) >= 5.6 +# "php": "^7.3 || ~8.0.0", +# "laminas/laminas-hydrator": "^3.2 || ^4.0", +# "laminas/laminas-inputfilter": "^2.10", +# "laminas/laminas-stdlib": "^3.3", +# "laminas/laminas-zendframework-bridge": "^1.1" +Requires: php(language) >= 7.3 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.8 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 1.1 with php-autoloader(%{gh_owner}/laminas-hydrator) < 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-hydrator) >= 3.2 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5) +Requires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.10 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 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.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # Mandory because of Polyfill Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) # From composer, "suggest": { -# "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements", -# "laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support", -# "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support", -# "laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers", -# "laminas/laminas-recaptcha": "in order to use the ReCaptcha form element", -# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services", -# "laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers" +# "laminas/laminas-captcha": "^2.9, required for using CAPTCHA form elements", +# "laminas/laminas-code": "^3.5, required to use laminas-form annotations support", +# "laminas/laminas-eventmanager": "^3.3, reuired for laminas-form annotations support", +# "laminas/laminas-i18n": "^2.10, required when using laminas-form view helpers", +# "laminas/laminas-recaptcha": "^3.2, in order to use the ReCaptcha form element", +# "laminas/laminas-servicemanager": "^3.4.1, required to use the form factories or provide services", +# "laminas/laminas-view": "^2.11.4, required for using the laminas-form view helpers" %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-autoloader(%{gh_owner}/laminas-captcha) Suggests: php-autoloader(%{gh_owner}/laminas-code) @@ -180,8 +184,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/ mv LICENSE.md LICENSE -mv autoload/formElementManagerPolyfill.php src - %build : Create autoloader @@ -199,12 +201,11 @@ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/%{namespace}/InputFilter/autoload.php', [ + '%{php_home}/%{namespace}/Hydrator4/autoload.php', '%{php_home}/%{namespace}/Hydrator3/autoload.php', - '%{php_home}/%{namespace}/Hydrator/autoload.php', ], '%{php_home}/%{namespace}/Stdlib/autoload.php', '%{php_home}/%{namespace}/ServiceManager/autoload.php', - __DIR__ . '/formElementManagerPolyfill.php', ]); EOF @@ -237,7 +238,8 @@ require_once '%{php_home}/%{namespace}/Hydrator3/autoload.php'; require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); \Fedora\Autoloader\Dependencies::required([ - dirname(__DIR__) . '/test/_autoload.php', + dirname(__DIR__) . '/test/_autoload.php', + '%{php_home}/Prophecy/PhpUnit/autoload.php', '%{php_home}/%{namespace}/Cache/autoload.php', '%{php_home}/%{namespace}/Escaper/autoload.php', '%{php_home}/%{namespace}/Filter/autoload.php', @@ -254,13 +256,14 @@ require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php"; exit (class_exists("\\Zend\\%{library}\\Factory") ? 0 : 1); ' +# May fail on local build when laminas-form is installed + : upstream test suite ret=0 -# TODO php80 -for cmdarg in "php %{phpunit}" php73 php74; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit7} -d memory_limit=1G || ret=1 + $1 ${2:-%{_bindir}/phpunit9} -d memory_limit=1G || ret=1 fi done exit $ret @@ -280,6 +283,15 @@ exit $ret %changelog +* Fri Mar 19 2021 Remi Collet <remi@remirepo.net> - 2.16.0-1 +- update to 2.16.0 +- raise dependency on PHP 7.3 +- raise dependency on laminas-hydrator 3.2 +- raise dependency on laminas-inputfilter 2.10 +- raise dependency on laminas-stdlib 3.3 +- raise dependency on laminas-zendframework-bridge 1.1 +- switch to phpunit9 + * Thu Mar 18 2021 Remi Collet <remi@remirepo.net> - 2.15.1-1 - update to 2.15.1 - temporarily disable test suite with PHP 8 |