Deprecate Real diff in favor of UTC diff

.github/workflows/tests.yml

@@ -63,11 +63,17 @@ jobs:
 
       - name: Select PHPUnit version
         if: matrix.phpunit
-        run: composer require --no-update phpunit/phpunit:^${{ matrix.phpunit }} --no-interaction --dev
+        shell: bash
+        run: composer require --no-update --no-interaction --dev "phpunit/phpunit:^${{ matrix.phpunit }}"
 
       - name: Remove conflicting optional dependencies
         if: matrix.phpunit >= 11
-        run: composer remove --no-update ondrejmirtes/better-reflection --no-interaction --dev
+        run: composer remove --no-update --no-interaction --dev ondrejmirtes/better-reflection
+
+      - 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
         uses: nick-fields/retry@v3
@@ -76,7 +82,7 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            composer remove --no-update phpmd/phpmd friendsofphp/php-cs-fixer kylekatarnls/multi-tester --no-interaction --dev;
+            composer remove --no-update --no-interaction --dev phpmd/phpmd friendsofphp/php-cs-fixer kylekatarnls/multi-tester;
             composer update --prefer-dist --no-progress --prefer-${{ matrix.setup || 'stable' }} ${{ matrix.classmap-authoritative && '--classmap-authoritative' || '' }}${{ matrix.php >= 8.2 && ' --ignore-platform-reqs' || '' }};
 
       - name: Run test suite

composer.json

@@ -51,14 +51,14 @@
     "require-dev": {
         "doctrine/dbal": "^3.6.3 || ^4.0",
         "doctrine/orm": "^2.15.2 || ^3.0",
-        "friendsofphp/php-cs-fixer": "^3.18.0",
-        "kylekatarnls/multi-tester": "^2.2.0",
-        "ondrejmirtes/better-reflection": "^6.11.0.0",
-        "phpmd/phpmd": "^2.13.0",
-        "phpstan/extension-installer": "^1.3.0",
-        "phpstan/phpstan": "^1.10.20",
-        "phpunit/phpunit": "^10.2.2",
-        "squizlabs/php_codesniffer": "^3.7.2"
+        "friendsofphp/php-cs-fixer": "^3.52.1",
+        "kylekatarnls/multi-tester": "^2.5.3",
+        "ondrejmirtes/better-reflection": "^6.25.0.4",
+        "phpmd/phpmd": "^2.15.0",
+        "phpstan/extension-installer": "^1.3.1",
+        "phpstan/phpstan": "^1.10.65",
+        "phpunit/phpunit": "^10.5.15",
+        "squizlabs/php_codesniffer": "^3.9.0"
     },
     "provide": {
         "psr/clock-implementation": "1.0"

phpdoc.php

@@ -26,7 +26,7 @@
     ['call', 'isSameUnit'],
     ['call', 'setUnit'],
     ['call', 'addUnit'],
-    ['call', 'addRealUnit'],
+    ['call', 'addUTCUnit'],
     ['call', 'roundUnit'],
     ['call', 'diffForHumans'],
 ];
@@ -418,33 +418,33 @@ function dumpParameter(string $method, ReflectionParameter $parameter): string
 
                     break;
 
-                case 'addRealUnit':
+                case 'addUTCUnit':
                     $unit = $vars->name;
                     $unitName = unitName($unit);
                     $plUnit = pluralize($unit);
                     $plUnitName = pluralize($unitName);
                     $autoDocLines[] = [
                         '@method',
                         'self',
-                        'addReal'.ucFirst($plUnit).'(int|float $value = 1)',
+                        'addUTC'.ucFirst($plUnit).'(int|float $value = 1)',
                         "Add $plUnitName (the \$value count passed in) to the instance (using timestamp).",
                     ];
                     $autoDocLines[] = [
                         '@method',
                         'self',
-                        'addReal'.ucFirst($unit).'()',
+                        'addUTC'.ucFirst($unit).'()',
                         "Add one $unitName to the instance (using timestamp).",
                     ];
                     $autoDocLines[] = [
                         '@method',
                         'self',
-                        'subReal'.ucFirst($plUnit).'(int|float $value = 1)',
+                        'subUTC'.ucFirst($plUnit).'(int|float $value = 1)',
                         "Sub $plUnitName (the \$value count passed in) to the instance (using timestamp).",
                     ];
                     $autoDocLines[] = [
                         '@method',
                         'self',
-                        'subReal'.ucFirst($unit).'()',
+                        'subUTC'.ucFirst($unit).'()',
                         "Sub one $unitName to the instance (using timestamp).",
                     ];
                     $autoDocLines[] = [
@@ -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)\(\)\.$#'