← All changes | includes/lib/Carbon.php +10 -9 3.1 → 3.6.1 View file →

		@@ -311,16 +311,16 @@
311	311	* @return static
312	312	*/
313	313	public static function create($year = null, $month = null, $day = null, $hour = null, $minute = null, $second = null, $tz = null)
314	314	{
315		- $year = ($year === null) ? date('Y') : $year;
316		- $month = ($month === null) ? date('n') : $month;
317		- $day = ($day === null) ? date('j') : $day;
	315	+ $year = ($year === null) ? gmdate('Y') : $year;
	316	+ $month = ($month === null) ? gmdate('n') : $month;
	317	+ $day = ($day === null) ? gmdate('j') : $day;
318	318
319	319	if ($hour === null) {
320		- $hour = date('G');
321		- $minute = ($minute === null) ? date('i') : $minute;
322		- $second = ($second === null) ? date('s') : $second;
	320	+ $hour = gmdate('G');
	321	+ $minute = ($minute === null) ? gmdate('i') : $minute;
	322	+ $second = ($second === null) ? gmdate('s') : $second;
323	323	} else {
324	324	$minute = ($minute === null) ? 0 : $minute;
325	325	$second = ($second === null) ? 0 : $second;
326	326	}
		@@ -674,14 +674,15 @@
674	674	*
675	675	* @param integer $hour
676	676	* @param integer $minute
677	677	* @param integer $second
	678	+ * @param integer $microseconds
678	679	*
679	680	* @return static
680	681	*/
681		- public function setTime($hour, $minute, $second = 0)
	682	+ public function setTime($hour, $minute, $second = 0, $microseconds = 0 )
682	683	{
683		- parent::setTime($hour, $minute, $second);
	684	+ parent::setTime($hour, $minute, $second, $microseconds );
684	685
685	686	return $this;
686	687	}
687	688
		@@ -2209,5 +2210,5 @@
2209	2210	public function isBirthday(Carbon $dt)
2210	2211	{
2211	2212	return $this->month === $dt->month && $this->day === $dt->day;
2212	2213	}
2213		-}
	2214	+}