adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5991 from mvdriel/fix-return-type-of-toQuarter

Browse source 
Fixed return type of toQuarter in CakeTime and TimeHelper
This commit is contained in:
Mark Story 2015-03-02 12:38:20 -05:00
commit 86f4690d93
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file

@ -72,13 +72,13 @@ class CakeTimeTest extends CakeTestCase {
*/ */
public function testToQuarter() { public function testToQuarter() {
$result = $this->Time->toQuarter('2007-12-25'); $result = $this->Time->toQuarter('2007-12-25');
$this->assertEquals(4, $result); $this->assertSame(4, $result);
$result = $this->Time->toQuarter('2007-9-25'); $result = $this->Time->toQuarter('2007-9-25');
$this->assertEquals(3, $result); $this->assertSame(3, $result);
$result = $this->Time->toQuarter('2007-3-25'); $result = $this->Time->toQuarter('2007-3-25');
$this->assertEquals(1, $result); $this->assertSame(1, $result);
$result = $this->Time->toQuarter('2007-3-25', true); $result = $this->Time->toQuarter('2007-3-25', true);
$this->assertEquals(array('2007-01-01', '2007-03-31'), $result); $this->assertEquals(array('2007-01-01', '2007-03-31'), $result);

4
lib/Cake/Utility/CakeTime.php
View file

@ -575,12 +575,12 @@ class CakeTime {
* *
* @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
* @param bool $range if true returns a range in Y-m-d format * @param bool $range if true returns a range in Y-m-d format
* @return mixed 1, 2, 3, or 4 quarter of year or array if $range true * @return int|array 1, 2, 3, or 4 quarter of year or array if $range true
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toQuarter * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toQuarter
*/ */
public static function toQuarter($dateString, $range = false) { public static function toQuarter($dateString, $range = false) {
$time = self::fromString($dateString); $time = self::fromString($dateString);
$date = ceil(date('m', $time) / 3); $date = (int)ceil(date('m', $time) / 3);
if ($range === false) { if ($range === false) {
return $date; return $date;
} }

2
lib/Cake/View/Helper/TimeHelper.php
View file

@ -316,7 +316,7 @@ class TimeHelper extends AppHelper {
* *
* @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
* @param bool $range if true returns a range in Y-m-d format * @param bool $range if true returns a range in Y-m-d format
* @return mixed 1, 2, 3, or 4 quarter of year or array if $range true * @return int|array 1, 2, 3, or 4 quarter of year or array if $range true
* @see CakeTime::toQuarter() * @see CakeTime::toQuarter()
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
*/ */