git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php
index fa7cfc7..f2adee5 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/nesbot/carbon/src/Carbon/Traits/Creator.php
@@ -8,6 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace Carbon\Traits;
use Carbon\Carbon;
@@ -94,7 +95,7 @@
setlocale(LC_NUMERIC, $locale);
}
- static::setLastErrors(parent::getLastErrors());
+ self::setLastErrors(parent::getLastErrors());
}
/**
@@ -338,7 +339,7 @@
return $now(static::now($tz));
}
- return $now;
+ return $now->avoidMutation()->tz($tz);
}
/**
@@ -367,7 +368,7 @@
*/
public static function create($year = 0, $month = 1, $day = 1, $hour = 0, $minute = 0, $second = 0, $tz = null)
{
- if (\is_string($year) && !is_numeric($year)) {
+ if (\is_string($year) && !is_numeric($year) || $year instanceof DateTimeInterface) {
return static::parse($year, $tz ?: (\is_string($month) || $month instanceof DateTimeZone ? $month : null));
}
@@ -389,12 +390,12 @@
return $defaults[$unit];
};
- $year = $year === null ? $getDefault('year') : $year;
- $month = $month === null ? $getDefault('month') : $month;
- $day = $day === null ? $getDefault('day') : $day;
- $hour = $hour === null ? $getDefault('hour') : $hour;
- $minute = $minute === null ? $getDefault('minute') : $minute;
- $second = (float) ($second === null ? $getDefault('second') : $second);
+ $year = $year ?? $getDefault('year');
+ $month = $month ?? $getDefault('month');
+ $day = $day ?? $getDefault('day');
+ $hour = $hour ?? $getDefault('hour');
+ $minute = $minute ?? $getDefault('minute');
+ $second = (float) ($second ?? $getDefault('second'));
self::assertBetween('month', $month, 0, 99);
self::assertBetween('day', $day, 0, 99);
@@ -931,6 +932,8 @@
/**
* {@inheritdoc}
+ *
+ * @return array
*/
#[ReturnTypeWillChange]
public static function getLastErrors()