@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | $interval->localStrictModeEnabled = true; |
| 657 | 657 | |
| 658 | 658 | $result = static::hasMacro($method) |
| 659 | - ? static::bindMacroContext(null, function () use (&$method, &$parameters, &$interval) { |
|
| 659 | + ? static::bindMacroContext(null, function() use (&$method, &$parameters, &$interval) { |
|
| 660 | 660 | return $interval->callMacro($method, $parameters); |
| 661 | 661 | }) |
| 662 | 662 | : $interval->$method(...$parameters); |
@@ -746,9 +746,7 @@ discard block |
||
| 746 | 746 | } |
| 747 | 747 | |
| 748 | 748 | switch ($unit === 'µs' ? 'µs' : strtolower($unit)) { |
| 749 | - case 'millennia': |
|
| 750 | - case 'millennium': |
|
| 751 | - $years += $intValue * CarbonInterface::YEARS_PER_MILLENNIUM; |
|
| 749 | + case 'millennia' : case 'millennium' : $years += $intValue * CarbonInterface::YEARS_PER_MILLENNIUM; |
|
| 752 | 750 | |
| 753 | 751 | break; |
| 754 | 752 | |
@@ -1343,7 +1341,7 @@ discard block |
||
| 1343 | 1341 | public function __call($method, $parameters) |
| 1344 | 1342 | { |
| 1345 | 1343 | if (static::hasMacro($method)) { |
| 1346 | - return static::bindMacroContext($this, function () use (&$method, &$parameters) { |
|
| 1344 | + return static::bindMacroContext($this, function() use (&$method, &$parameters) { |
|
| 1347 | 1345 | return $this->callMacro($method, $parameters); |
| 1348 | 1346 | }); |
| 1349 | 1347 | } |
@@ -1410,7 +1408,7 @@ discard block |
||
| 1410 | 1408 | $minimumUnit = 's'; |
| 1411 | 1409 | $skip = []; |
| 1412 | 1410 | extract($this->getForHumansInitialVariables($syntax, $short)); |
| 1413 | - $skip = array_filter((array) $skip, static function ($value) { |
|
| 1411 | + $skip = array_filter((array) $skip, static function($value) { |
|
| 1414 | 1412 | return \is_string($value) && $value !== ''; |
| 1415 | 1413 | }); |
| 1416 | 1414 | |
@@ -1447,7 +1445,7 @@ discard block |
||
| 1447 | 1445 | $optionalSpace = ''; |
| 1448 | 1446 | } |
| 1449 | 1447 | |
| 1450 | - $join = function ($list) use ($default, $last) { |
|
| 1448 | + $join = function($list) use ($default, $last) { |
|
| 1451 | 1449 | if (\count($list) < 2) { |
| 1452 | 1450 | return implode('', $list); |
| 1453 | 1451 | } |
@@ -1464,7 +1462,7 @@ discard block |
||
| 1464 | 1462 | } |
| 1465 | 1463 | |
| 1466 | 1464 | $glue = $join; |
| 1467 | - $join = function ($list) use ($glue) { |
|
| 1465 | + $join = function($list) use ($glue) { |
|
| 1468 | 1466 | return implode($glue, $list); |
| 1469 | 1467 | }; |
| 1470 | 1468 | } |
@@ -1623,7 +1621,7 @@ discard block |
||
| 1623 | 1621 | /** @var \Symfony\Component\Translation\Translator $translator */ |
| 1624 | 1622 | $translator = $this->getLocalTranslator(); |
| 1625 | 1623 | |
| 1626 | - $handleDeclensions = function ($unit, $count, $index = 0, $parts = 1) use ($interpolations, $transId, $translator, $altNumbers, $absolute, &$declensionMode) { |
|
| 1624 | + $handleDeclensions = function($unit, $count, $index = 0, $parts = 1) use ($interpolations, $transId, $translator, $altNumbers, $absolute, &$declensionMode) { |
|
| 1627 | 1625 | if (!$absolute) { |
| 1628 | 1626 | $declensionMode = $declensionMode ?? $this->translate($transId.'_mode'); |
| 1629 | 1627 | |
@@ -1673,14 +1671,14 @@ discard block |
||
| 1673 | 1671 | } |
| 1674 | 1672 | |
| 1675 | 1673 | $diffIntervalArray = [ |
| 1676 | - ['value' => $intervalValues->years, 'unit' => 'year', 'unitShort' => 'y'], |
|
| 1677 | - ['value' => $intervalValues->months, 'unit' => 'month', 'unitShort' => 'm'], |
|
| 1678 | - ['value' => $intervalValues->weeks, 'unit' => 'week', 'unitShort' => 'w'], |
|
| 1679 | - ['value' => $intervalValues->daysExcludeWeeks, 'unit' => 'day', 'unitShort' => 'd'], |
|
| 1680 | - ['value' => $intervalValues->hours, 'unit' => 'hour', 'unitShort' => 'h'], |
|
| 1681 | - ['value' => $intervalValues->minutes, 'unit' => 'minute', 'unitShort' => 'min'], |
|
| 1682 | - ['value' => $intervalValues->seconds, 'unit' => 'second', 'unitShort' => 's'], |
|
| 1683 | - ['value' => $intervalValues->milliseconds, 'unit' => 'millisecond', 'unitShort' => 'ms'], |
|
| 1674 | + ['value' => $intervalValues->years, 'unit' => 'year', 'unitShort' => 'y'], |
|
| 1675 | + ['value' => $intervalValues->months, 'unit' => 'month', 'unitShort' => 'm'], |
|
| 1676 | + ['value' => $intervalValues->weeks, 'unit' => 'week', 'unitShort' => 'w'], |
|
| 1677 | + ['value' => $intervalValues->daysExcludeWeeks, 'unit' => 'day', 'unitShort' => 'd'], |
|
| 1678 | + ['value' => $intervalValues->hours, 'unit' => 'hour', 'unitShort' => 'h'], |
|
| 1679 | + ['value' => $intervalValues->minutes, 'unit' => 'minute', 'unitShort' => 'min'], |
|
| 1680 | + ['value' => $intervalValues->seconds, 'unit' => 'second', 'unitShort' => 's'], |
|
| 1681 | + ['value' => $intervalValues->milliseconds, 'unit' => 'millisecond', 'unitShort' => 'ms'], |
|
| 1684 | 1682 | ['value' => $intervalValues->microExcludeMilli, 'unit' => 'microsecond', 'unitShort' => 'µs'], |
| 1685 | 1683 | ]; |
| 1686 | 1684 | |
@@ -1699,7 +1697,7 @@ discard block |
||
| 1699 | 1697 | } |
| 1700 | 1698 | } |
| 1701 | 1699 | |
| 1702 | - $transChoice = function ($short, $unitData, $index, $parts) use ($absolute, $handleDeclensions, $translator, $aUnit, $altNumbers, $interpolations) { |
|
| 1700 | + $transChoice = function($short, $unitData, $index, $parts) use ($absolute, $handleDeclensions, $translator, $aUnit, $altNumbers, $interpolations) { |
|
| 1703 | 1701 | $count = $unitData['value']; |
| 1704 | 1702 | |
| 1705 | 1703 | if ($short) { |
@@ -2233,7 +2231,7 @@ discard block |
||
| 2233 | 2231 | |
| 2234 | 2232 | private function invertCascade(array $values) |
| 2235 | 2233 | { |
| 2236 | - return $this->set(array_map(function ($value) { |
|
| 2234 | + return $this->set(array_map(function($value) { |
|
| 2237 | 2235 | return -$value; |
| 2238 | 2236 | }, $values))->doCascade(true)->invert(); |
| 2239 | 2237 | } |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | { |
| 137 | 137 | $search = rtrim(strtr($directory, '\\', '/'), '/'); |
| 138 | 138 | |
| 139 | - return $this->setDirectories(array_filter($this->getDirectories(), function ($item) use ($search) { |
|
| 139 | + return $this->setDirectories(array_filter($this->getDirectories(), function($item) use ($search) { |
|
| 140 | 140 | return rtrim(strtr($item, '\\', '/'), '/') !== $search; |
| 141 | 141 | })); |
| 142 | 142 | } |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | public function setLocale($locale) |
| 309 | 309 | { |
| 310 | - $locale = preg_replace_callback('/[-_]([a-z]{2,}|\d{2,})/', function ($matches) { |
|
| 310 | + $locale = preg_replace_callback('/[-_]([a-z]{2,}|\d{2,})/', function($matches) { |
|
| 311 | 311 | // _2-letters or YUE is a region, _3+-letters is a variant |
| 312 | 312 | $upper = strtoupper($matches[1]); |
| 313 | 313 | |
@@ -333,11 +333,11 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | $completeLocaleChunks = preg_split('/[_.-]+/', $completeLocale); |
| 335 | 335 | |
| 336 | - $getScore = function ($language) use ($completeLocaleChunks) { |
|
| 336 | + $getScore = function($language) use ($completeLocaleChunks) { |
|
| 337 | 337 | return self::compareChunkLists($completeLocaleChunks, preg_split('/[_.-]+/', $language)); |
| 338 | 338 | }; |
| 339 | 339 | |
| 340 | - usort($locales, function ($first, $second) use ($getScore) { |
|
| 340 | + usort($locales, function($first, $second) use ($getScore) { |
|
| 341 | 341 | return $getScore($second) <=> $getScore($first); |
| 342 | 342 | }); |
| 343 | 343 | |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $events = $this->app['events']; |
| 53 | 53 | |
| 54 | 54 | if ($this->isEventDispatcher($events)) { |
| 55 | - $events->listen(class_exists('Illuminate\Foundation\Events\LocaleUpdated') ? 'Illuminate\Foundation\Events\LocaleUpdated' : 'locale.changed', function () use ($service) { |
|
| 55 | + $events->listen(class_exists('Illuminate\Foundation\Events\LocaleUpdated') ? 'Illuminate\Foundation\Events\LocaleUpdated' : 'locale.changed', function() use ($service) { |
|
| 56 | 56 | $service->updateLocale(); |
| 57 | 57 | }); |
| 58 | 58 | } |
@@ -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 | |