diff --git a/src/Carbon/CarbonInterface.php b/src/Carbon/CarbonInterface.php index ebfb2758d..eec23442b 100644 --- a/src/Carbon/CarbonInterface.php +++ b/src/Carbon/CarbonInterface.php @@ -631,7 +631,7 @@ public static function __callStatic($method, $parameters); * 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 + * @param string|null $time * @param DateTimeZone|string|null $tz */ public function __construct($time = null, $tz = null); @@ -938,12 +938,12 @@ public function copy(); * If $hour is not null then the default values for $minute and $second * will be 0. * - * @param int|null $year - * @param int|null $month - * @param int|null $day - * @param int|null $hour - * @param int|null $minute - * @param int|null $second + * @param int|null $year + * @param int|null $month + * @param int|null $day + * @param int|null $hour + * @param int|null $minute + * @param int|null $second * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -955,9 +955,9 @@ public static function create($year = 0, $month = 1, $day = 1, $hour = 0, $minut /** * Create a Carbon instance from just a date. The time portion is set to now. * - * @param int|null $year - * @param int|null $month - * @param int|null $day + * @param int|null $year + * @param int|null $month + * @param int|null $day * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -969,8 +969,8 @@ public static function createFromDate($year = null, $month = null, $day = null, /** * Create a Carbon instance from a specific format. * - * @param string $format Datetime format - * @param string $time + * @param string $format Datetime format + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -984,7 +984,7 @@ public static function createFromFormat($format, $time, $tz = null); * * @param string $format Datetime format * @param string $time - * @param DateTimeZone|string|false|null $tz optional timezone + * @param DateTimeZone|string|false|null $tz optional timezone * @param string|null $locale locale to be used for LTS, LT, LL, LLL, etc. macro-formats (en by fault, unneeded if no such macro-format in use) * @param \Symfony\Component\Translation\TranslatorInterface $translator optional custom translator to use for macro-formats * @@ -997,9 +997,9 @@ public static function createFromIsoFormat($format, $time, $tz = null, $locale = /** * Create a Carbon instance from a specific format and a string in a given language. * - * @param string $format Datetime format - * @param string $locale - * @param string $time + * @param string $format Datetime format + * @param string $locale + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -1011,9 +1011,9 @@ public static function createFromLocaleFormat($format, $locale, $time, $tz = nul /** * Create a Carbon instance from a specific ISO format and a string in a given language. * - * @param string $format Datetime ISO format - * @param string $locale - * @param string $time + * @param string $format Datetime ISO format + * @param string $locale + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -1025,9 +1025,9 @@ public static function createFromLocaleIsoFormat($format, $locale, $time, $tz = /** * Create a Carbon instance from just a time. The date portion is set to today. * - * @param int|null $hour - * @param int|null $minute - * @param int|null $second + * @param int|null $hour + * @param int|null $minute + * @param int|null $second * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -1039,7 +1039,7 @@ public static function createFromTime($hour = 0, $minute = 0, $second = 0, $tz = /** * Create a Carbon instance from a time string. The date portion is set to today. * - * @param string $time + * @param string $time * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -1080,9 +1080,9 @@ public static function createFromTimestampUTC($timestamp); /** * Create a Carbon instance from just a date. The time portion is set to midnight. * - * @param int|null $year - * @param int|null $month - * @param int|null $day + * @param int|null $year + * @param int|null $month + * @param int|null $day * @param DateTimeZone|string|null $tz * * @return static @@ -1104,12 +1104,12 @@ public static function createMidnightDate($year = null, $month = null, $day = nu * If one of the set values is not valid, an \InvalidArgumentException * will be thrown. * - * @param int|null $year - * @param int|null $month - * @param int|null $day - * @param int|null $hour - * @param int|null $minute - * @param int|null $second + * @param int|null $year + * @param int|null $month + * @param int|null $day + * @param int|null $hour + * @param int|null $minute + * @param int|null $second * @param DateTimeZone|string|null $tz * * @throws \Carbon\Exceptions\InvalidDateException|\InvalidArgumentException @@ -3232,7 +3232,7 @@ public function ordinal(string $key, string $period = null): string; * as it allows you to do Carbon::parse('Monday next week')->fn() rather * than (new Carbon('Monday next week'))->fn(). * - * @param string|null $time + * @param string|null $time * @param DateTimeZone|string|null $tz * * @return static @@ -3242,8 +3242,8 @@ public static function parse($time = null, $tz = null); /** * Create a carbon instance from a localized string (in French, Japanese, Arabic, etc.). * - * @param string $time - * @param string $locale + * @param string $time + * @param string $locale * @param DateTimeZone|string|null $tz * * @return static @@ -3299,8 +3299,8 @@ public function range($end = null, $interval = null, $unit = null); /** * Create a Carbon instance from a specific format. * - * @param string $format Datetime format - * @param string $time + * @param string $format Datetime format + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -3325,7 +3325,7 @@ public function rawFormat($format); * as it allows you to do Carbon::parse('Monday next week')->fn() rather * than (new Carbon('Monday next week'))->fn(). * - * @param string|null $time + * @param string|null $time * @param DateTimeZone|string|null $tz * * @return static diff --git a/src/Carbon/Traits/Creator.php b/src/Carbon/Traits/Creator.php index 953ab229b..cec761360 100644 --- a/src/Carbon/Traits/Creator.php +++ b/src/Carbon/Traits/Creator.php @@ -45,7 +45,7 @@ trait Creator * 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 + * @param string|null $time * @param DateTimeZone|string|null $tz */ public function __construct($time = null, $tz = null) @@ -112,7 +112,7 @@ public static function instance($date) * as it allows you to do Carbon::parse('Monday next week')->fn() rather * than (new Carbon('Monday next week'))->fn(). * - * @param string|null $time + * @param string|null $time * @param DateTimeZone|string|null $tz * * @return static @@ -141,7 +141,7 @@ public static function rawParse($time = null, $tz = null) * as it allows you to do Carbon::parse('Monday next week')->fn() rather * than (new Carbon('Monday next week'))->fn(). * - * @param string|null $time + * @param string|null $time * @param DateTimeZone|string|null $tz * * @return static @@ -164,8 +164,8 @@ public static function parse($time = null, $tz = null) /** * Create a carbon instance from a localized string (in French, Japanese, Arabic, etc.). * - * @param string $time - * @param string $locale + * @param string $time + * @param string $locale * @param DateTimeZone|string|null $tz * * @return static @@ -289,12 +289,12 @@ private static function createNowInstance($tz) * If $hour is not null then the default values for $minute and $second * will be 0. * - * @param int|null $year - * @param int|null $month - * @param int|null $day - * @param int|null $hour - * @param int|null $minute - * @param int|null $second + * @param int|null $year + * @param int|null $month + * @param int|null $day + * @param int|null $hour + * @param int|null $minute + * @param int|null $second * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -374,12 +374,12 @@ public static function create($year = 0, $month = 1, $day = 1, $hour = 0, $minut * If one of the set values is not valid, an \InvalidArgumentException * will be thrown. * - * @param int|null $year - * @param int|null $month - * @param int|null $day - * @param int|null $hour - * @param int|null $minute - * @param int|null $second + * @param int|null $year + * @param int|null $month + * @param int|null $day + * @param int|null $hour + * @param int|null $minute + * @param int|null $second * @param DateTimeZone|string|null $tz * * @throws \Carbon\Exceptions\InvalidDateException|\InvalidArgumentException @@ -418,9 +418,9 @@ public static function createSafe($year = null, $month = null, $day = null, $hou /** * Create a Carbon instance from just a date. The time portion is set to now. * - * @param int|null $year - * @param int|null $month - * @param int|null $day + * @param int|null $year + * @param int|null $month + * @param int|null $day * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -435,9 +435,9 @@ public static function createFromDate($year = null, $month = null, $day = null, /** * Create a Carbon instance from just a date. The time portion is set to midnight. * - * @param int|null $year - * @param int|null $month - * @param int|null $day + * @param int|null $year + * @param int|null $month + * @param int|null $day * @param DateTimeZone|string|null $tz * * @return static @@ -450,9 +450,9 @@ public static function createMidnightDate($year = null, $month = null, $day = nu /** * Create a Carbon instance from just a time. The date portion is set to today. * - * @param int|null $hour - * @param int|null $minute - * @param int|null $second + * @param int|null $hour + * @param int|null $minute + * @param int|null $second * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -467,7 +467,7 @@ public static function createFromTime($hour = 0, $minute = 0, $second = 0, $tz = /** * Create a Carbon instance from a time string. The date portion is set to today. * - * @param string $time + * @param string $time * @param DateTimeZone|string|null $tz * * @throws \InvalidArgumentException @@ -480,8 +480,8 @@ public static function createFromTimeString($time, $tz = null) } /** - * @param string $format Datetime format - * @param string $time + * @param string $format Datetime format + * @param string $time * @param DateTimeZone|string|false|null $originalTz * * @return \DateTimeInterface|false @@ -515,8 +515,8 @@ private static function createFromFormatAndTimezone($format, $time, $originalTz) /** * Create a Carbon instance from a specific format. * - * @param string $format Datetime format - * @param string $time + * @param string $format Datetime format + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -582,8 +582,8 @@ public static function rawCreateFromFormat($format, $time, $tz = null) /** * Create a Carbon instance from a specific format. * - * @param string $format Datetime format - * @param string $time + * @param string $format Datetime format + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -610,7 +610,7 @@ public static function createFromFormat($format, $time, $tz = null) * * @param string $format Datetime format * @param string $time - * @param DateTimeZone|string|false|null $tz optional timezone + * @param DateTimeZone|string|false|null $tz optional timezone * @param string|null $locale locale to be used for LTS, LT, LL, LLL, etc. macro-formats (en by fault, unneeded if no such macro-format in use) * @param \Symfony\Component\Translation\TranslatorInterface $translator optional custom translator to use for macro-formats * @@ -750,9 +750,9 @@ function ($code) { /** * Create a Carbon instance from a specific format and a string in a given language. * - * @param string $format Datetime format - * @param string $locale - * @param string $time + * @param string $format Datetime format + * @param string $locale + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException @@ -767,9 +767,9 @@ public static function createFromLocaleFormat($format, $locale, $time, $tz = nul /** * Create a Carbon instance from a specific ISO format and a string in a given language. * - * @param string $format Datetime ISO format - * @param string $locale - * @param string $time + * @param string $format Datetime ISO format + * @param string $locale + * @param string $time * @param DateTimeZone|string|false|null $tz * * @throws InvalidArgumentException