Merge pull request #13 from thecaliskan/2.x

kylekatarnls · web-flow · commit 9228ce90e103 · 2025-01-08T21:10:23.000+01:00
Added PHP 8.4 support and fixed CS for 2.x
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -74,6 +74,8 @@ jobs:
           - php: 8.3
             setup: lowest
 
+          - php: 8.4
+
           - php: 8.1
             laravel: true
             reference: 10.x
@@ -87,6 +89,14 @@ jobs:
             laravel: true
             reference: master
 
+          - php: 8.3
+            laravel: true
+            reference: master
+
+          - php: 8.4
+            laravel: true
+            reference: master
+
           - php: 8.2
             laravel: true
             reference: master
@@ -148,7 +158,7 @@ jobs:
             if [[ "${{ matrix.laravel }}" != 'true' ]]; then
               composer remove --no-update kylekatarnls/multi-tester --no-interaction --dev;
             fi;
-            ${{ matrix.php >= 8.1 && 'composer require --no-update phpunit/phpunit:^9.5.20 --no-interaction --dev;' || '' }}
+            ${{ matrix.php >= 8.1 && 'composer require --no-update phpunit/phpunit:^9.6.21 --no-interaction --dev;' || '' }}
             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
@@ -230,6 +240,8 @@ jobs:
           - php: 8.3
             setup: lowest
 
+          - php: 8.4
+
     name: PHP ${{ matrix.php }} - ${{ matrix.setup || 'stable' }} - windows
 
     steps:
@@ -263,7 +275,7 @@ jobs:
           max_attempts: 3
           command: |
             composer remove --no-update kylekatarnls/multi-tester phpmd/phpmd friendsofphp/php-cs-fixer --no-interaction --dev;
-            ${{ matrix.php >= 8.1 && 'composer require --no-update phpunit/phpunit:^9.5.20 --no-interaction --dev;' || '' }}
+            ${{ matrix.php >= 8.1 && 'composer require --no-update phpunit/phpunit:^9.6.21 --no-interaction --dev;' || '' }}
             composer update --prefer-dist --no-progress --prefer-${{ matrix.setup || 'stable' }}${{ matrix.php >= 8.2 && ' --ignore-platform-reqs' || '' }};
 
       - name: Run test suite
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -87,6 +87,7 @@
     'single_quote' => true,
     'space_after_semicolon' => true,
     'standardize_not_equals' => true,
+    'statement_indentation' => false,
     'ternary_operator_spaces' => true,
     'trailing_comma_in_multiline' => true,
     'trim_array_spaces' => true,
diff --git a/src/Carbon/AbstractTranslator.php b/src/Carbon/AbstractTranslator.php
@@ -78,7 +78,7 @@ public static function get($locale = null)
         return static::$singletons[$key];
     }
 
