Merge branch 'master' of github.com:briannesbitt/Carbon into 3.x

# Conflicts:
#	src/Carbon/CarbonPeriod.php
#	tests/Carbon/StringsTest.php
#	tests/CarbonImmutable/StringsTest.php

.github/ISSUE_TEMPLATE.md

@@ -5,7 +5,7 @@
       - feature proposals,
       - and documentation requests
 
-    Having all those informations will allow us to know exactly
+    Having all those information will allow us to know exactly
     what you expect and answer you faster and precisely (answer
     that matches your Carbon version, PHP version and usage).
     
@@ -45,7 +45,7 @@ PHP version: **PUT HERE YOUR PHP VERSION**
     You can use the [Options] button to change the version
     then when you get the bug with this editor, you can use
     the [Export] button, copy the link of the opened tab,
-    then paste it in the issue. Then we can immediatly get
+    then paste it in the issue. Then we can immediately get
     your issue.
 -->
 

.github/workflows/tests.yml

@@ -105,7 +105,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" > $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache-ubuntu.outputs.dir }}
           key: "php-${{ matrix.php }}-${{ matrix.setup }}-ubuntu-${{ hashFiles('**/composer.json') }}"
@@ -196,7 +196,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" > $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache-windows.outputs.dir }}
           key: "php-${{ matrix.php }}-${{ matrix.setup }}-windows-${{ hashFiles('**/composer.json') }}"

src/Carbon/CarbonPeriod.php

@@ -491,7 +491,7 @@ protected static function parseIso8601(string $iso): array
     }
 
     /**
-     * Add missing parts of the target date from the soucre date.
+     * Add missing parts of the target date from the source date.
      */
     protected static function addMissingParts(string $source, string $target): string
     {
@@ -1911,7 +1911,7 @@ public function map(callable $callback): Generator
 
     /**
      * Determines if the instance is equal to another.
-     * Warning: if options differ, instances wil never be equal.
+     * Warning: if options differ, instances will never be equal.
      *
      * @see equalTo()
      */
@@ -1922,7 +1922,7 @@ public function eq(mixed $period): bool
 
     /**
      * Determines if the instance is equal to another.
-     * Warning: if options differ, instances wil never be equal.
+     * Warning: if options differ, instances will never be equal.
      */
     public function equalTo(mixed $period): bool
     {
@@ -1941,7 +1941,7 @@ public function equalTo(mixed $period): bool
 
     /**
      * Determines if the instance is not equal to another.
-     * Warning: if options differ, instances wil never be equal.
+     * Warning: if options differ, instances will never be equal.
      *
      * @see notEqualTo()
      */
@@ -1952,7 +1952,7 @@ public function ne(mixed $period): bool
 
     /**
      * Determines if the instance is not equal to another.
-     * Warning: if options differ, instances wil never be equal.
+     * Warning: if options differ, instances will never be equal.
      */
     public function notEqualTo(mixed $period): bool
     {

tests/Carbon/CreateFromTimeTest.php

@@ -135,7 +135,7 @@ public function testCreateFromTimeWithTimeZoneOnNow()
         Carbon::setTestNow($test);
 
         // tested without microseconds
-        // because they appear withing calls to Carbon
+        // because they appear within calls to Carbon
         $this->assertSame($now->format('c'), $dt->format('c'));
     }
 }

tests/Carbon/MacroTest.php

@@ -90,7 +90,7 @@ public function testCarbonIsMacroableWhenCalledStatically()
         $this->assertSame('05/04', Carbon::easterDate(2015)->format('d/m'));
     }
 
-    public function testCarbonIsMacroableWhithNonClosureCallables()
+    public function testCarbonIsMacroableWithNonClosureCallables()
     {
         Carbon::macro('lower', 'strtolower');
 

tests/CarbonImmutable/CreateFromTimeTest.php

@@ -107,7 +107,7 @@ public function testCreateFromTime()
         Carbon::setTestNow($test);
 
         // tested without microseconds
-        // because they appear withing calls to Carbon
+        // because they appear within calls to Carbon
         $this->assertSame($now->format('c'), $dt->format('c'));
     }
 }

tests/CarbonImmutable/MacroTest.php

@@ -82,7 +82,7 @@ public function testCarbonIsMacroableWhenCalledStatically()
         $this->assertSame('05/04', Carbon::easterDate(2015)->format('d/m'));
     }
 
-    public function testCarbonIsMacroableWhithNonClosureCallables()
+    public function testCarbonIsMacroableWithNonClosureCallables()
     {
         Carbon::macro('lower2', 'strtolower');
 

tests/CarbonInterval/MacroTest.php

@@ -108,7 +108,7 @@ public function testCarbonIsMacroableWhenCalledStatically()
         $this->assertSame('3 months', CarbonInterval::quarterIfEven(-6)->forHumans());
     }
 
-    public function testCarbonIsMacroableWhithNonClosureCallables()
+    public function testCarbonIsMacroableWithNonClosureCallables()
     {
         CarbonInterval::macro('lower', 'strtolower');
 

tests/CarbonPeriod/MacroTest.php

@@ -190,7 +190,7 @@ public function testOverrideAlias()
         $this->assertSame('foo', $periodClass::recurrences());
     }
 
-    public function testInstatiateViaStaticMacroCall()
+    public function testInstantiateViaStaticMacroCall()
     {
         $periodClass = static::$periodClass;
         $periodClass::macro('fromTomorrow', function () {