Skip to content

Commit cb43747

Browse files
committed
Update PHPDoc
1 parent 11c7fbc commit cb43747

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/Carbon/CarbonInterface.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ public function diffFiltered(CarbonInterval $ci, Closure $callback, $date = null
16251625
* ⦿ 'altNumbers' entry, use alternative numbers if available
16261626
* ` (from the current language if true is passed, from the given language(s)
16271627
* ` if array or string is passed)
1628-
* - 'join' entry determines how to join multiple parts of the string
1628+
* ⦿ 'join' entry determines how to join multiple parts of the string
16291629
* ` - if $join is a string, it's used as a joiner glue
16301630
* ` - if $join is a callable/closure, it get the list of string and should return a string
16311631
* ` - if $join is an array, the first item will be the default glue, and the second item
@@ -1635,7 +1635,9 @@ public function diffFiltered(CarbonInterval $ci, Closure $callback, $date = null
16351635
* ⦿ 'other' entry (see above)
16361636
* ⦿ 'minimumUnit' entry determines the smallest unit of time to display can be long or
16371637
* ` short form of the units, e.g. 'hour' or 'h' (default value: s)
1638-
* if int passed, it add modifiers:
1638+
* ⦿ 'locale' language in which the diff should be output (has no effect if 'translator' key is set)
1639+
* ⦿ 'translator' a custom translator to use to translator the output.
1640+
* if int passed, it adds modifiers:
16391641
* Possible values:
16401642
* - CarbonInterface::DIFF_ABSOLUTE no modifiers
16411643
* - CarbonInterface::DIFF_RELATIVE_TO_NOW add ago/from now modifier
@@ -3200,7 +3202,7 @@ public static function macro(string $name, ?callable $macro): void;
32003202
*
32013203
* @return static|null
32023204
*/
3203-
public static function make($var);
3205+
public static function make($var, DateTimeZone|string|null $timezone = null);
32043206

32053207
/**
32063208
* Get the maximum instance between a given instance (default now) and the current instance.

src/Carbon/Factory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
* Support is considered enabled if the 4 sentences are translated in the given locale.
9797
* @method bool localeHasShortUnits(string $locale) Returns true if the given locale is internally supported and has short-units support.
9898
* Support is considered enabled if either year, day or hour has a short variant translated.
99-
* @method ?Carbon make($var) Make a Carbon instance from given variable if possible.
99+
* @method ?Carbon make($var, DateTimeZone|string|null $timezone = null) Make a Carbon instance from given variable if possible.
100100
* Always return a new instance. Parse only strings and only these likely to be dates (skip intervals
101101
* and recurrences). Throw an exception for invalid format, but otherwise return null.
102102
* @method void mixin(object|string $mixin) Mix another object into the class.

src/Carbon/FactoryImmutable.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
* Support is considered enabled if the 4 sentences are translated in the given locale.
9494
* @method bool localeHasShortUnits(string $locale) Returns true if the given locale is internally supported and has short-units support.
9595
* Support is considered enabled if either year, day or hour has a short variant translated.
96-
* @method ?CarbonImmutable make($var) Make a Carbon instance from given variable if possible.
96+
* @method ?CarbonImmutable make($var, DateTimeZone|string|null $timezone = null) Make a Carbon instance from given variable if possible.
9797
* Always return a new instance. Parse only strings and only these likely to be dates (skip intervals
9898
* and recurrences). Throw an exception for invalid format, but otherwise return null.
9999
* @method void mixin(object|string $mixin) Mix another object into the class.

0 commit comments

Comments
 (0)