Implement UTC variants for add/sub methods

.github/workflows/tests.yml

@@ -63,6 +63,7 @@ jobs:
 
       - name: Select PHPUnit version
         if: matrix.phpunit
+        shell: bash
         run: composer require --no-update --no-interaction --dev "phpunit/phpunit:^${{ matrix.phpunit }}"
 
       - name: Remove conflicting optional dependencies
@@ -71,6 +72,7 @@ jobs:
 
       - name: Downgrade nikic/php-parser
         if: matrix.phpunit < 11
+        shell: bash
         run: composer require --no-update --no-interaction --dev "nikic/php-parser:^4"
 
       - name: Install dependencies

phpdoc.php

@@ -453,6 +453,12 @@ function dumpParameter(string $method, ReflectionParameter $parameter): string
                         $plUnit.'Until($endDate = null, int|float $factor = 1)',
                         "Return an iterable period from current date to given end (string, DateTime or Carbon instance) for each $unitName or every X $plUnitName if a factor is given.",
                     ];
+                    $autoDocLines[] = [
+                        '@method',
+                        'float',
+                        'diffInUTC'.ucFirst($plUnit).'(DateTimeInterface|string|null $date, bool $absolute = false)',
+                        "Convert current and given date in UTC timezone and return a floating number of $plUnitName.",
+                    ];
 
                     break;
 

phpstan.neon

@@ -18,6 +18,7 @@ parameters:
         - '#^Call to an undefined static method#'
         - '#^Call to an undefined method Carbon\\Carbon(Immutable)?::floatDiffIn([A-Za-z]+)\(\)\.$#'
         - '#^Call to an undefined method Carbon\\Carbon(Immutable)?::diffInReal([A-Za-z]+)\(\)\.$#'
+        - '#^Call to an undefined method Carbon\\Carbon(Immutable)?::(add|sub)Real([A-Za-z]+)\(\)\.$#'
         - '#^Unsafe usage of new static\(\)\.$#'
         - '#^Method Carbon\\Carbon(Interface|Immutable)?::(add|sub)[A-Z][A-Za-z]+\(\) invoked with 1 parameter, 0 required\.$#'
         - '#^Call to an undefined method Carbon\\Carbon(Interface|Immutable)?::(super|noThis|toAppTz|copyWithAppTz)\(\)\.$#'

tests/Carbon/IsTest.php

@@ -17,7 +17,6 @@
 use Carbon\Carbon;
 use DateTime;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
 use stdClass;
 use Tests\AbstractTestCase;
 use TypeError;
@@ -610,7 +609,6 @@ public function testIsCurrentSecondFalse()
         $this->assertFalse(Carbon::now()->subDay()->isCurrentSecond());
     }
 
-    #[Group('php-8.1')]
     public function testIsSameMicrosecond()
     {
         $current = new Carbon('2018-05-06T13:30:54.123456');

tests/Carbon/ModifyTest.php

@@ -18,7 +18,6 @@
 use Closure;
 use DateMalformedStringException;
 use InvalidArgumentException;
-use PHPUnit\Framework\Attributes\Group;
 use Tests\AbstractTestCase;
 
 class ModifyTest extends AbstractTestCase
@@ -31,7 +30,6 @@ public function testSimpleModify()
         $this->assertSame(24.0, $a->diffInHours($b));
     }
 
-    #[Group('php-8.1')]
     public function testTimezoneModify()
     {
         $php81Fix = 1.0;
@@ -50,7 +48,7 @@ public function testTimezoneModify()
 
         $a = new Carbon('2014-03-30 00:00:00', 'Europe/London');
         $b = $a->copy();
-        $b->addRealHours(24);
+        $b->addUTCHours(24);
         $this->assertSame(-24.0, $b->diffInHours($a, false));
         $this->assertSame(-24.0 * 60, $b->diffInMinutes($a, false));
         $this->assertSame(-24.0 * 60 * 60, $b->diffInSeconds($a, false));
@@ -117,6 +115,15 @@ public function testTimezoneModify()
         $this->assertSame(-24.0 * 60 * 60 * 1000, $b->diffInMilliseconds($a, false));
         $this->assertSame(-24.0 * 60 * 60 * 1000000, $b->diffInMicroseconds($a, false));
 
+        $a = new Carbon('2014-03-30 00:00:00', 'Europe/London');
+        $b = $a->copy();
+        $b->addUTCDay();
+        $this->assertSame(-24.0, $b->diffInHours($a, false));
+        $this->assertSame(-24.0 * 60, $b->diffInMinutes($a, false));
+        $this->assertSame(-24.0 * 60 * 60, $b->diffInSeconds($a, false));
+        $this->assertSame(-24.0 * 60 * 60 * 1000, $b->diffInMilliseconds($a, false));
+        $this->assertSame(-24.0 * 60 * 60 * 1000000, $b->diffInMicroseconds($a, false));
+
         $a = new Carbon('2014-03-30 00:00:00', 'Europe/London');
         $b = $a->copy();
         $b->addRealWeeks(1 / 7);

tests/CarbonImmutable/IsTest.php

@@ -17,7 +17,6 @@
 use DateTime;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
 use stdClass;
 use Tests\AbstractTestCase;
 use TypeError;
@@ -640,7 +639,6 @@ public function testIsCurrentSecondFalse()
         $this->assertFalse(Carbon::now()->subDay()->isCurrentSecond());
     }
 
-    #[Group('php-8.1')]
     public function testIsSameMicrosecond()
     {
         $current = new Carbon('2018-05-06T13:30:54.123456');

tests/CarbonImmutable/ModifyTest.php

@@ -14,7 +14,6 @@
 namespace Tests\CarbonImmutable;
 
 use Carbon\CarbonImmutable as Carbon;
-use PHPUnit\Framework\Attributes\Group;
 use Tests\AbstractTestCase;
 
 class ModifyTest extends AbstractTestCase
@@ -33,7 +32,6 @@ public function testSimpleModifyWithNamedParameter()
         $this->assertSame(24.0, $a->diffInHours($b));
     }
 
-    #[Group('php-8.1')]
     public function testTimezoneModify()
     {
         $php81Fix = 1.0;

tests/CarbonInterval/AddTest.php

@@ -20,7 +20,6 @@
 use DateTime;
 use DateTimeImmutable;
 use InvalidArgumentException;
-use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\TestWith;
 use Tests\AbstractTestCase;
 use Tests\Carbon\Fixtures\MyCarbon;
@@ -77,7 +76,6 @@ public function testAddWithNegativeDiffDateInterval()
         $this->assertCarbonInterval($ci, 4, 3, 28, 8, 10, 11);
     }
 
-    #[Group('php-8.1')]
     public function testAddMicroseconds()
     {
         $diff = Carbon::now()->diff(Carbon::now()->addDays(3)->addMicroseconds(111222));