From 03b5c833518a9d55ff758f23ef74b9a529b2540f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Dec 2018 11:33:27 +0100 Subject: update to 2.9.0 raise dependency on zend-filter 2.9.1 raise dependency on zend-validator 2.11 --- composer.json | 14 +++++++---- php-zendframework-zend-inputfilter.spec | 41 ++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 0a78d1c..d895faf 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "2.9.x-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "2.10.x-dev" }, "zf": { "component": "Zend\\InputFilter", @@ -30,15 +30,19 @@ }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-filter": "^2.6", + "zendframework/zend-filter": "^2.9.1", + "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1", "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-validator": "^2.10.1", - "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1" + "zendframework/zend-validator": "^2.11" }, "require-dev": { "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "psr/http-message": "^1.0", "zendframework/zend-coding-standard": "~1.0.0" }, + "suggest": { + "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads" + }, "autoload": { "psr-4": { "Zend\\InputFilter\\": "src/" diff --git a/php-zendframework-zend-inputfilter.spec b/php-zendframework-zend-inputfilter.spec index 42a43e4..b5c3274 100644 --- a/php-zendframework-zend-inputfilter.spec +++ b/php-zendframework-zend-inputfilter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 799ad48ed1666d3c62126fec73dd20453b3a9e4d +%global gh_commit c34ca7a1bffe2d089edbf96166435bffca8aa940 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-inputfilter @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.3 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -37,51 +37,60 @@ BuildRequires: php(language) >= 5.6 BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6 with php-autoloader(%{gh_owner}/zend-filter) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.9.1 with php-autoloader(%{gh_owner}/zend-filter) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.11 with php-autoloader(%{gh_owner}/zend-validator) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) # remirepo:10 %else BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.9.1 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-validator) < 3 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.11 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 %endif # From composer, "require-dev": { # "phpunit/phpunit": "^5.7.23 || ^6.4.3", +# "psr/http-message": "^1.0", # "zendframework/zend-coding-standard": "~1.0.0" BuildRequires: phpunit6 >= 6.4.3 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) +# remirepo:4 +%else +BuildRequires: php-composer(psr/http-message) < 2 +BuildRequires: php-composer(psr/http-message) >= 1.0 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-filter": "^2.6", +# "zendframework/zend-filter": "^2.9.1", # "zendframework/zend-stdlib": "^2.7 || ^3.0" -# "zendframework/zend-validator": "^2.10.1", # "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1" +# "zendframework/zend-validator": "^2.11", Requires: php(language) >= 5.6 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6 with php-autoloader(%{gh_owner}/zend-filter) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.9.1 with php-autoloader(%{gh_owner}/zend-filter) < 3) Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/zend-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.11 with php-autoloader(%{gh_owner}/zend-validator) < 3) Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) # remirepo:10 %else Requires: php-autoloader(%{gh_owner}/zend-filter) < 3 -Requires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6 +Requires: php-autoloader(%{gh_owner}/zend-filter) >= 2.9.1 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-autoloader(%{gh_owner}/zend-validator) < 3 -Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.11 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10 %endif @@ -121,6 +130,7 @@ cat << 'EOF' | tee -a src/autoload.php ]); \Fedora\Autoloader\Dependencies::optional([ '%{php_home}/Zend/ServiceManager/autoload.php', + '%{php_home}/Psr/Http/Message/autoload.php', ]); EOF @@ -160,6 +170,11 @@ exit $ret %changelog +* Tue Dec 18 2018 Remi Collet - 2.9.0-1 +- update to 2.9.0 +- raise dependency on zend-filter 2.9.1 +- raise dependency on zend-validator 2.11 + * Fri Dec 14 2018 Remi Collet - 2.8.3-2 - update to 2.8.3 -- cgit