Merge pull request #2745 from kylekatarnls/fix/issue-2744-skip

Enforce $skip array type
briannesbitt · Jan 2, 2023 · 1e60d1b · 1e60d1b
2 parents 5ef3b72 + 3018dea
commit 1e60d1b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Carbon/Traits/Difference.php b/src/Carbon/Traits/Difference.php
@@ -844,7 +844,7 @@ public function diffForHumans($other = null, $syntax = null, $short = false, $pa
         $parts = min(7, max(1, (int) $parts));
         $skip = \is_array($syntax) ? ($syntax['skip'] ?? []) : [];
 
-        return $this->diffAsCarbonInterval($other, false, $skip)
+        return $this->diffAsCarbonInterval($other, false, (array) $skip)
             ->setLocalTranslator($this->getLocalTranslator())
             ->forHumans($syntax, (bool) $short, $parts, $options ?? $this->localHumanDiffOptions ?? static::getHumanDiffOptions());
     }

diff --git a/tests/Carbon/DiffTest.php b/tests/Carbon/DiffTest.php
@@ -621,6 +621,16 @@ public function testDiffWithSkippedUnits()
             Carbon::parse('2020-05-25')
                 ->diffForHumans(['skip' => ['y', 'm', 'w']])
         );
+
+        Carbon::setTestNow('2023-01-02 16:57');
+        $this->assertSame(
+            '1 day 16 hours 57 minutes',
+            Carbon::yesterday()->diffForHumans([
+                'syntax' => CarbonInterface::DIFF_ABSOLUTE,
+                'parts' => 3,
+                'skip' => 's',
+            ])
+        );
     }
 
     public function testDiffForHumansNowAndSecondWithTimezone()