From bf24c85776ff204ccf0e96738ffede9f1ee7beaa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Dec 2017 07:34:45 +0100 Subject: Update to 2.8.0 raise dependency on zend-validator 2.10.1 --- 150.patch | 22 ------------- composer.json | 55 +++++++++++++++++++-------------- php-zendframework-zend-inputfilter.spec | 23 +++++++------- 3 files changed, 44 insertions(+), 56 deletions(-) delete mode 100644 150.patch diff --git a/150.patch b/150.patch deleted file mode 100644 index 4e1b4ca..0000000 --- a/150.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fd1e1cbd97acff453fb47327aa3128f93243a45d Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 24 Oct 2017 14:22:59 +0200 -Subject: [PATCH] fix proto for PHP 7.2 - ---- - src/CollectionInputFilter.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CollectionInputFilter.php b/src/CollectionInputFilter.php -index 78a938a..da08386 100644 ---- a/src/CollectionInputFilter.php -+++ b/src/CollectionInputFilter.php -@@ -167,7 +167,7 @@ class CollectionInputFilter extends Inpu - /** - * {@inheritdoc} - */ -- public function isValid() -+ public function isValid($context = null) - { - $this->collectionMessages = []; - $inputFilter = $this->getInputFilter(); diff --git a/composer.json b/composer.json index b02be07..a2a3e68 100644 --- a/composer.json +++ b/composer.json @@ -1,41 +1,50 @@ { "name": "zendframework/zend-inputfilter", - "description": " ", + "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "inputfilter" ], - "homepage": "https://github.com/zendframework/zend-inputfilter", - "autoload": { - "psr-4": { - "Zend\\InputFilter\\": "src/" + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" + }, + "zf": { + "component": "Zend\\InputFilter", + "config-provider": "Zend\\InputFilter\\ConfigProvider" } }, + "support": { + "docs": "https://docs.zendframework.com/zend-inputfilter/", + "issues": "https://github.com/zendframework/zend-inputfilter/issues", + "source": "https://github.com/zendframework/zend-inputfilter", + "rss": "https://github.com/zendframework/zend-inputfilter/releases.atom", + "slack": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/expressive" + }, "require": { - "php": "^7.0 || ^5.6", + "php": "^5.6 || ^7.0", "zendframework/zend-filter": "^2.6", - "zendframework/zend-validator": "^2.6", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-validator": "^2.10.1" }, "require-dev": { - "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { "zendframework/zend-servicemanager": "To support plugin manager support" }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - }, - "zf": { - "component": "Zend\\InputFilter", - "config-provider": "Zend\\InputFilter\\ConfigProvider" + "autoload": { + "psr-4": { + "Zend\\InputFilter\\": "src/" } }, "autoload-dev": { @@ -48,10 +57,10 @@ "@cs-check", "@test" ], - "upload-coverage": "coveralls -v", "cs-check": "phpcs", "cs-fix": "phpcbf", - "test": "phpunit", - "test-coverage": "phpunit --coverage-clover clover.xml" + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", + "upload-coverage": "coveralls -v" } } diff --git a/php-zendframework-zend-inputfilter.spec b/php-zendframework-zend-inputfilter.spec index 59231f3..b3c4a6a 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 02bbc6b5fc54991e43e7471e54e2173077708d7b +%global gh_commit e7edd625f2fcdd72a719a7023114c5f4b4f38488 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-inputfilter @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.5 +Version: 2.8.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -30,18 +30,16 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-inputfilter/pull/150.patch - BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-spl BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.5.3 BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 +BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.10.1 # From composer, "require-dev": { -# "phpunit/phpunit": "^6.0.8 || ^5.7.15", +# "phpunit/phpunit": "^5.7.23 || ^6.4.3", # "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 @@ -56,18 +54,18 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": "^7.0 || ^5.6", +# "php": "^5.6 || ^7.0", # "zendframework/zend-filter": "^2.6", -# "zendframework/zend-validator": "^2.6", # "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "zendframework/zend-validator": "^2.10.1", Requires: php(language) >= 5.6 %if ! %{bootstrap} Requires: php-composer(%{gh_owner}/zend-filter) >= 2.6 Requires: php-composer(%{gh_owner}/zend-filter) < 3 -Requires: php-composer(%{gh_owner}/zend-validator) >= 2.6 -Requires: php-composer(%{gh_owner}/zend-validator) < 3 Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 +Requires: php-composer(%{gh_owner}/zend-validator) >= 2.10.1 +Requires: php-composer(%{gh_owner}/zend-validator) < 3 # From composer, "suggest": { # "zendframework/zend-servicemanager": "To support plugin manager support" %if 0%{?fedora} >= 21 @@ -92,7 +90,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -145,6 +142,10 @@ exit $ret %changelog +* Tue Dec 5 2017 Remi Collet - 2.8.0-1 +- Update to 2.8.0 +- raise dependency on zend-validator 2.10.1 + * Wed Nov 8 2017 Remi Collet - 2.7.5-1 - Update to 2.7.5 -- cgit