Merge pull request #13 from thecaliskan/2.x

Added PHP 8.4 support and fixed CS for 2.x

.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

.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,

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;

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);
 
     /**

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([

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;

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);
 

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;
 

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);
     }
 
     /**

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);
     }
 
     /**

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);

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;

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);
     }
 
     /**

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);
 

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;

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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);
     }

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);

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;

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();