GH-8458: DateInterval::createFromDateString does not throw non-relative items are present

Author: derickr

NEWS

@@ -14,6 +14,10 @@ PHP                                                                        NEWS
 - Curl:
   . Added support for CURLOPT_XFERINFOFUNCTION. (David Carlier)
 
+- Date:
+  . Fixed GH-8458 (DateInterval::createFromDateString does not throw if
+    non-relative items are present). (Derick)
+
 - FPM:
   . Emit error for invalid port setting. (David Carlier)
   . Added extra check for FPM proc dumpable on SELinux based systems.

ext/date/php_date.c

@@ -4325,6 +4325,11 @@ PHP_FUNCTION(date_interval_create_from_date_string)
 		goto cleanup;
 	}
 
+	if (time->have_date || time->have_time || time->have_zone) {
+		zend_throw_exception_ex(NULL, 0, "String '%s' contains non-relative elements", ZSTR_VAL(time_str));
+		goto cleanup;
+	}
+
 	php_date_instantiate(date_ce_interval, return_value);
 	diobj = Z_PHPINTERVAL_P(return_value);
 	diobj->diff = timelib_rel_time_clone(&time->relative);

ext/date/tests/DateInterval_serialize-003.phpt

@@ -4,9 +4,7 @@ Test DateInterval::__serialize and DateInterval::__unserialize
 <?php
 date_default_timezone_set("Europe/London");
 
-// the 15:30 gets ignored, as it's not a "relative" interval.
-// See: https://github.com/php/php-src/issues/8458
-$d = DateInterval::createFromDateString('next weekday 15:30');
+$d = DateInterval::createFromDateString('next weekday');
 echo "Original object:\n";
 var_dump($d);
 
@@ -26,7 +24,7 @@ $d = new DateInterval('P2Y4DT6H8M');
 $d->__unserialize(
 	[
 		'from_string' => true,
-		'date_string' => 'next weekday 15:30',
+		'date_string' => 'next weekday',
 	]
 );
 var_dump($d);
@@ -42,20 +40,20 @@ object(DateInterval)#1 (%d) {
   ["from_string"]=>
   bool(true)
   ["date_string"]=>
-  string(18) "next weekday 15:30"
+  string(%d) "next weekday"
 }
 
 
 Serialised object:
-string(92) "O:12:"DateInterval":2:{s:11:"from_string";b:1;s:11:"date_string";s:18:"next weekday 15:30";}"
+string(%d) "O:12:"DateInterval":2:{s:11:"from_string";b:1;s:11:"date_string";s:%d:"next weekday";}"
 
 
 Unserialised object:
 object(DateInterval)#2 (2) {
   ["from_string"]=>
   bool(true)
   ["date_string"]=>
-  string(18) "next weekday 15:30"
+  string(%d) "next weekday"
 }
 
 
@@ -64,7 +62,7 @@ array(2) {
   ["from_string"]=>
   bool(true)
   ["date_string"]=>
-  string(18) "next weekday 15:30"
+  string(%d) "next weekday"
 }
 
 
@@ -73,7 +71,7 @@ object(DateInterval)#3 (2) {
   ["from_string"]=>
   bool(true)
   ["date_string"]=>
-  string(18) "next weekday 15:30"
+  string(%d) "next weekday"
 }
 
 

ext/date/tests/date_interval_non_relative_warning.phpt

@@ -0,0 +1,25 @@
+--TEST--
+GH-8458 (DateInterval::createFromDateString does not warn when non-relative items are present)
+--FILE--
+<?php
+$formats = [
+	'next weekday 15:30',
+	'+5 hours noon',
+	'-8 days March 23',
+	'+72 seconds UTC',
+];
+
+foreach ($formats as $format) {
+	try {
+		$d = DateInterval::createFromDateString($format);
+	} catch(Throwable $t) {
+		echo $t->getMessage(), "\n";
+	}
+}
+
+?>
+--EXPECTF--
+String 'next weekday 15:30' contains non-relative elements
+String '+5 hours noon' contains non-relative elements
+String '-8 days March 23' contains non-relative elements
+String '+72 seconds UTC' contains non-relative elements