diff options
Diffstat (limited to 'vendor/nesbot/carbon/src/Carbon/Traits')
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Traits/Date.php | 6 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Traits/Localization.php | 4 | ||||
| -rw-r--r-- | vendor/nesbot/carbon/src/Carbon/Traits/Options.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Date.php b/vendor/nesbot/carbon/src/Carbon/Traits/Date.php index 7516180300..f4b7c42b0c 100644 --- a/vendor/nesbot/carbon/src/Carbon/Traits/Date.php +++ b/vendor/nesbot/carbon/src/Carbon/Traits/Date.php @@ -1374,17 +1374,17 @@ trait Date /** * Returns the minutes offset to UTC if no arguments passed, else set the timezone with given minutes shift passed. * - * @param int|null $offset + * @param int|null $minuteOffset * * @return int|static */ - public function utcOffset(int $offset = null) + public function utcOffset(int $minuteOffset = null) { if (\func_num_args() < 1) { return $this->offsetMinutes; } - return $this->setTimezone(static::safeCreateDateTimeZone($offset / static::MINUTES_PER_HOUR)); + return $this->setTimezone(CarbonTimeZone::createFromMinuteOffset($minuteOffset)); } /** diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php b/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php index 827d7b47fe..7bbedf999f 100644 --- a/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php +++ b/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php @@ -396,11 +396,11 @@ trait Localization ); } - return substr(preg_replace_callback('/(?<=[\d\s+.\/,_-])('.implode('|', $fromTranslations).')(?=[\d\s+.\/,_-])/i', function ($match) use ($fromTranslations, $toTranslations) { + return substr(preg_replace_callback('/(?<=[\d\s+.\/,_-])('.implode('|', $fromTranslations).')(?=[\d\s+.\/,_-])/iu', function ($match) use ($fromTranslations, $toTranslations) { [$chunk] = $match; foreach ($fromTranslations as $index => $word) { - if (preg_match("/^$word\$/i", $chunk)) { + if (preg_match("/^$word\$/iu", $chunk)) { return $toTranslations[$index] ?? ''; } } diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Options.php b/vendor/nesbot/carbon/src/Carbon/Traits/Options.php index 626a23cd17..ce03faf323 100644 --- a/vendor/nesbot/carbon/src/Carbon/Traits/Options.php +++ b/vendor/nesbot/carbon/src/Carbon/Traits/Options.php @@ -61,7 +61,7 @@ trait Options /** * Format regex patterns. * - * @var array + * @var array<string, string> */ protected static $regexFormats = [ 'd' => '(3[01]|[12][0-9]|0[1-9])', @@ -72,7 +72,7 @@ trait Options 'S' => '(st|nd|rd|th)', 'w' => '([0-6])', 'z' => '(36[0-5]|3[0-5][0-9]|[12][0-9]{2}|[1-9]?[0-9])', - 'W' => '(5[012]|[1-4][0-9]|[1-9])', + 'W' => '(5[012]|[1-4][0-9]|0?[1-9])', 'F' => '([a-zA-Z]{2,})', 'm' => '(1[012]|0[1-9])', 'M' => '([a-zA-Z]{3})', |