From 99985001be79ee25008041a4bd63f01b95d31482 Mon Sep 17 00:00:00 2001
From: Michael Moussa <michael.moussa@gmail.com>
Date: Thu, 25 May 2017 19:21:00 -0400
Subject: [PATCH 1/2] Add test for bug #52480

---
 ext/date/tests/bug52480.phpt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ext/date/tests/bug52480.phpt

diff --git a/ext/date/tests/bug52480.phpt b/ext/date/tests/bug52480.phpt
new file mode 100644
index 0000000000000..c7ad2438013ee
--- /dev/null
+++ b/ext/date/tests/bug52480.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #52480 (Incorrect difference using DateInterval)
+--FILE--
+<?php
+
+$expectedDiff = (array) new DateInterval('P30D');
+
+// If the DateInterval object was created by DateTime::diff(), then this is the total
+// number of days between the start and end dates. Otherwise, days will be FALSE.
+// https://secure.php.net/manual/en/class.dateinterval.php
+$expectedDiff['days'] = 30;
+
+foreach (DateTimeZone::listIdentifiers() as $timezone) {
+    $start = new DateTime('2017-03-01', new DateTimeZone($timezone));
+    $end = new DateTime('2017-03-31', new DateTimeZone($timezone));
+
+    echo !empty($expectedDiff == (array) $start->diff($end)) ? 1 : "\nWrong result for $timezone!\n";
+}
+?>
+--EXPECTREGEX--
+1+

From ea6c4417613f9fc456e125b1f4fe761d3f5465f7 Mon Sep 17 00:00:00 2001
From: Michael Moussa <michael.moussa@gmail.com>
Date: Sat, 3 Jun 2017 15:41:27 -0400
Subject: [PATCH 2/2] Add XFAIL w/bug report. Tweak success case output

---
 ext/date/tests/bug52480.phpt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ext/date/tests/bug52480.phpt b/ext/date/tests/bug52480.phpt
index c7ad2438013ee..907a54559feff 100644
--- a/ext/date/tests/bug52480.phpt
+++ b/ext/date/tests/bug52480.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #52480 (Incorrect difference using DateInterval)
+--XFAIL--
+See https://bugs.php.net/bug.php?id=52480
 --FILE--
 <?php
 
@@ -14,8 +16,11 @@ foreach (DateTimeZone::listIdentifiers() as $timezone) {
     $start = new DateTime('2017-03-01', new DateTimeZone($timezone));
     $end = new DateTime('2017-03-31', new DateTimeZone($timezone));
 
-    echo !empty($expectedDiff == (array) $start->diff($end)) ? 1 : "\nWrong result for $timezone!\n";
+    if ($expectedDiff != (array) $start->diff($end)) {
+        echo "\nWrong result for $timezone!\n";
+    }
 }
 ?>
---EXPECTREGEX--
-1+
+===DONE===
+--EXPECT--
+===DONE===