@@ -1922,13 +1922,13 @@ discard block |
||
| 1922 | 1922 | 'DD' => ['rawFormat', ['d']], |
| 1923 | 1923 | 'Do' => ['ordinal', ['day', 'D']], |
| 1924 | 1924 | 'd' => 'dayOfWeek', |
| 1925 | - 'dd' => function (CarbonInterface $date, $originalFormat = null) { |
|
| 1925 | + 'dd' => function(CarbonInterface $date, $originalFormat = null) { |
|
| 1926 | 1926 | return $date->getTranslatedMinDayName($originalFormat); |
| 1927 | 1927 | }, |
| 1928 | - 'ddd' => function (CarbonInterface $date, $originalFormat = null) { |
|
| 1928 | + 'ddd' => function(CarbonInterface $date, $originalFormat = null) { |
|
| 1929 | 1929 | return $date->getTranslatedShortDayName($originalFormat); |
| 1930 | 1930 | }, |
| 1931 | - 'dddd' => function (CarbonInterface $date, $originalFormat = null) { |
|
| 1931 | + 'dddd' => function(CarbonInterface $date, $originalFormat = null) { |
|
| 1932 | 1932 | return $date->getTranslatedDayName($originalFormat); |
| 1933 | 1933 | }, |
| 1934 | 1934 | 'DDD' => 'dayOfYear', |
@@ -1952,34 +1952,34 @@ discard block |
||
| 1952 | 1952 | 'A' => 'upperMeridiem', |
| 1953 | 1953 | 's' => 'second', |
| 1954 | 1954 | 'ss' => ['getPaddedUnit', ['second']], |
| 1955 | - 'S' => function (CarbonInterface $date) { |
|
| 1955 | + 'S' => function(CarbonInterface $date) { |
|
| 1956 | 1956 | return (string) floor($date->micro / 100000); |
| 1957 | 1957 | }, |
| 1958 | - 'SS' => function (CarbonInterface $date) { |
|
| 1958 | + 'SS' => function(CarbonInterface $date) { |
|
| 1959 | 1959 | return str_pad((string) floor($date->micro / 10000), 2, '0', STR_PAD_LEFT); |
| 1960 | 1960 | }, |
| 1961 | - 'SSS' => function (CarbonInterface $date) { |
|
| 1961 | + 'SSS' => function(CarbonInterface $date) { |
|
| 1962 | 1962 | return str_pad((string) floor($date->micro / 1000), 3, '0', STR_PAD_LEFT); |
| 1963 | 1963 | }, |
| 1964 | - 'SSSS' => function (CarbonInterface $date) { |
|
| 1964 | + 'SSSS' => function(CarbonInterface $date) { |
|
| 1965 | 1965 | return str_pad((string) floor($date->micro / 100), 4, '0', STR_PAD_LEFT); |
| 1966 | 1966 | }, |
| 1967 | - 'SSSSS' => function (CarbonInterface $date) { |
|
| 1967 | + 'SSSSS' => function(CarbonInterface $date) { |
|
| 1968 | 1968 | return str_pad((string) floor($date->micro / 10), 5, '0', STR_PAD_LEFT); |
| 1969 | 1969 | }, |
| 1970 | 1970 | 'SSSSSS' => ['getPaddedUnit', ['micro', 6]], |
| 1971 | - 'SSSSSSS' => function (CarbonInterface $date) { |
|
| 1971 | + 'SSSSSSS' => function(CarbonInterface $date) { |
|
| 1972 | 1972 | return str_pad((string) floor($date->micro * 10), 7, '0', STR_PAD_LEFT); |
| 1973 | 1973 | }, |
| 1974 | - 'SSSSSSSS' => function (CarbonInterface $date) { |
|
| 1974 | + 'SSSSSSSS' => function(CarbonInterface $date) { |
|
| 1975 | 1975 | return str_pad((string) floor($date->micro * 100), 8, '0', STR_PAD_LEFT); |
| 1976 | 1976 | }, |
| 1977 | - 'SSSSSSSSS' => function (CarbonInterface $date) { |
|
| 1977 | + 'SSSSSSSSS' => function(CarbonInterface $date) { |
|
| 1978 | 1978 | return str_pad((string) floor($date->micro * 1000), 9, '0', STR_PAD_LEFT); |
| 1979 | 1979 | }, |
| 1980 | 1980 | 'M' => 'month', |
| 1981 | 1981 | 'MM' => ['rawFormat', ['m']], |
| 1982 | - 'MMM' => function (CarbonInterface $date, $originalFormat = null) { |
|
| 1982 | + 'MMM' => function(CarbonInterface $date, $originalFormat = null) { |
|
| 1983 | 1983 | $month = $date->getTranslatedShortMonthName($originalFormat); |
| 1984 | 1984 | $suffix = $date->getTranslationMessage('mmm_suffix'); |
| 1985 | 1985 | if ($suffix && $month !== $date->monthName) { |
@@ -1988,7 +1988,7 @@ discard block |
||
| 1988 | 1988 | |
| 1989 | 1989 | return $month; |
| 1990 | 1990 | }, |
| 1991 | - 'MMMM' => function (CarbonInterface $date, $originalFormat = null) { |
|
| 1991 | + 'MMMM' => function(CarbonInterface $date, $originalFormat = null) { |
|
| 1992 | 1992 | return $date->getTranslatedMonthName($originalFormat); |
| 1993 | 1993 | }, |
| 1994 | 1994 | 'Mo' => ['ordinal', ['month', 'M']], |
@@ -2016,7 +2016,7 @@ discard block |
||
| 2016 | 2016 | 'YY' => ['rawFormat', ['y']], |
| 2017 | 2017 | 'YYYY' => ['getPaddedUnit', ['year', 4]], |
| 2018 | 2018 | 'YYYYY' => ['getPaddedUnit', ['year', 5]], |
| 2019 | - 'YYYYYY' => function (CarbonInterface $date) { |
|
| 2019 | + 'YYYYYY' => function(CarbonInterface $date) { |
|
| 2020 | 2020 | return ($date->year < 0 ? '' : '+').$date->getPaddedUnit('year', 6); |
| 2021 | 2021 | }, |
| 2022 | 2022 | 'z' => ['rawFormat', ['T']], |
@@ -2169,7 +2169,7 @@ discard block |
||
| 2169 | 2169 | $code = $match[0]; |
| 2170 | 2170 | $sequence = $formats[$code] ?? preg_replace_callback( |
| 2171 | 2171 | '/MMMM|MM|DD|dddd/', |
| 2172 | - function ($code) { |
|
| 2172 | + function($code) { |
|
| 2173 | 2173 | return mb_substr($code[0], 1); |
| 2174 | 2174 | }, |
| 2175 | 2175 | $formats[strtoupper($code)] ?? '' |
@@ -2229,7 +2229,7 @@ discard block |
||
| 2229 | 2229 | 'j' => true, |
| 2230 | 2230 | 'l' => 'dddd', |
| 2231 | 2231 | 'N' => true, |
| 2232 | - 'S' => function ($date) { |
|
| 2232 | + 'S' => function($date) { |
|
| 2233 | 2233 | $day = $date->rawFormat('j'); |
| 2234 | 2234 | |
| 2235 | 2235 | return str_replace((string) $day, '', $date->isoFormat('Do')); |
@@ -2375,7 +2375,7 @@ discard block |
||
| 2375 | 2375 | |
| 2376 | 2376 | protected static function executeStaticCallable($macro, ...$parameters) |
| 2377 | 2377 | { |
| 2378 | - return static::bindMacroContext(null, function () use (&$macro, &$parameters) { |
|
| 2378 | + return static::bindMacroContext(null, function() use (&$macro, &$parameters) { |
|
| 2379 | 2379 | if ($macro instanceof Closure) { |
| 2380 | 2380 | $boundMacro = @Closure::bind($macro, null, static::class); |
| 2381 | 2381 | |
@@ -2429,7 +2429,7 @@ discard block |
||
| 2429 | 2429 | $unit = static::singularUnit($unit); |
| 2430 | 2430 | $dateUnits = ['year', 'month', 'day']; |
| 2431 | 2431 | if (\in_array($unit, $dateUnits)) { |
| 2432 | - return $this->setDate(...array_map(function ($name) use ($unit, $value) { |
|
| 2432 | + return $this->setDate(...array_map(function($name) use ($unit, $value) { |
|
| 2433 | 2433 | return (int) ($name === $unit ? $value : $this->$name); |
| 2434 | 2434 | }, $dateUnits)); |
| 2435 | 2435 | } |
@@ -2442,7 +2442,7 @@ discard block |
||
| 2442 | 2442 | $unit = 'micro'; |
| 2443 | 2443 | } |
| 2444 | 2444 | |
| 2445 | - return $this->setTime(...array_map(function ($name) use ($unit, $value) { |
|
| 2445 | + return $this->setTime(...array_map(function($name) use ($unit, $value) { |
|
| 2446 | 2446 | return (int) ($name === $unit ? $value : $this->$name); |
| 2447 | 2447 | }, $units)); |
| 2448 | 2448 | } |
@@ -2504,7 +2504,7 @@ discard block |
||
| 2504 | 2504 | |
| 2505 | 2505 | protected function executeCallableWithContext($macro, ...$parameters) |
| 2506 | 2506 | { |
| 2507 | - return static::bindMacroContext($this, function () use (&$macro, &$parameters) { |
|
| 2507 | + return static::bindMacroContext($this, function() use (&$macro, &$parameters) { |
|
| 2508 | 2508 | return $this->executeCallable($macro, ...$parameters); |
| 2509 | 2509 | }); |
| 2510 | 2510 | } |
@@ -2550,7 +2550,7 @@ discard block |
||
| 2550 | 2550 | $syntaxPattern = implode('|', array_keys($diffSyntaxModes)); |
| 2551 | 2551 | |
| 2552 | 2552 | if (preg_match("/^(?<size>$sizePattern)(?<syntax>$syntaxPattern)DiffForHumans$/", $method, $match)) { |
| 2553 | - $dates = array_filter($parameters, function ($parameter) { |
|
| 2553 | + $dates = array_filter($parameters, function($parameter) { |
|
| 2554 | 2554 | return $parameter instanceof DateTimeInterface; |
| 2555 | 2555 | }); |
| 2556 | 2556 | $other = null; |
@@ -2670,7 +2670,7 @@ discard block |
||
| 2670 | 2670 | } |
| 2671 | 2671 | } |
| 2672 | 2672 | |
| 2673 | - return static::bindMacroContext($this, function () use (&$method, &$parameters) { |
|
| 2673 | + return static::bindMacroContext($this, function() use (&$method, &$parameters) { |
|
| 2674 | 2674 | $macro = $this->getLocalMacro($method); |
| 2675 | 2675 | |
| 2676 | 2676 | if (!$macro) { |
@@ -226,14 +226,12 @@ |
||
| 226 | 226 | $startOfWeek = $this->avoidMutation()->startOfWeek($weekStartsAt); |
| 227 | 227 | |
| 228 | 228 | return $startOfWeek != $this ? |
| 229 | - $this->startOfWeek($weekStartsAt)->addWeek() : |
|
| 230 | - $this; |
|
| 229 | + $this->startOfWeek($weekStartsAt)->addWeek() : $this; |
|
| 231 | 230 | } |
| 232 | 231 | |
| 233 | 232 | $startOfWeek = $this->startOfWeek($weekStartsAt); |
| 234 | 233 | |
| 235 | 234 | return $startOfWeek != $this ? |
| 236 | - $startOfWeek->addWeek() : |
|
| 237 | - $this->avoidMutation(); |
|
| 235 | + $startOfWeek->addWeek() : $this->avoidMutation(); |
|
| 238 | 236 | } |
| 239 | 237 | } |
@@ -437,7 +437,7 @@ |
||
| 437 | 437 | */ |
| 438 | 438 | public function __debugInfo() |
| 439 | 439 | { |
| 440 | - $infos = array_filter(get_object_vars($this), function ($var) { |
|
| 440 | + $infos = array_filter(get_object_vars($this), function($var) { |
|
| 441 | 441 | return $var; |
| 442 | 442 | }); |
| 443 | 443 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | */ |
| 287 | 287 | public function diffInWeekdays($date = null, $absolute = true) |
| 288 | 288 | { |
| 289 | - return $this->diffInDaysFiltered(function (CarbonInterface $date) { |
|
| 289 | + return $this->diffInDaysFiltered(function(CarbonInterface $date) { |
|
| 290 | 290 | return $date->isWeekday(); |
| 291 | 291 | }, $date, $absolute); |
| 292 | 292 | } |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | */ |
| 302 | 302 | public function diffInWeekendDays($date = null, $absolute = true) |
| 303 | 303 | { |
| 304 | - return $this->diffInDaysFiltered(function (CarbonInterface $date) { |
|
| 304 | + return $this->diffInDaysFiltered(function(CarbonInterface $date) { |
|
| 305 | 305 | return $date->isWeekend(); |
| 306 | 306 | }, $date, $absolute); |
| 307 | 307 | } |
@@ -455,7 +455,7 @@ |
||
| 455 | 455 | */ |
| 456 | 456 | public function change($modifier) |
| 457 | 457 | { |
| 458 | - return $this->modify(preg_replace_callback('/^(next|previous|last)\s+(\d{1,2}(h|am|pm|:\d{1,2}(:\d{1,2})?))$/i', function ($match) { |
|
| 458 | + return $this->modify(preg_replace_callback('/^(next|previous|last)\s+(\d{1,2}(h|am|pm|:\d{1,2}(:\d{1,2})?))$/i', function($match) { |
|
| 459 | 459 | $match[2] = str_replace('h', ':00', $match[2]); |
| 460 | 460 | $test = $this->avoidMutation()->modify($match[2]); |
| 461 | 461 | $method = $match[1] === 'next' ? 'lt' : 'gt'; |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | foreach (self::getMixableMethods($context) as $name) { |
| 104 | 104 | $closureBase = Closure::fromCallable([$context, $name]); |
| 105 | 105 | |
| 106 | - static::macro($name, function () use ($closureBase, $className) { |
|
| 106 | + static::macro($name, function() use ($closureBase, $className) { |
|
| 107 | 107 | /** @phpstan-ignore-next-line */ |
| 108 | 108 | $context = isset($this) ? $this->cast($className) : new $className(); |
| 109 | 109 | |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | 'minute', |
| 392 | 392 | 'second', |
| 393 | 393 | ], $messages, $key) : [], |
| 394 | - $mode & CarbonInterface::TRANSLATE_MERIDIEM ? array_map(function ($hour) use ($meridiem) { |
|
| 394 | + $mode & CarbonInterface::TRANSLATE_MERIDIEM ? array_map(function($hour) use ($meridiem) { |
|
| 395 | 395 | if (\is_array($meridiem)) { |
| 396 | 396 | return $meridiem[$hour < 12 ? 0 : 1]; |
| 397 | 397 | } |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | ); |
| 402 | 402 | } |
| 403 | 403 | |
| 404 | - return substr(preg_replace_callback('/(?<=[\d\s+.\/,_-])('.implode('|', $fromTranslations).')(?=[\d\s+.\/,_-])/iu', function ($match) use ($fromTranslations, $toTranslations) { |
|
| 404 | + return substr(preg_replace_callback('/(?<=[\d\s+.\/,_-])('.implode('|', $fromTranslations).')(?=[\d\s+.\/,_-])/iu', function($match) use ($fromTranslations, $toTranslations) { |
|
| 405 | 405 | [$chunk] = $match; |
| 406 | 406 | |
| 407 | 407 | foreach ($fromTranslations as $index => $word) { |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | */ |
| 557 | 557 | public static function localeHasShortUnits($locale) |
| 558 | 558 | { |
| 559 | - return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) { |
|
| 559 | + return static::executeWithLocale($locale, function($newLocale, TranslatorInterface $translator) { |
|
| 560 | 560 | return ($newLocale && (($y = static::translateWith($translator, 'y')) !== 'y' && $y !== static::translateWith($translator, 'year'))) || ( |
| 561 | 561 | ($y = static::translateWith($translator, 'd')) !== 'd' && |
| 562 | 562 | $y !== static::translateWith($translator, 'day') |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | */ |
| 578 | 578 | public static function localeHasDiffSyntax($locale) |
| 579 | 579 | { |
| 580 | - return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) { |
|
| 580 | + return static::executeWithLocale($locale, function($newLocale, TranslatorInterface $translator) { |
|
| 581 | 581 | if (!$newLocale) { |
| 582 | 582 | return false; |
| 583 | 583 | } |
@@ -608,7 +608,7 @@ discard block |
||
| 608 | 608 | */ |
| 609 | 609 | public static function localeHasDiffOneDayWords($locale) |
| 610 | 610 | { |
| 611 | - return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) { |
|
| 611 | + return static::executeWithLocale($locale, function($newLocale, TranslatorInterface $translator) { |
|
| 612 | 612 | return $newLocale && |
| 613 | 613 | $translator->trans('diff_now') !== 'diff_now' && |
| 614 | 614 | $translator->trans('diff_yesterday') !== 'diff_yesterday' && |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | */ |
| 627 | 627 | public static function localeHasDiffTwoDayWords($locale) |
| 628 | 628 | { |
| 629 | - return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) { |
|
| 629 | + return static::executeWithLocale($locale, function($newLocale, TranslatorInterface $translator) { |
|
| 630 | 630 | return $newLocale && |
| 631 | 631 | $translator->trans('diff_before_yesterday') !== 'diff_before_yesterday' && |
| 632 | 632 | $translator->trans('diff_after_tomorrow') !== 'diff_after_tomorrow'; |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | */ |
| 644 | 644 | public static function localeHasPeriodSyntax($locale) |
| 645 | 645 | { |
| 646 | - return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) { |
|
| 646 | + return static::executeWithLocale($locale, function($newLocale, TranslatorInterface $translator) { |
|
| 647 | 647 | return $newLocale && |
| 648 | 648 | $translator->trans('period_recurrences') !== 'period_recurrences' && |
| 649 | 649 | $translator->trans('period_interval') !== 'period_interval' && |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | */ |
| 779 | 779 | private static function translateWordsByKeys($keys, $messages, $key): array |
| 780 | 780 | { |
| 781 | - return array_map(function ($wordKey) use ($messages, $key) { |
|
| 781 | + return array_map(function($wordKey) use ($messages, $key) { |
|
| 782 | 782 | $message = $key === 'from' && isset($messages[$wordKey.'_regexp']) |
| 783 | 783 | ? $messages[$wordKey.'_regexp'] |
| 784 | 784 | : ($messages[$wordKey] ?? null); |
@@ -1050,7 +1050,7 @@ |
||
| 1050 | 1050 | // Replace not-escaped letters |
| 1051 | 1051 | $regex = preg_replace_callback( |
| 1052 | 1052 | '/(?<!\\\\)((?:\\\\{2})*)(['.implode('', array_keys($replacements)).'])/', |
| 1053 | - function ($match) use ($replacements) { |
|
| 1053 | + function($match) use ($replacements) { |
|
| 1054 | 1054 | return $match[1].strtr($match[2], $replacements); |
| 1055 | 1055 | }, |
| 1056 | 1056 | $regex |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | $defaults = null; |
| 376 | - $getDefault = function ($unit) use ($tz, &$defaults) { |
|
| 376 | + $getDefault = function($unit) use ($tz, &$defaults) { |
|
| 377 | 377 | if ($defaults === null) { |
| 378 | 378 | $now = self::createNowInstance($tz); |
| 379 | 379 | |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | */ |
| 722 | 722 | public static function createFromIsoFormat($format, $time, $tz = null, $locale = 'en', $translator = null) |
| 723 | 723 | { |
| 724 | - $format = preg_replace_callback('/(?<!\\\\)(\\\\{2})*(LTS|LT|[Ll]{1,4})/', function ($match) use ($locale, $translator) { |
|
| 724 | + $format = preg_replace_callback('/(?<!\\\\)(\\\\{2})*(LTS|LT|[Ll]{1,4})/', function($match) use ($locale, $translator) { |
|
| 725 | 725 | [$code] = $match; |
| 726 | 726 | |
| 727 | 727 | static $formats = null; |
@@ -741,14 +741,14 @@ discard block |
||
| 741 | 741 | |
| 742 | 742 | return $formats[$code] ?? preg_replace_callback( |
| 743 | 743 | '/MMMM|MM|DD|dddd/', |
| 744 | - function ($code) { |
|
| 744 | + function($code) { |
|
| 745 | 745 | return mb_substr($code[0], 1); |
| 746 | 746 | }, |
| 747 | 747 | $formats[strtoupper($code)] ?? '' |
| 748 | 748 | ); |
| 749 | 749 | }, $format); |
| 750 | 750 | |
| 751 | - $format = preg_replace_callback('/(?<!\\\\)(\\\\{2})*('.CarbonInterface::ISO_FORMAT_REGEXP.'|[A-Za-z])/', function ($match) { |
|
| 751 | + $format = preg_replace_callback('/(?<!\\\\)(\\\\{2})*('.CarbonInterface::ISO_FORMAT_REGEXP.'|[A-Za-z])/', function($match) { |
|
| 752 | 752 | [$code] = $match; |
| 753 | 753 | |
| 754 | 754 | static $replacements = null; |