From 3c46e022804fe41977c4bdeabe240fc4eecc47a3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jun 2022 12:16:28 +0200 Subject: update to 2.20.0 raise dependency on PHP 7.4 add dependency on laminas-servicemanager drop dependency on container-interop/container-interop drop weak dependency on laminas-math --- composer.json | 19 +++++------- php-laminas-validator.spec | 76 ++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 50 deletions(-) diff --git a/composer.json b/composer.json index 47e28d9..5a9deb5 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.3.99" + "php": "7.4.99" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -31,35 +31,32 @@ } }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0", - "container-interop/container-interop": "^1.1", + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "laminas/laminas-servicemanager": "^3.12.0", "laminas/laminas-stdlib": "^3.10" }, "require-dev": { "laminas/laminas-cache": "^2.6.1", "laminas/laminas-coding-standard": "~2.2.1", "laminas/laminas-db": "^2.7", - "laminas/laminas-filter": "^2.6", + "laminas/laminas-filter": "^2.14.0", "laminas/laminas-http": "^2.14.2", - "laminas/laminas-i18n": "^2.6", - "laminas/laminas-math": "^2.6", - "laminas/laminas-servicemanager": "^2.7.11 || ^3.0.3", - "laminas/laminas-session": "^2.8", - "laminas/laminas-uri": "^2.7", + "laminas/laminas-i18n": "^2.15.0", + "laminas/laminas-session": "^2.12.1", + "laminas/laminas-uri": "^2.9.1", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.15.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", - "vimeo/psalm": "^4.3" + "vimeo/psalm": "^4.23" }, "suggest": { "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator", "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages", "laminas/laminas-i18n-resources": "Translations of validator messages", - "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator", "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator", "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators", diff --git a/php-laminas-validator.spec b/php-laminas-validator.spec index 75ab758..282d470 100644 --- a/php-laminas-validator.spec +++ b/php-laminas-validator.spec @@ -8,7 +8,7 @@ # # When buid without db, filter, http, session, uri %global bootstrap 0 -%global gh_commit 4875d4e58b6f728981bb767a60530540f82ee1df +%global gh_commit ba665f5a52763dda5a747c4ad826d2adf1510486 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-validator @@ -19,7 +19,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.19.0 +Version: 2.20.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -31,7 +31,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-fileinfo @@ -41,20 +41,18 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10 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-servicemanager) >= 3.12.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10 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) # From composer, "require-dev": { # "laminas/laminas-cache": "^2.6.1", # "laminas/laminas-coding-standard": "~2.2.1", # "laminas/laminas-db": "^2.7", -# "laminas/laminas-filter": "^2.6", +# "laminas/laminas-filter": "^2.14.0", # "laminas/laminas-http": "^2.14.2", -# "laminas/laminas-i18n": "^2.6", -# "laminas/laminas-math": "^2.6", -# "laminas/laminas-servicemanager": "^2.7.11 || ^3.0.3", -# "laminas/laminas-session": "^2.8", -# "laminas/laminas-uri": "^2.7", +# "laminas/laminas-i18n": "^2.15.0", +# "laminas/laminas-session": "^2.12.1", +# "laminas/laminas-uri": "^2.9.1", # "phpspec/prophecy-phpunit": "^2.0", # "phpunit/phpunit": "^9.5.5", # "psalm/plugin-phpunit": "^0.15.0", @@ -62,30 +60,26 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "psr/http-factory": "^1.0", # "psr/http-message": "^1.0", # "vimeo/psalm": "^4.3" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-cache) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) -# ignore max version -BuildRequires: (php-autoloader(%{gh_owner}/laminas-math) >= 2.6 with php-autoloader(%{gh_owner}/laminas-math) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-cache) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.15.0 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) %if ! %{bootstrap} -BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.7 with php-autoloader(%{gh_owner}/laminas-db) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.6 with php-autoloader(%{gh_owner}/laminas-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.7 with php-autoloader(%{gh_owner}/laminas-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.14.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.14.2 with php-autoloader(%{gh_owner}/laminas-http) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8 with php-autoloader(%{gh_owner}/laminas-session) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.7 with php-autoloader(%{gh_owner}/laminas-uri) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12.1 with php-autoloader(%{gh_owner}/laminas-session) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-uri) < 3) %endif -BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) -BuildRequires: (php-composer(psr/http-client) >= 1.0 with php-composer(psr/http-client) < 2) -BuildRequires: (php-composer(psr/http-factory) >= 1.0 with php-composer(psr/http-factory) < 2) -BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) -# remirepo:20 +BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) +BuildRequires: (php-composer(psr/http-client) >= 1.0 with php-composer(psr/http-client) < 2) +BuildRequires: (php-composer(psr/http-factory) >= 1.0 with php-composer(psr/http-factory) < 2) +BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) +# remirepo:19 %else -BuildRequires: php-container-interop +BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-laminas-cache BuildRequires: php-laminas-i18n -BuildRequires: php-laminas-math BuildRequires: php-laminas-servicemanager %if ! %{bootstrap} BuildRequires: php-laminas-db @@ -105,21 +99,20 @@ BuildRequires: phpunit9 >= 9.5.5 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", -# "container-interop/container-interop": "^1.1", +# "php": "^7.4 || ~8.0.0 || ~8.1.0", +# "laminas/laminas-servicemanager": "^3.12.0", # "laminas/laminas-stdlib": "^3.10" -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10 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-servicemanager) >= 3.12.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10 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) # From composer, "suggest": { # "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator", # "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator", # "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages", # "laminas/laminas-i18n-resources": "Translations of validator messages", -# "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator", # "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", # "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator", # "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators", @@ -128,14 +121,13 @@ Suggests: php-composer(%{gh_owner}/laminas-db) Suggests: php-composer(%{gh_owner}/laminas-filter) Suggests: php-composer(%{gh_owner}/laminas-i18n) Suggests: php-composer(%{gh_owner}/laminas-i18n-resources) -Suggests: php-composer(%{gh_owner}/laminas-math) Suggests: php-composer(%{gh_owner}/laminas-servicemanager) Suggests: php-composer(%{gh_owner}/laminas-session) Suggests: php-composer(%{gh_owner}/laminas-uri) Recommends: php-composer(psr/http-message) # remirepo:5 %else -Requires: php-container-interop +Requires: php-laminas-servicemanager Requires: php-laminas-stdlib Requires: php-laminas-zendframework-bridge %endif @@ -181,7 +173,7 @@ mv LICENSE.md LICENSE phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Interop/Container/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ @@ -190,7 +182,6 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/%{namespace}/Filter/autoload.php', '%{php_home}/%{namespace}/I18n/autoload.php', '%{php_home}/%{namespace}/I18n/Translator/autoload.php', - '%{php_home}/%{namespace}/Math/autoload.php', '%{php_home}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Validator/autoload.php', '%{php_home}/%{namespace}/Session/autoload.php', @@ -275,6 +266,13 @@ exit $ret %changelog +* Thu Jun 16 2022 Remi Collet - 2.20.0-1 +- update to 2.20.0 +- raise dependency on PHP 7.4 +- add dependency on laminas-servicemanager +- drop dependency on container-interop/container-interop +- drop weak dependency on laminas-math + * Fri Jun 10 2022 Remi Collet - 2.19.0-1 - update to 2.19.0 -- cgit