Split CarbonPeriod construction into multiple steps

briannesbitt · May 25, 2024 · c852674 · c852674
1 parent 8eab898
commit c852674
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 40 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -95,6 +95,10 @@ parameters:
             message: '#^Call to an undefined method Symfony\\Contracts\\Translation\\TranslatorInterface::getMessages\(\)\.#'
             paths:
                 - tests/CarbonInterval/ConstructTest.php
+        -
+            message: '#^Access to protected property Carbon\\CarbonPeriod::\$dateInterval\.#'
+            paths:
+                - tests/CarbonPeriod/CreateTest.php
     excludePaths:
         - '*/src/Carbon/CarbonPeriod.php'
         - '*/src/Carbon/Laravel/ServiceProvider.php'

diff --git a/src/Carbon/CarbonPeriod.php b/src/Carbon/CarbonPeriod.php
@@ -44,7 +44,6 @@
 use ReturnTypeWillChange;
 use RuntimeException;
 use Throwable;
-use TypeError;
 
 // @codeCoverageIgnoreStart
 require PHP_VERSION < 8.2
@@ -435,7 +434,7 @@ protected static function intervalHasTime(DateInterval $interval): bool
      * Return whether given variable is an ISO 8601 specification.
      *
      * Note: Check is very basic, as actual validation will be done later when parsing.
-     * We just want to ensure that variable is not any other type of a valid parameter.
+     * We just want to ensure that variable is not any other type of valid parameter.
      */
     protected static function isIso8601(mixed $var): bool
     {
@@ -690,44 +689,8 @@ public function __construct(...$arguments)
             $raw = [$arguments[0]];
         }
 
-        $constructed = false;
-
-        if ($raw !== null) {
-            try {
-                parent::__construct(...$raw);
-                $constructed = true;
-            } catch (TypeError) {
-                // $constructed = false
-            }
-        }
-
-        if (!$constructed) {
-            parent::__construct('R1/2000-01-01T00:00:00Z/P1D');
-        }
-
-        if (isset($sortedArguments['start'])) {
-            $this->setStartDate($sortedArguments['start']);
-        }
-
-        if (isset($sortedArguments['start'])) {
-            $this->setStartDate($sortedArguments['start']);
-        }
-
-        if (isset($sortedArguments['end'])) {
-            $this->setEndDate($sortedArguments['end']);
-        }
-
-        if (isset($sortedArguments['recurrences'])) {
-            $this->setRecurrences($sortedArguments['recurrences']);
-        }
-
-        if (isset($sortedArguments['interval'])) {
-            $this->setDateInterval($sortedArguments['interval']);
-        }
-
-        if (isset($sortedArguments['options'])) {
-            $this->setOptions($sortedArguments['options']);
-        }
+        $this->constructWith($raw);
+        $this->setFromAssociativeArray($sortedArguments);
 
         if ($this->startDate === null) {
             $dateClass = $this->dateClass;
@@ -2550,4 +2513,46 @@ private static function setDefaultParameters(array &$parameters, array $defaults
             }
         }
     }
+
+    private function constructWith(?array $raw): void
+    {
+        if ($raw !== null) {
+            try {
+                parent::__construct(...$raw);
+
+                return;
+            } catch (Throwable) { // @coverCoverageIgnore
+                // Fallback construct
+            }
+        }
+
+        parent::__construct('R1/2000-01-01T00:00:00Z/P1D');
+    }
+
+    private function setFromAssociativeArray(array $parameters): void
+    {
+        if (isset($parameters['start'])) {
+            $this->setStartDate($parameters['start']);
+        }
+
+        if (isset($parameters['start'])) {
+            $this->setStartDate($parameters['start']);
+        }
+
+        if (isset($parameters['end'])) {
+            $this->setEndDate($parameters['end']);
+        }
+
+        if (isset($parameters['recurrences'])) {
+            $this->setRecurrences($parameters['recurrences']);
+        }
+
+        if (isset($parameters['interval'])) {
+            $this->setDateInterval($parameters['interval']);
+        }
+
+        if (isset($parameters['options'])) {
+            $this->setOptions($parameters['options']);
+        }
+    }
 }
diff --git a/tests/CarbonPeriod/CreateTest.php b/tests/CarbonPeriod/CreateTest.php
@@ -898,4 +898,20 @@ public function testStartAndEndFallback()
             $period->end?->format('Y-m-d'),
         ]);
     }
+
+    public function testSlashFormat()
+    {
+        $periodClass = static::$periodClass;
+        $period = $periodClass::create('2024-09-01/3 days/2024-09-30');
+
+        $this->assertSame('+3', $period->interval->format('%R%d'));
+        $this->assertSame('3 days', $period->dateInterval->forHumans());
+        $this->assertSame([
+            '2024-09-01',
+            '2024-09-30',
+        ], [
+            $period->start->format('Y-m-d'),
+            $period->end->format('Y-m-d'),
+        ]);
+    }
 }