Handling PHP8.3 changes in Exception handling for date

nyamsprod · nyamsprod · commit f860d8467b73 · 2023-08-10T23:33:51.000+02:00
diff --git a/composer.json b/composer.json
@@ -47,12 +47,12 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^v3.13.1",
-        "phpstan/phpstan": "^1.10.2",
-        "phpstan/phpstan-deprecation-rules": "^1.1.2",
-        "phpstan/phpstan-phpunit": "^1.3.7",
-        "phpstan/phpstan-strict-rules": "^1.5.0",
-        "phpunit/phpunit": "^10.0.12"
+        "friendsofphp/php-cs-fixer": "^v3.22.0",
+        "phpstan/phpstan": "^1.10.28",
+        "phpstan/phpstan-deprecation-rules": "^1.1.4",
+        "phpstan/phpstan-phpunit": "^1.3.13",
+        "phpstan/phpstan-strict-rules": "^1.5.1",
+        "phpunit/phpunit": "^10.3.1"
     },
     "autoload": {
         "psr-4": {
@@ -65,7 +65,7 @@
     "scripts": {
         "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run --diff -vvv --allow-risky=yes --ansi",
         "phpcs:fix": "php-cs-fixer fix -vvv --allow-risky=yes --ansi",
-        "phpstan": "phpstan analyse -c phpstan.neon --xdebug --ansi --memory-limit 192M",
+        "phpstan": "phpstan analyse -c phpstan.neon --ansi --memory-limit 192M",
         "phpunit": "XDEBUG_MODE=coverage phpunit --coverage-text",
         "test": [
             "@phpunit",
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <exclude>
-      <directory suffix="Test.php">src</directory>
-    </exclude>
     <report>
       <clover outputFile="build/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -21,4 +15,12 @@
   <logging>
     <junit outputFile="build/junit.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <directory suffix="Test.php">src</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/src/Duration.php b/src/Duration.php
@@ -18,6 +18,7 @@
 use DateTimeInterface;
 use Exception;
 use InvalidArgumentException;
+use Throwable;
 use function preg_match;
 use function str_pad;
 use function strlen;
@@ -166,7 +167,12 @@ public static function fromTimeString(string $duration): self
      */
     public static function fromDateString(string $duration): self
     {
-        $dateInterval = DateInterval::createFromDateString($duration);
+        try {
+            $dateInterval = DateInterval::createFromDateString($duration);
+        } catch (Throwable $exception) {
+            throw new InvalidArgumentException('Unknown or bad format `'.$duration.'`.', 0, $exception);
+        }
+
         if (false === $dateInterval) {
             throw new InvalidArgumentException('Unknown or bad format `'.$duration.'`.');
         }
diff --git a/src/Period.php b/src/Period.php
@@ -794,7 +794,7 @@ public function dateRangeForward(Period|Duration|DateInterval|string $timeDelta,
 
     /**
      * @deprecated since version 5.2.0
-     * @see ::rangeBackwards
+     * @see Period::rangeBackwards()
      *
      * Allows iteration over a set of dates and times,
      * recurring at regular intervals, over the instance backwards starting from the instance ending.
diff --git a/src/PeriodFactoryTest.php b/src/PeriodFactoryTest.php
@@ -234,23 +234,23 @@ public function testFromRange(int $option, Bounds $expectedBounds): void
      */
     public static function provideDatePeriodOptions(): iterable
     {
-        yield 'include start date' => [
+        yield 'include start date legacy' => [
             'options' => DatePeriod::EXCLUDE_START_DATE,
             'expectedBounds' => Bounds::ExcludeAll,
         ];
 
-        yield 'exclude start date' => [
+        yield 'exclude start date legacy' => [
             'options' => 0,
             'expectedBounds' => Bounds::IncludeStartExcludeEnd,
         ];
 
         if (defined('DatePeriod::INCLUDE_END_DATE')) {
-            yield 'include all' => [
+            yield 'include all new' => [
                 'options' => DatePeriod::INCLUDE_END_DATE,
                 'expectedBounds' => Bounds::IncludeAll,
             ];
 
-            yield 'exclude start date' => [
+            yield 'exclude start date new' => [
                 'options' => DatePeriod::INCLUDE_END_DATE | DatePeriod::EXCLUDE_START_DATE,
                 'expectedBounds' => Bounds::ExcludeStartIncludeEnd,
             ];
diff --git a/src/Sequence.php b/src/Sequence.php
@@ -570,7 +570,7 @@ public function map(Closure $closure): self
      * @template TReduceReturnType
      *
      * @param Closure(TReduceInitial|TReduceReturnType, Period, array-key=): TReduceReturnType $closure
-     * @param TReduceInitial $carry
+     * @param TReduceInitial                                                                   $carry
      *
      * @return TReduceInitial|TReduceReturnType
      */

Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ public function dateRangeForward(Period\|Duration\|DateInterval\|string $timeDelta,`
`794`	`794`
`795`	`795`	`/**`
`796`	`796`	`* @deprecated since version 5.2.0`
`797`		`- * @see ::rangeBackwards`
	`797`	`+ * @see Period::rangeBackwards()`
`798`	`798`	`*`
`799`	`799`	`* Allows iteration over a set of dates and times,`
`800`	`800`	`* recurring at regular intervals, over the instance backwards starting from the instance ending.`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ public function map(Closure $closure): self`
`570`	`570`	`* @template TReduceReturnType`
`571`	`571`	`*`
`572`	`572`	`* @param Closure(TReduceInitial\|TReduceReturnType, Period, array-key=): TReduceReturnType $closure`
`573`		`- * @param TReduceInitial $carry`
	`573`	`+ * @param TReduceInitial $carry`
`574`	`574`	`*`
`575`	`575`	`* @return TReduceInitial\|TReduceReturnType`
`576`	`576`	`*/`