From a8e75d98e984dd4d764369867be51c120094493f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Jan 2022 14:55:46 +0100 Subject: update to 3.1.0 raise dependency on PHP 7.4 raise dependency on laminas-hydrator 4.3.0 raise dependency on laminas-inputfilter 2.13.0 raise dependency on laminas-stdlib 3.6.1 rename to php-laminas-form3 install in /usr/share/php/Laminas/Form3 remove ZF compatibility layer --- composer.json | 78 +++++++++---------- php-laminas-form3.spec | 208 ++++++++++++++++++++++--------------------------- 2 files changed, 132 insertions(+), 154 deletions(-) diff --git a/composer.json b/composer.json index 7313446..a59f61f 100644 --- a/composer.json +++ b/composer.json @@ -8,47 +8,50 @@ "homepage": "https://laminas.dev", "license": "BSD-3-Clause", "require": { - "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" - }, - "replace": { - "zendframework/zend-form": "^2.14.3" + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "laminas/laminas-hydrator": "^4.3.0", + "laminas/laminas-inputfilter": "^2.13.0", + "laminas/laminas-stdlib": "^3.6.1" }, "conflict": { - "laminas/laminas-code": "<3.5.0 || >=4.0.0" + "doctrine/annotations": "<1.12.0", + "laminas/laminas-captcha": "<2.11.0", + "laminas/laminas-eventmanager": "<3.4.0", + "laminas/laminas-i18n": "<2.12.0", + "laminas/laminas-recaptcha": "<3.4.0", + "laminas/laminas-servicemanager": "<3.10.0", + "laminas/laminas-view": "<2.14.0" }, "require-dev": { - "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", - "psalm/plugin-phpunit": "^0.15.1", - "vimeo/psalm": "^4.7" + "ext-intl": "*", + "doctrine/annotations": "^1.12.0", + "laminas/laminas-captcha": "^2.11.0", + "laminas/laminas-coding-standard": "^2.3.0", + "laminas/laminas-db": "^2.13.4", + "laminas/laminas-escaper": "^2.9.0", + "laminas/laminas-eventmanager": "^3.4.0", + "laminas/laminas-filter": "^2.13.0", + "laminas/laminas-i18n": "^2.12.0", + "laminas/laminas-modulemanager": "^2.11.0", + "laminas/laminas-recaptcha": "^3.4.0", + "laminas/laminas-servicemanager": "^3.10.0", + "laminas/laminas-session": "^2.12.0", + "laminas/laminas-text": "^2.9.0", + "laminas/laminas-validator": "^2.15.1", + "laminas/laminas-view": "^2.14.0", + "phpspec/prophecy-phpunit": "^2.0.1", + "phpunit/phpunit": "^9.5.10", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.13.1" }, "suggest": { - "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" + "doctrine/annotations": "^1.12, required to use laminas-form annotations support", + "laminas/laminas-captcha": "^2.11, required for using CAPTCHA form elements", + "laminas/laminas-eventmanager": "^3.4, reuired for laminas-form annotations support", + "laminas/laminas-i18n": "^2.12, required when using laminas-form view helpers", + "laminas/laminas-recaptcha": "^3.4, in order to use the ReCaptcha form element", + "laminas/laminas-servicemanager": "^3.10, required to use the form factories or provide services", + "laminas/laminas-view": "^2.14, required for using the laminas-form view helpers" }, "config": { "sort-packages": true @@ -67,10 +70,7 @@ "autoload-dev": { "psr-4": { "LaminasTest\\Form\\": "test/" - }, - "files": [ - "test/_autoload.php" - ] + } }, "scripts": { "check": [ diff --git a/php-laminas-form3.spec b/php-laminas-form3.spec index 8c6f49c..efe5de4 100644 --- a/php-laminas-form3.spec +++ b/php-laminas-form3.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-laminas-form +# remirepo/Fedora spec file for php-laminas-form3 # # Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 2a18e6724739f3f1875d30a6bb8ecedb3da5242e +%global gh_commit beee25df568f1140d5553eabe51f97c6643f0464 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-form @@ -15,13 +15,14 @@ %global php_home %{_datadir}/php %global namespace Laminas %global library Form +%global major 3 %bcond_without tests -Name: php-%{gh_project} -Version: 2.17.0 +Name: php-%{gh_project}%{major} +Version: 3.1.0 Release: 1%{?dist} -Summary: %{namespace} Framework %{library} component +Summary: %{namespace} Framework %{library} component version %{major} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} @@ -31,7 +32,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.4 BuildRequires: php-date BuildRequires: php-intl BuildRequires: php-mbstring @@ -40,58 +41,59 @@ BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 # 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) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 4.3 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.13 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) # From composer, "require-dev": { -# "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" -# "psalm/plugin-phpunit": "^0.15.1", -# "vimeo/psalm": "^4.7" -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) +# "ext-intl": "*", +# "doctrine/annotations": "^1.12.0", +# "laminas/laminas-captcha": "^2.11.0", +# "laminas/laminas-coding-standard": "^2.3.0", +# "laminas/laminas-db": "^2.13.4", +# "laminas/laminas-escaper": "^2.9.0", +# "laminas/laminas-eventmanager": "^3.4.0", +# "laminas/laminas-filter": "^2.13.0", +# "laminas/laminas-i18n": "^2.12.0", +# "laminas/laminas-modulemanager": "^2.11.0", +# "laminas/laminas-recaptcha": "^3.4.0", +# "laminas/laminas-servicemanager": "^3.10.0", +# "laminas/laminas-session": "^2.12.0", +# "laminas/laminas-text": "^2.9.0", +# "laminas/laminas-validator": "^2.15.1", +# "laminas/laminas-view": "^2.14.0", +# "phpspec/prophecy-phpunit": "^2.0.1", +# "phpunit/phpunit": "^9.5.10", +# "psalm/plugin-phpunit": "^0.16.1", +# "vimeo/psalm": "^4.13.1" +BuildRequires: (php-composer(doctrine/annotations) >= 1.12.0 with php-composer(doctrine/annotations) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-captcha) >= 2.11.0 with php-autoloader(%{gh_owner}/laminas-captcha) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.13.4 with php-autoloader(%{gh_owner}/laminas-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.13.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.12.0 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.11.0 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.4.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.10.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12.0 with php-autoloader(%{gh_owner}/laminas-session) < 3) +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.15.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.14.0 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-hydrator3 +BuildRequires: php-laminas-hydrator4 BuildRequires: php-laminas-stdlib -BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-doctrine-annotations -BuildRequires: php-laminas-cache BuildRequires: php-laminas-captcha -BuildRequires: php-laminas-code +BuildRequires: php-laminas-db BuildRequires: php-laminas-escaper BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-filter BuildRequires: php-laminas-i18n +BuildRequires: php-laminas-modulemanager +BuildRequires: php-laminas-recaptcha BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-session BuildRequires: php-laminas-text @@ -100,49 +102,47 @@ BuildRequires: php-laminas-view BuildRequires: php-phpspec-prophecy-phpunit %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.4.2 +BuildRequires: phpunit9 >= 9.5.10 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "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 +# "php": "^7.4 || ~8.0.0 || ~8.1.0", +# "laminas/laminas-hydrator": "^4.3.0", +# "laminas/laminas-inputfilter": "^2.13.0", +# "laminas/laminas-stdlib": "^3.6.1" +Requires: php(language) >= 7.4 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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) +Requires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 4.3 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5) +Requires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.13 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) # 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.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" +# "doctrine/annotations": "^1.12, required to use laminas-form annotations support", +# "laminas/laminas-captcha": "^2.11, required for using CAPTCHA form elements", +# "laminas/laminas-eventmanager": "^3.4, reuired for laminas-form annotations support", +# "laminas/laminas-i18n": "^2.12, required when using laminas-form view helpers", +# "laminas/laminas-recaptcha": "^3.4, in order to use the ReCaptcha form element", +# "laminas/laminas-servicemanager": "^3.10, required to use the form factories or provide services", +# "laminas/laminas-view": "^2.14, required for using the laminas-form view helpers" %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 +Suggests: php-composer(doctrine/annotations) Suggests: php-autoloader(%{gh_owner}/laminas-captcha) -Suggests: php-autoloader(%{gh_owner}/laminas-code) Suggests: php-autoloader(%{gh_owner}/laminas-eventmanager) Suggests: php-autoloader(%{gh_owner}/laminas-i18n) -Suggests: php-autoloader(%{gh_owner}/laminas-view) Suggests: php-autoloader(%{gh_owner}/laminas-recaptcha) +Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) +Suggests: php-autoloader(%{gh_owner}/laminas-view) %endif -# remirepo:8 +# remirepo:7 %else Requires: php-laminas-inputfilter -Requires: php-laminas-hydrator3 +Requires: php-laminas-hydrator4 Requires: php-laminas-stdlib -Requires: php-laminas-zendframework-bridge # Mandory because of Polyfill Requires: php-laminas-servicemanager %endif @@ -156,16 +156,8 @@ Requires: php-mbstring Requires: php-pcre Requires: php-spl -# remirepo:2 -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -# Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 2.14.4 -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} -Provides: php-autoloader(zendframework/%{zf_name}) = %{version} %description @@ -187,32 +179,19 @@ mv LICENSE.md LICENSE : Create autoloader phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/%{namespace}/Hydrator4/autoload.php', + '%{php_home}/%{namespace}/InputFilter/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', +]); \Fedora\Autoloader\Dependencies::optional([ + '%{php_home}/Doctrine/Common/Annotations/autoload.php', '%{php_home}/%{namespace}/Captcha/autoload.php', - '%{php_home}/%{namespace}/Code/autoload.php', '%{php_home}/%{namespace}/EventManager/autoload.php', '%{php_home}/%{namespace}/I18n/autoload.php', - '%{php_home}/%{namespace}/View/autoload.php', '%{php_home}/%{namespace}/ReCaptcha/autoload.php', -]); -# Polyfill must be loaded after ServiceManager -\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}/Stdlib/autoload.php', '%{php_home}/%{namespace}/ServiceManager/autoload.php', -]); -EOF - -cat << 'EOF' | tee zf.php - - 3.1.0-1 +- update to 3.1.0 +- raise dependency on PHP 7.4 +- raise dependency on laminas-hydrator 4.3.0 +- raise dependency on laminas-inputfilter 2.13.0 +- raise dependency on laminas-stdlib 3.6.1 +- rename to php-laminas-form3 +- install in /usr/share/php/Laminas/Form3 +- remove ZF compatibility layer + * Tue May 25 2021 Remi Collet - 2.17.0-1 - update to 2.17.0 -- cgit