fix FTBFS with PHP 7.3, patch from https://github.com/zendframework/zend-config/pull/54HEADmaster

use range dependencies

2 files changed, 86 insertions, 9 deletions

diff --git a/27d5ba5c13cb4a576400f534057b69231190ac9d.patch b/27d5ba5c13cb4a576400f534057b69231190ac9d.patch
new file mode 100644
index 0000000..5899ffb
--- /dev/null
+++ b/27d5ba5c13cb4a576400f534057b69231190ac9d.patch
@@ -0,0 +1,43 @@
+From 27d5ba5c13cb4a576400f534057b69231190ac9d Mon Sep 17 00:00:00 2001
+From: webimpress <contact@webimpress.com>
+Date: Sun, 16 Dec 2018 12:23:02 +0000
+Subject: [PATCH] Fixed expected value in test to work on PHP 7.3
+
+Result of var_export for object has been changed on PHP 7.3
+See: https://bugs.php.net/bug.php?id=48016
+---
+ test/Writer/PhpArrayTest.php | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/test/Writer/PhpArrayTest.php b/test/Writer/PhpArrayTest.php
+index e3e0420..df4523e 100644
+--- a/test/Writer/PhpArrayTest.php
++++ b/test/Writer/PhpArrayTest.php
+@@ -41,6 +41,16 @@ public function testRender()
+ 
+         $configString = $this->writer->toString($config);
+ 
++        $object = "stdClass::__set_state(array(\n"
++            . "   'foo' => 'bar',\n"
++            . ')),';
++
++        if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
++            $object = '(object) array(' . "\n"
++                . "   'foo' => 'bar',\n"
++                . '),';
++        }
++
+         // build string line by line as we are trailing-whitespace sensitive.
+         $expected = "<?php\n";
+         $expected .= "return array(\n";
+@@ -50,9 +60,7 @@ public function testRender()
+         $expected .= "        1 => 'foo',\n";
+         $expected .= "    ),\n";
+         $expected .= "    'emptyArray' => array(),\n";
+-        $expected .= "    'object' => stdClass::__set_state(array(\n";
+-        $expected .= "   'foo' => 'bar',\n";
+-        $expected .= ")),\n";
++        $expected .= "    'object' => " . $object . "\n";
+         $expected .= "    'integer' => 123,\n";
+         $expected .= "    'boolean' => false,\n";
+         $expected .= "    'null' => null,\n";
diff --git a/php-zendframework-zend-config.spec b/php-zendframework-zend-config.spec
index c997044..7e34296 100644
--- a/php-zendframework-zend-config.spec
+++ b/php-zendframework-zend-config.spec
@@ -1,6 +1,6 @@
 # remirepo/Fedora spec file for php-zendframework-zend-config
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -21,15 +21,16 @@
 
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        2.6.0
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Zend Framework %{library} component
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
+Patch0:         https://github.com/zendframework/zend-config/commit/27d5ba5c13cb4a576400f534057b69231190ac9d.patch
+
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -39,7 +40,14 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-xmlreader
 BuildRequires:  php-xmlwriter
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)      < 4)
+# remirepo:4
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
 BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+%endif
 # From composer, "require-dev": {
 #        "zendframework/zend-filter": "^2.6",
 #        "zendframework/zend-i18n": "^2.5",
@@ -47,10 +55,24 @@ BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
 #        "fabpot/php-cs-fixer": "1.7.*",
 #        "phpunit/PHPUnit": "~4.0"
-BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         >= 2.5
+# 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-i18n)           >= 2.5   with php-autoloader(%{gh_owner}/zend-i18n)           < 3)
+# ignore max version, as test suite passes with v3
+BuildRequires: (php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json)           < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 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-i18n)           <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-i18n)           >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5
+BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
+%endif
 BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
 %endif
 # Autoloader
@@ -60,8 +82,14 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "php": "^5.5 || ^7.0",
 #        "zendframework/zend-stdlib": "^2.7 || ^3.0"
 Requires:       php(language) >= 5.5
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)      >= 2.7
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)      >= 2.7      with php-autoloader(%{gh_owner}/zend-stdlib)      < 4)
+# remirepo:4
+%else
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)      <  4
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)      >= 2.7
+%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 2.5.2
@@ -76,7 +104,7 @@ Requires:       php-xmlwriter
 #        "zendframework/zend-i18n": "Zend\\I18n component",
 #        "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
 #        "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
 Suggests:       php-autoloader(%{gh_owner}/zend-filter)
 Suggests:       php-autoloader(%{gh_owner}/zend-i18n)
 Suggests:       php-autoloader(%{gh_owner}/zend-json)
@@ -102,6 +130,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -136,7 +165,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php56 php70 php71 php72 php73; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit || ret=1
   fi
@@ -156,6 +185,11 @@ exit $ret
 
 
 %changelog
+* Tue Feb  5 2019 Remi Collet <remi@remirepo.net> - 2.6.0-7
+- fix FTBFS with PHP 7.3, patch from
+  https://github.com/zendframework/zend-config/pull/54
+- use range dependencies
+
 * Thu Dec  7 2017 Remi Collet <remi@remirepo.net> - 2.6.0-4
 - switch from zend-loader to fedora/autoloader