-    public function __construct($locale, MessageFormatterInterface $formatter = null, $cacheDir = null, $debug = false)
+    public function __construct($locale, ?MessageFormatterInterface $formatter = null, $cacheDir = null, $debug = false)
     {
         parent::setLocale($locale);
         $this->initializing = true;
@@ -162,7 +162,7 @@ public function resetMessages($locale = null)
         $this->assertValidLocale($locale);
 
         foreach ($this->getDirectories() as $directory) {
-            $data = @include sprintf('%s/%s.php', rtrim($directory, '\\/'), $locale);
+            $data = @include \sprintf('%s/%s.php', rtrim($directory, '\\/'), $locale);
 
             if ($data !== false) {
                 $this->messages[$locale] = $data;
diff --git a/src/Carbon/CarbonInterface.php b/src/Carbon/CarbonInterface.php
@@ -1162,6 +1162,7 @@ public static function createFromTimeString($time, $tz = null);
      *
      * @return static
      */
+    #[ReturnTypeWillChange]
     public static function createFromTimestamp($timestamp, $tz = null);
 
     /**
diff --git a/src/Carbon/CarbonInterval.php b/src/Carbon/CarbonInterval.php
@@ -980,7 +980,7 @@ public static function fromString($intervalDefinition)
 
                 default:
                     throw new InvalidIntervalException(
-                        sprintf('Invalid part %s in definition %s', $part, $intervalDefinition)
+                        \sprintf('Invalid part %s in definition %s', $part, $intervalDefinition)
                     );
             }
         }
@@ -2329,7 +2329,7 @@ public static function getDateIntervalSpec(DateInterval $interval, bool $microse
 
         $seconds = abs($interval->s);
         if ($microseconds && $interval->f > 0) {
-            $seconds = sprintf('%d.%06d', $seconds, abs($interval->f) * 1000000);
+            $seconds = \sprintf('%d.%06d', $seconds, abs($interval->f) * 1000000);
         }
 
         $time = array_filter([
diff --git a/src/Carbon/CarbonPeriod.php b/src/Carbon/CarbonPeriod.php
@@ -1017,7 +1017,7 @@ public function getDateInterval()
      *
      * @return CarbonInterface
      */
-    public function getStartDate(string $rounding = null)
+    public function getStartDate(?string $rounding = null)
     {
         $date = $this->startDate->avoidMutation();
 
@@ -1031,7 +1031,7 @@ public function getStartDate(string $rounding = null)
      *
      * @return CarbonInterface|null
      */
-    public function getEndDate(string $rounding = null)
+    public function getEndDate(?string $rounding = null)
     {
         if (!$this->endDate) {
             return null;
@@ -1899,7 +1899,7 @@ public function shiftTimezone($timezone)
      *
      * @return CarbonInterface
      */
-    public function calculateEnd(string $rounding = null)
+    public function calculateEnd(?string $rounding = null)
     {
         if ($end = $this->getEndDate($rounding)) {
             return $end;
diff --git a/src/Carbon/CarbonTimeZone.php b/src/Carbon/CarbonTimeZone.php
@@ -155,7 +155,7 @@ public function getAbbr($dst = false)
      *
      * @return string
      */
-    public function toOffsetName(DateTimeInterface $date = null)
+    public function toOffsetName(?DateTimeInterface $date = null)
     {
         return static::getOffsetNameFromMinuteOffset(
             $this->getOffset($date ?: Carbon::now($this)) / 60
@@ -169,7 +169,7 @@ public function toOffsetName(DateTimeInterface $date = null)
      *
      * @return CarbonTimeZone
      */
-    public function toOffsetTimeZone(DateTimeInterface $date = null)
+    public function toOffsetTimeZone(?DateTimeInterface $date = null)
     {
         return new static($this->toOffsetName($date));
     }
@@ -185,7 +185,7 @@ public function toOffsetTimeZone(DateTimeInterface $date = null)
      *
      * @return string|false
      */
-    public function toRegionName(DateTimeInterface $date = null, $isDst = 1)
+    public function toRegionName(?DateTimeInterface $date = null, $isDst = 1)
     {
         $name = $this->getName();
         $firstChar = substr($name, 0, 1);
@@ -227,7 +227,7 @@ public function toRegionName(DateTimeInterface $date = null, $isDst = 1)
      *
      * @return CarbonTimeZone|false
      */
-    public function toRegionTimeZone(DateTimeInterface $date = null)
+    public function toRegionTimeZone(?DateTimeInterface $date = null)
     {
         $tz = $this->toRegionName($date);
 
diff --git a/src/Carbon/Exceptions/BadComparisonUnitException.php b/src/Carbon/Exceptions/BadComparisonUnitException.php
@@ -29,7 +29,7 @@ class BadComparisonUnitException extends UnitException
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($unit, $code = 0, Throwable $previous = null)
+    public function __construct($unit, $code = 0, ?Throwable $previous = null)
     {
         $this->unit = $unit;
 
diff --git a/src/Carbon/Exceptions/BadFluentConstructorException.php b/src/Carbon/Exceptions/BadFluentConstructorException.php
@@ -30,11 +30,11 @@ class BadFluentConstructorException extends BaseBadMethodCallException implement
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($method, $code = 0, Throwable $previous = null)
+    public function __construct($method, $code = 0, ?Throwable $previous = null)
     {
         $this->method = $method;
 
-        parent::__construct(sprintf("Unknown fluent constructor '%s'.", $method), $code, $previous);
+        parent::__construct(\sprintf("Unknown fluent constructor '%s'.", $method), $code, $previous);
     }
 
     /**
diff --git a/src/Carbon/Exceptions/BadFluentSetterException.php b/src/Carbon/Exceptions/BadFluentSetterException.php
@@ -30,11 +30,11 @@ class BadFluentSetterException extends BaseBadMethodCallException implements Bad
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($setter, $code = 0, Throwable $previous = null)
+    public function __construct($setter, $code = 0, ?Throwable $previous = null)
     {
         $this->setter = $setter;
 
-        parent::__construct(sprintf("Unknown fluent setter '%s'", $setter), $code, $previous);
+        parent::__construct(\sprintf("Unknown fluent setter '%s'", $setter), $code, $previous);
     }
 
     /**
diff --git a/src/Carbon/Exceptions/ImmutableException.php b/src/Carbon/Exceptions/ImmutableException.php
@@ -30,7 +30,7 @@ class ImmutableException extends BaseRuntimeException implements RuntimeExceptio
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($value, $code = 0, Throwable $previous = null)
+    public function __construct($value, $code = 0, ?Throwable $previous = null)
     {
         $this->value = $value;
         parent::__construct("$value is immutable.", $code, $previous);
diff --git a/src/Carbon/Exceptions/InvalidDateException.php b/src/Carbon/Exceptions/InvalidDateException.php
@@ -38,7 +38,7 @@ class InvalidDateException extends BaseInvalidArgumentException implements Inval
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($field, $value, $code = 0, Throwable $previous = null)
+    public function __construct($field, $value, $code = 0, ?Throwable $previous = null)
     {
         $this->field = $field;
         $this->value = $value;
diff --git a/src/Carbon/Exceptions/NotACarbonClassException.php b/src/Carbon/Exceptions/NotACarbonClassException.php
@@ -31,11 +31,11 @@ class NotACarbonClassException extends BaseInvalidArgumentException implements I
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($className, $code = 0, Throwable $previous = null)
+    public function __construct($className, $code = 0, ?Throwable $previous = null)
     {
         $this->className = $className;
 
-        parent::__construct(sprintf('Given class does not implement %s: %s', CarbonInterface::class, $className), $code, $previous);
+        parent::__construct(\sprintf('Given class does not implement %s: %s', CarbonInterface::class, $className), $code, $previous);
     }
 
     /**
diff --git a/src/Carbon/Exceptions/NotLocaleAwareException.php b/src/Carbon/Exceptions/NotLocaleAwareException.php
@@ -23,7 +23,7 @@ class NotLocaleAwareException extends BaseInvalidArgumentException implements In
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($object, $code = 0, Throwable $previous = null)
+    public function __construct($object, $code = 0, ?Throwable $previous = null)
     {
         $dump = \is_object($object) ? \get_class($object) : \gettype($object);
 
diff --git a/src/Carbon/Exceptions/OutOfRangeException.php b/src/Carbon/Exceptions/OutOfRangeException.php
@@ -57,7 +57,7 @@ class OutOfRangeException extends BaseInvalidArgumentException implements Invali
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($unit, $min, $max, $value, $code = 0, Throwable $previous = null)
+    public function __construct($unit, $min, $max, $value, $code = 0, ?Throwable $previous = null)
     {
         $this->unit = $unit;
         $this->min = $min;
diff --git a/src/Carbon/Exceptions/ParseErrorException.php b/src/Carbon/Exceptions/ParseErrorException.php
@@ -45,7 +45,7 @@ class ParseErrorException extends BaseInvalidArgumentException implements Invali
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($expected, $actual, $help = '', $code = 0, Throwable $previous = null)
+    public function __construct($expected, $actual, $help = '', $code = 0, ?Throwable $previous = null)
     {
         $this->expected = $expected;
         $this->actual = $actual;
diff --git a/src/Carbon/Exceptions/UnitNotConfiguredException.php b/src/Carbon/Exceptions/UnitNotConfiguredException.php
@@ -29,7 +29,7 @@ class UnitNotConfiguredException extends UnitException
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($unit, $code = 0, Throwable $previous = null)
+    public function __construct($unit, $code = 0, ?Throwable $previous = null)
     {
         $this->unit = $unit;
 
diff --git a/src/Carbon/Exceptions/UnknownGetterException.php b/src/Carbon/Exceptions/UnknownGetterException.php
@@ -30,7 +30,7 @@ class UnknownGetterException extends BaseInvalidArgumentException implements Inv
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($getter, $code = 0, Throwable $previous = null)
+    public function __construct($getter, $code = 0, ?Throwable $previous = null)
     {
         $this->getter = $getter;
 
diff --git a/src/Carbon/Exceptions/UnknownMethodException.php b/src/Carbon/Exceptions/UnknownMethodException.php
@@ -30,7 +30,7 @@ class UnknownMethodException extends BaseBadMethodCallException implements BadMe
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($method, $code = 0, Throwable $previous = null)
+    public function __construct($method, $code = 0, ?Throwable $previous = null)
     {
         $this->method = $method;
 
diff --git a/src/Carbon/Exceptions/UnknownSetterException.php b/src/Carbon/Exceptions/UnknownSetterException.php
@@ -30,7 +30,7 @@ class UnknownSetterException extends BaseInvalidArgumentException implements Bad
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($setter, $code = 0, Throwable $previous = null)
+    public function __construct($setter, $code = 0, ?Throwable $previous = null)
     {
         $this->setter = $setter;
 
diff --git a/src/Carbon/Exceptions/UnknownUnitException.php b/src/Carbon/Exceptions/UnknownUnitException.php
@@ -29,7 +29,7 @@ class UnknownUnitException extends UnitException
      * @param int            $code
      * @param Throwable|null $previous
      */
-    public function __construct($unit, $code = 0, Throwable $previous = null)
+    public function __construct($unit, $code = 0, ?Throwable $previous = null)
     {
         $this->unit = $unit;
 
diff --git a/src/Carbon/Factory.php b/src/Carbon/Factory.php
@@ -266,7 +266,7 @@ public function setClassName(string $className)
         return $this;
     }
 
-    public function className(string $className = null)
+    public function className(?string $className = null)
     {
         return $className === null ? $this->getClassName() : $this->setClassName($className);
     }
@@ -283,7 +283,7 @@ public function setSettings(array $settings)
         return $this;
     }
 
-    public function settings(array $settings = null)
+    public function settings(?array $settings = null)
     {
         return $settings === null ? $this->getSettings() : $this->setSettings($settings);
     }
diff --git a/src/Carbon/Traits/Creator.php b/src/Carbon/Traits/Creator.php
@@ -422,7 +422,7 @@ public static function create($year = 0, $month = 1, $day = 1, $hour = 0, $minut
         }
 
         $second = ($second < 10 ? '0' : '').number_format($second, 6);
-        $instance = static::rawCreateFromFormat('!Y-n-j G:i:s.u', sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
+        $instance = static::rawCreateFromFormat('!Y-n-j G:i:s.u', \sprintf('%s-%s-%s %s:%02s:%02s', $year, $month, $day, $hour, $minute, $second), $tz);
 
         if ($fixYear !== null) {
             $instance = $instance->addYears($fixYear);
diff --git a/src/Carbon/Traits/Date.php b/src/Carbon/Traits/Date.php
@@ -939,7 +939,7 @@ public function get($name)
                 return $this->hour ?: 24;
             // @property int
             case $name === 'milliseconds':
-                // @property int
+            // @property int
             case $name === 'millisecond':
             // @property int
             case $name === 'milli':
@@ -1132,7 +1132,7 @@ public function __set($name, $value)
     public function set($name, $value = null)
     {
         if ($this->isImmutable()) {
-            throw new ImmutableException(sprintf('%s class', static::class));
+            throw new ImmutableException(\sprintf('%s class', static::class));
         }
 
         if (\is_array($name)) {
@@ -1391,7 +1391,7 @@ public function isoWeekday($value = null)
      *
      * @return int
      */
-    public function getDaysFromStartOfWeek(int $weekStartsAt = null): int
+    public function getDaysFromStartOfWeek(?int $weekStartsAt = null): int
     {
         $firstDay = (int) ($weekStartsAt ?? $this->getTranslationMessage('first_day_of_week') ?? 0);
 
@@ -1409,7 +1409,7 @@ public function getDaysFromStartOfWeek(int $weekStartsAt = null): int
      *
      * @return static
      */
-    public function setDaysFromStartOfWeek(int $numberOfDays, int $weekStartsAt = null)
+    public function setDaysFromStartOfWeek(int $numberOfDays, ?int $weekStartsAt = null)
     {
         return $this->addDays($numberOfDays - $this->getDaysFromStartOfWeek($weekStartsAt));
     }
@@ -1478,7 +1478,7 @@ public function subUnitNoOverflow($valueUnit, $value, $overflowUnit)
      *
      * @return int|static
      */
-    public function utcOffset(int $minuteOffset = null)
+    public function utcOffset(?int $minuteOffset = null)
     {
         if (\func_num_args() < 1) {
             return $this->offsetMinutes;
@@ -2453,7 +2453,7 @@ public static function __callStatic($method, $parameters)
                 }
             }
             if (static::isStrictModeEnabled()) {
-                throw new UnknownMethodException(sprintf('%s::%s', static::class, $method));
+                throw new UnknownMethodException(\sprintf('%s::%s', static::class, $method));
             }
 
             return null;
diff --git a/src/Carbon/Traits/Localization.php b/src/Carbon/Traits/Localization.php
@@ -444,7 +444,7 @@ public function translateTimeStringTo($timeString, $to = null)
      *
      * @return $this|string
      */
-    public function locale(string $locale = null, ...$fallbackLocales)
+    public function locale(?string $locale = null, ...$fallbackLocales)
     {
         if ($locale === null) {
             return $this->getTranslatorLocale();
diff --git a/src/Carbon/Traits/Test.php b/src/Carbon/Traits/Test.php
diff --git a/src/Carbon/Traits/Timestamp.php b/src/Carbon/Traits/Timestamp.php
diff --git a/src/Carbon/TranslatorImmutable.php b/src/Carbon/TranslatorImmutable.php
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
diff --git a/tests/Carbon/DiffTest.php b/tests/Carbon/DiffTest.php
diff --git a/tests/Carbon/SettersTest.php b/tests/Carbon/SettersTest.php
diff --git a/tests/CarbonImmutable/DiffTest.php b/tests/CarbonImmutable/DiffTest.php
diff --git a/tests/CarbonImmutable/TestingAidsTest.php b/tests/CarbonImmutable/TestingAidsTest.php
diff --git a/tests/CarbonPeriod/Fixtures/AbstractCarbon.php b/tests/CarbonPeriod/Fixtures/AbstractCarbon.php
diff --git a/tests/CarbonPeriod/IteratorTest.php b/tests/CarbonPeriod/IteratorTest.php

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static function get($locale = null)`
`78`	`78`	`return static::$singletons[$key];`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function __construct($locale, MessageFormatterInterface $formatter = null, $cacheDir = null, $debug = false)`
	`81`	`+ public function __construct($locale, ?MessageFormatterInterface $formatter = null, $cacheDir = null, $debug = false)`
`82`	`82`	`{`
`83`	`83`	`parent::setLocale($locale);`
`84`	`84`	`$this->initializing = true;`
`@@ -162,7 +162,7 @@ public function resetMessages($locale = null)`
`162`	`162`	`$this->assertValidLocale($locale);`
`163`	`163`
`164`	`164`	`foreach ($this->getDirectories() as $directory) {`
`165`		`- $data = @include sprintf('%s/%s.php', rtrim($directory, '\\/'), $locale);`
	`165`	`+ $data = @include \sprintf('%s/%s.php', rtrim($directory, '\\/'), $locale);`
`166`	`166`
`167`	`167`	`if ($data !== false) {`
`168`	`168`	`$this->messages[$locale] = $data;`
Original file line number	Diff line number	Diff line change
`@@ -1162,6 +1162,7 @@ public static function createFromTimeString($time, $tz = null);`
`1162`	`1162`	`*`
`1163`	`1163`	`* @return static`
`1164`	`1164`	`*/`
	`1165`	`+ #[ReturnTypeWillChange]`
`1165`	`1166`	`public static function createFromTimestamp($timestamp, $tz = null);`
`1166`	`1167`
`1167`	`1168`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,7 @@ public static function fromString($intervalDefinition)`
`980`	`980`
`981`	`981`	`default:`
`982`	`982`	`throw new InvalidIntervalException(`
`983`		`- sprintf('Invalid part %s in definition %s', $part, $intervalDefinition)`
	`983`	`+ \sprintf('Invalid part %s in definition %s', $part, $intervalDefinition)`
`984`	`984`	`);`
`985`	`985`	`}`
`986`	`986`	`}`
`@@ -2329,7 +2329,7 @@ public static function getDateIntervalSpec(DateInterval $interval, bool $microse`
`2329`	`2329`
`2330`	`2330`	`$seconds = abs($interval->s);`
`2331`	`2331`	`if ($microseconds && $interval->f > 0) {`
`2332`		`- $seconds = sprintf('%d.%06d', $seconds, abs($interval->f) * 1000000);`
	`2332`	`+ $seconds = \sprintf('%d.%06d', $seconds, abs($interval->f) * 1000000);`
`2333`	`2333`	`}`
`2334`	`2334`
`2335`	`2335`	`$time = array_filter([`
Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,7 @@ public function getDateInterval()`
`1017`	`1017`	`*`
`1018`	`1018`	`* @return CarbonInterface`
`1019`	`1019`	`*/`
`1020`		`- public function getStartDate(string $rounding = null)`
	`1020`	`+ public function getStartDate(?string $rounding = null)`
`1021`	`1021`	`{`
`1022`	`1022`	`$date = $this->startDate->avoidMutation();`
`1023`	`1023`
`@@ -1031,7 +1031,7 @@ public function getStartDate(string $rounding = null)`
`1031`	`1031`	`*`
`1032`	`1032`	`* @return CarbonInterface\|null`
`1033`	`1033`	`*/`
`1034`		`- public function getEndDate(string $rounding = null)`
	`1034`	`+ public function getEndDate(?string $rounding = null)`
`1035`	`1035`	`{`
`1036`	`1036`	`if (!$this->endDate) {`
`1037`	`1037`	`return null;`
`@@ -1899,7 +1899,7 @@ public function shiftTimezone($timezone)`
`1899`	`1899`	`*`
`1900`	`1900`	`* @return CarbonInterface`
`1901`	`1901`	`*/`
`1902`		`- public function calculateEnd(string $rounding = null)`
	`1902`	`+ public function calculateEnd(?string $rounding = null)`
`1903`	`1903`	`{`
`1904`	`1904`	`if ($end = $this->getEndDate($rounding)) {`
`1905`	`1905`	`return $end;`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function getAbbr($dst = false)`
`155`	`155`	`*`
`156`	`156`	`* @return string`
`157`	`157`	`*/`
`158`		`- public function toOffsetName(DateTimeInterface $date = null)`
	`158`	`+ public function toOffsetName(?DateTimeInterface $date = null)`
`159`	`159`	`{`
`160`	`160`	`return static::getOffsetNameFromMinuteOffset(`
`161`	`161`	`$this->getOffset($date ?: Carbon::now($this)) / 60`
`@@ -169,7 +169,7 @@ public function toOffsetName(DateTimeInterface $date = null)`
`169`	`169`	`*`
`170`	`170`	`* @return CarbonTimeZone`
`171`	`171`	`*/`
`172`		`- public function toOffsetTimeZone(DateTimeInterface $date = null)`
	`172`	`+ public function toOffsetTimeZone(?DateTimeInterface $date = null)`
`173`	`173`	`{`
`174`	`174`	`return new static($this->toOffsetName($date));`
`175`	`175`	`}`
`@@ -185,7 +185,7 @@ public function toOffsetTimeZone(DateTimeInterface $date = null)`
`185`	`185`	`*`
`186`	`186`	`* @return string\|false`
`187`	`187`	`*/`
`188`		`- public function toRegionName(DateTimeInterface $date = null, $isDst = 1)`
	`188`	`+ public function toRegionName(?DateTimeInterface $date = null, $isDst = 1)`
`189`	`189`	`{`
`190`	`190`	`$name = $this->getName();`
`191`	`191`	`$firstChar = substr($name, 0, 1);`
`@@ -227,7 +227,7 @@ public function toRegionName(DateTimeInterface $date = null, $isDst = 1)`
`227`	`227`	`*`
`228`	`228`	`* @return CarbonTimeZone\|false`
`229`	`229`	`*/`
`230`		`- public function toRegionTimeZone(DateTimeInterface $date = null)`
	`230`	`+ public function toRegionTimeZone(?DateTimeInterface $date = null)`
`231`	`231`	`{`
`232`	`232`	`$tz = $this->toRegionName($date);`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class BadComparisonUnitException extends UnitException`
`29`	`29`	`* @param int $code`
`30`	`30`	`* @param Throwable\|null $previous`
`31`	`31`	`*/`
`32`		`- public function __construct($unit, $code = 0, Throwable $previous = null)`
	`32`	`+ public function __construct($unit, $code = 0, ?Throwable $previous = null)`
`33`	`33`	`{`
`34`	`34`	`$this->unit = $unit;`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ class BadFluentConstructorException extends BaseBadMethodCallException implement`
`30`	`30`	`* @param int $code`
`31`	`31`	`* @param Throwable\|null $previous`
`32`	`32`	`*/`
`33`		`- public function __construct($method, $code = 0, Throwable $previous = null)`
	`33`	`+ public function __construct($method, $code = 0, ?Throwable $previous = null)`
`34`	`34`	`{`
`35`	`35`	`$this->method = $method;`
`36`	`36`
`37`		`- parent::__construct(sprintf("Unknown fluent constructor '%s'.", $method), $code, $previous);`
	`37`	`+ parent::__construct(\sprintf("Unknown fluent constructor '%s'.", $method), $code, $previous);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ class BadFluentSetterException extends BaseBadMethodCallException implements Bad`
`30`	`30`	`* @param int $code`
`31`	`31`	`* @param Throwable\|null $previous`
`32`	`32`	`*/`
`33`		`- public function __construct($setter, $code = 0, Throwable $previous = null)`
	`33`	`+ public function __construct($setter, $code = 0, ?Throwable $previous = null)`
`34`	`34`	`{`
`35`	`35`	`$this->setter = $setter;`
`36`	`36`
`37`		`- parent::__construct(sprintf("Unknown fluent setter '%s'", $setter), $code, $previous);`
	`37`	`+ parent::__construct(\sprintf("Unknown fluent setter '%s'", $setter), $code, $previous);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`