drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to laravel 7 and set branch to v2

Browse Source
This commit is contained in:
drkthunder02
2020-12-25 11:22:15 +00:00
parent 516105c492
commit 0ddd298350
4638 changed files with 132501 additions and 190226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
vendor/cakephp/chronos/src/MutableDateTime.php vendored
View File

@@ -1,4 +1,6 @@
<?php
declare(strict_types=1);
/**
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
@@ -22,17 +24,18 @@ use InvalidArgumentException;
* This object can be mutated in place using any setter method,
* or __set().
*
* @property int $year
* @property int $yearIso
* @property int $month
* @property int $day
* @property int $hour
* @property int $minute
* @property int $second
* @property int $timestamp seconds since the Unix Epoch
* @property DateTimeZone|string $timezone the current timezone
* @property DateTimeZone|string $tz alias of timezone
* @property int $micro
* @property-read int $year
* @property-read int $yearIso
* @property-read int $month
* @property-read int $day
* @property-read int $hour
* @property-read int $minute
* @property-read int $second
* @property-read int $micro
* @property-read int $microsecond
* @property-read int $timestamp seconds since the Unix Epoch
* @property-read \DateTimeZone|string $timezone the current timezone
* @property-read \DateTimeZone|string $tz alias of timezone
* @property-read int $dayOfWeek 1 (for Monday) through 7 (for Sunday)
* @property-read int $dayOfYear 0 through 365
* @property-read int $weekOfMonth 1 through 5
@@ -73,7 +76,7 @@ class MutableDateTime extends DateTime implements ChronosInterface
* Please see the testing aids section (specifically static::setTestNow())
* for more on the possibility of this constructor returning a test instance.
*
* @param string|null $time Fixed or relative time
* @param \DateTime|\DateTimeImmutable|string|int|null $time Fixed or relative time
* @param \DateTimeZone|string|null $tz The timezone for the instance
*/
public function __construct($time = 'now', $tz = null)
@@ -82,9 +85,13 @@ class MutableDateTime extends DateTime implements ChronosInterface
$tz = $tz instanceof DateTimeZone ? $tz : new DateTimeZone($tz);
}
if ($time instanceof \DateTimeInterface) {
$time = $time->format('Y-m-d H:i:s.u');
}
$testNow = Chronos::getTestNow();
if ($testNow === null) {
parent::__construct($time === null ? 'now' : $time, $tz);
parent::__construct($time ?? 'now', $tz);
return;
}
@@ -97,14 +104,15 @@ class MutableDateTime extends DateTime implements ChronosInterface
}
$testNow = clone $testNow;
$relativetime = static::isTimeExpression($time);
if (!$relativetime && $tz !== $testNow->getTimezone()) {
$testNow = $testNow->setTimezone($tz ?? date_default_timezone_get());
}
if ($relative) {
$testNow = $testNow->modify($time);
}
$relativetime = static::isTimeExpression($time);
if (!$relativetime && $tz !== $testNow->getTimezone()) {
$testNow = $testNow->setTimezone($tz === null ? date_default_timezone_get() : $tz);
}
$time = $testNow->format('Y-m-d H:i:s.u');
parent::__construct($time, $tz);
}
@@ -112,9 +120,9 @@ class MutableDateTime extends DateTime implements ChronosInterface
/**
* Create a new immutable instance from current mutable instance.
*
* @return Chronos
* @return \Cake\Chronos\Chronos
*/
public function toImmutable()
public function toImmutable(): Chronos
{
return Chronos::instance($this);
}
@@ -127,7 +135,7 @@ class MutableDateTime extends DateTime implements ChronosInterface
* @throws \InvalidArgumentException
* @return void
*/
public function __set($name, $value)
public function __set(string $name, $value): void
{
switch ($name) {
case 'year':
@@ -173,7 +181,7 @@ class MutableDateTime extends DateTime implements ChronosInterface
*
* @return array
*/
public function __debugInfo()
public function __debugInfo(): array
{
$properties = [
'hasFixedNow' => static::hasTestNow(),