summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-06-05 18:14:47 +0200
committerRemi Collet <fedora@famillecollet.com>2014-06-05 18:14:47 +0200
commitcde4c443f133d1f6d4fac21eef47e867d64dce4c (patch)
treebe61d33408eeadc714ac51d239ab3d9462ca9974
parent5da2811f2df98440eb38f0f0bfdd1b8563badd49 (diff)
php: more upstream pacthes (only tests)
-rw-r--r--php-reg67118.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/php-reg67118.patch b/php-reg67118.patch
index 2c64c06..744ae23 100644
--- a/php-reg67118.patch
+++ b/php-reg67118.patch
@@ -134,3 +134,33 @@ index 0000000..b517a3b
--
1.9.2
+From 127651e9aeb4294c6be8c450fc1e7344570045f3 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Thu, 5 Jun 2014 17:33:40 +0200
+Subject: [PATCH] fix test for 5.4/5.5
+
+---
+ ext/date/tests/bug67118_2.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext/date/tests/bug67118_2.phpt b/ext/date/tests/bug67118_2.phpt
+index b517a3b..b4904a1 100644
+--- a/ext/date/tests/bug67118_2.phpt
++++ b/ext/date/tests/bug67118_2.phpt
+@@ -26,10 +26,10 @@ First try
+ Second try
+ object(Foo)#1 (3) {
+ ["date"]=>
+- string(26) "2007-09-12 15:49:12.000000"
++ string(%d) "2007-09-12 15:49:%s"
+ ["timezone_type"]=>
+ int(3)
+ ["timezone"]=>
+ string(3) "UTC"
+ }
+-Done
+\ No newline at end of file
++Done
+--
+1.9.2
+