Implement More Appropriate Date/Time Exceptions RFC

Author: derickr

NEWS

@@ -24,6 +24,9 @@ PHP                                                                        NEWS
     (ilutov)
   . Fix bug GH-10083 (Allow comments between & and parameter). (ilutov)
 
+- Date:
+  . Implement More Appropriate Date/Time Exceptions RFC. (Derick)
+
 - Exif:
   . Removed unneeded codepaths in exif_process_TIFF_in_JPEG(). (nielsdos)
 

ext/date/php_date.c

@@ -377,7 +377,6 @@ public function format(string $format): string {}
 
     /**
      * @tentative-return-type
-     * @alias date_modify
      */
     public function modify(string $modifier): DateTime|false {}
 
@@ -389,7 +388,6 @@ public function add(DateInterval $interval): DateTime {}
 
     /**
      * @tentative-return-type
-     * @alias date_sub
      */
     public function sub(DateInterval $interval): DateTime {}
 
@@ -668,7 +666,6 @@ public function __construct(string $duration) {}
 
     /**
      * @tentative-return-type
-     * @alias date_interval_create_from_date_string
      */
     public static function createFromDateString(string $datetime): DateInterval|false {}
 
@@ -749,3 +746,66 @@ public static function __set_state(array $array): DatePeriod {}
 
     public function getIterator(): Iterator {}
 }
+
+/**
+ * @strict-properties
+ */
+class DateError extends Error
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateObjectError extends DateError
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateRangeError extends DateRangeError
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateException extends Exception
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateInvalidTimeZoneException extends Exception
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateInvalidOperationException extends DateException
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateMalformedStringException extends DateException
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateMalformedIntervalStringException extends DateException
+{
+}
+
+/**
+ * @strict-properties
+ */
+class DateMalformedPeriodStringException extends DateException
+{
+}

ext/date/php_date.stub.php

@@ -10,9 +10,9 @@ echo $tz->getOffset($dt), "\n";
 try {
     echo $tz->getOffset(1);
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
 3600
-DateTimeZone::getOffset(): Argument #1 ($datetime) must be of type DateTimeInterface, int given
+TypeError: DateTimeZone::getOffset(): Argument #1 ($datetime) must be of type DateTimeInterface, int given

ext/date/php_date_arginfo.h

@@ -0,0 +1,21 @@
+--TEST--
+DateInterval constructor exceptions
+--INI--
+date.timezone=Europe/London
+--FILE--
+<?php
+function check(callable $c)
+{
+	try {
+		var_dump($c());
+	} catch (\DateMalformedIntervalStringException $e) {
+		echo $e::class, ': ', $e->getMessage(), "\n";
+	}
+}
+
+check(fn() => new DateInterval(""));
+check(fn() => new DateInterval("2007-05-11T15:30:00Z/"));
+?>
+--EXPECTF--
+DateMalformedIntervalStringException: Unknown or bad format ()
+DateMalformedIntervalStringException: Failed to parse interval (2007-05-11T15:30:00Z/)

ext/date/tests/68062.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Test DateInterval::createFromDateString() function : nonsense data
+--FILE--
+<?php
+try {
+	$i = DateInterval::createFromDateString("foobar");
+} catch (DateMalformedIntervalStringException $e) {
+	echo $e::class, ': ', $e->getMessage(), "\n";
+}
+?>
+--EXPECTF--
+DateMalformedIntervalStringException: Unknown or bad format (foobar) at position 0 (f): The timezone could not be found in the database

ext/date/tests/DateInterval_construct_exceptions.phpt

@@ -32,7 +32,11 @@ var_dump($d);
 echo "\n\nUsed serialised interval:\n";
 $now = new DateTimeImmutable("2022-04-22 16:25:11 BST");
 var_dump($now->add($e));
-var_dump($now->sub($e));
+try {
+	var_dump($now->sub($e));
+} catch (DateInvalidOperationException $e) {
+	echo $e::class, ': ', $e->getMessage(), "\n";
+}
 ?>
 --EXPECTF--
 Original object:
@@ -84,13 +88,4 @@ object(DateTimeImmutable)#4 (3) {
   ["timezone"]=>
   string(3) "BST"
 }
-
-Warning: DateTimeImmutable::sub(): Only non-special relative time specifications are supported for subtraction in %s on line %d
-object(DateTimeImmutable)#4 (3) {
-  ["date"]=>
-  string(26) "2022-04-22 16:25:11.000000"
-  ["timezone_type"]=>
-  int(2)
-  ["timezone"]=>
-  string(3) "BST"
-}
+DateInvalidOperationException: DateTimeImmutable::sub(): Only non-special relative time specifications are supported for subtraction

ext/date/tests/DateInterval_createFromDateString_broken.phpt

@@ -0,0 +1,22 @@
+--TEST--
+DateInterval invalid serialization data with date_string
+--FILE--
+<?php
+$propertySets = [
+	'2023-01-16 17:01:19',
+	'2023-01-16-foobar$*',
+];
+
+foreach( $propertySets as $propertySet )
+{
+	try {
+		$d = DateInterval::__set_state( [ 'date_string' => $propertySet ] );
+		echo "OK\n";
+	} catch (\Error $e) {
+		echo $e::class, ': ', $e->getMessage(), "\n";
+	}
+}
+?>
+--EXPECT--
+OK
+Error: Unknown or bad format (2023-01-16-foobar$*) at position 10 (-) while unserializing: Unexpected character