summaryrefslogtreecommitdiffstats
path: root/27d5ba5c13cb4a576400f534057b69231190ac9d.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-05 09:58:37 +0100
committerRemi Collet <remi@remirepo.net>2019-02-05 09:58:37 +0100
commita8582bcbf0af55cd634f254e3a8e43fd4e0378e4 (patch)
treed0fe4a8e82eb9078f19112e572b0c25ff03a4c3f /27d5ba5c13cb4a576400f534057b69231190ac9d.patch
parent33e040624b5f182b8e514e0efec2ba10370b537a (diff)
fix FTBFS with PHP 7.3, patch from https://github.com/zendframework/zend-config/pull/54HEADmaster
use range dependencies
Diffstat (limited to '27d5ba5c13cb4a576400f534057b69231190ac9d.patch')
-rw-r--r--27d5ba5c13cb4a576400f534057b69231190ac9d.patch43
1 files changed, 43 insertions, 0 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";