update to 2.13.0

raise dependency on PHP 7.1
add patch for PHP 7.4 from
  https://github.com/laminas/laminas-validator/pull/32

2 files changed, 29 insertions, 9 deletions

diff --git a/composer.json b/composer.json
index 89fa4c7..076b1c7 100644
--- a/composer.json
+++ b/composer.json
@@ -16,13 +16,15 @@
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "zendframework/zend-stdlib": "^3.2.1",
         "container-interop/container-interop": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0.8 || ^5.7.15",
         "psr/http-message": "^1.0",
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0",
         "zendframework/zend-cache": "^2.6.1",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6",
@@ -61,8 +63,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.12.x-dev",
-            "dev-develop": "2.13.x-dev"
+            "dev-master": "2.13.x-dev",
+            "dev-develop": "2.14.x-dev"
         },
         "zf": {
             "component": "Zend\\Validator",
diff --git a/php-zendframework-zend-validator.spec b/php-zendframework-zend-validator.spec
index 981a159..e72e578 100644
--- a/php-zendframework-zend-validator.spec
+++ b/php-zendframework-zend-validator.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-zendframework-zend-validator
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    fd24920c2afcf2a70d11f67c3457f8f509453a62
+%global gh_commit    b54acef1f407741c5347f2a97f899ab21f2229ef
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-validator
@@ -22,7 +22,7 @@
 # TODO switch BR to fedora-autoloader + tests
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.12.2
+Version:        2.13.0
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -31,10 +31,12 @@ 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/laminas/laminas-validator/pull/32.patch
+
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-ctype
 BuildRequires:  php-date
 BuildRequires:  php-fileinfo
@@ -54,6 +56,8 @@ BuildRequires:  php-composer(container-interop/container-interop) >= 1.1
 # From composer, "require-dev": {
 #        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
 #        "psr/http-message": "^1.0",
+#        "psr/http-client": "^1.0",
+#        "psr/http-factory": "^1.0",
 #        "zendframework/zend-cache": "^2.6.1",
 #        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-config": "^2.6",
@@ -68,6 +72,8 @@ BuildRequires:  php-composer(container-interop/container-interop) >= 1.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 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(%{gh_owner}/zend-cache)            >= 2.6.1 with php-composer(%{gh_owner}/zend-cache)            < 3)
 BuildRequires: (php-composer(%{gh_owner}/zend-config)           >= 2.6   with php-composer(%{gh_owner}/zend-config)           < 3)
 BuildRequires: (php-composer(%{gh_owner}/zend-db)               >= 2.7   with php-composer(%{gh_owner}/zend-db)               < 3)
@@ -82,6 +88,8 @@ BuildRequires: (php-composer(%{gh_owner}/zend-uri)              >= 2.5   with ph
 # remirepo:13
 %else
 BuildRequires:  php-composer(psr/http-message)                  >= 1.0
+BuildRequires:  php-composer(psr/http-client)                   >= 1.0
+BuildRequires:  php-composer(psr/http-factory)                  >= 1.0
 BuildRequires:  php-composer(%{gh_owner}/zend-cache)            >= 2.6.1
 BuildRequires:  php-composer(%{gh_owner}/zend-config)           >= 2.6
 BuildRequires:  php-composer(%{gh_owner}/zend-db)               >= 2.7
@@ -100,10 +108,10 @@ BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0",
+#        "php": "^7.1",
 #        "zendframework/zend-stdlib": "^3.2.1",
 #        "container-interop/container-interop": "^1.1"
-Requires:       php(language) >= 5.5
+Requires:       php(language) >= 7.1
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -167,6 +175,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -208,6 +217,8 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 # For BR without new autoloader
 \Fedora\Autoloader\Dependencies::required([
     '%{php_home}/Zend/autoload.php',
+    '%{php_home}/Psr/Http/Client/autoload.php',
+    '%{php_home}/Psr/Http/Message/http-factory-autoload.php',
 ]);
 \Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test');
 EOF
@@ -225,6 +236,7 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
@@ -233,6 +245,12 @@ exit $ret
 
 
 %changelog
+* Fri Jan  3 2020 Remi Collet <remi@remirepo.net> - 2.13.0-1
+- update to 2.13.0
+- raise dependency on PHP 7.1
+- add patch for PHP 7.4 from
+  https://github.com/laminas/laminas-validator/pull/32
+
 * Tue Oct 29 2019 Remi Collet <remi@remirepo.net> - 2.12.2-1
 - update to 2.12.2