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

Fix code & tests for isPast() and isFuture()

Browse source 
The methods and tests now follow coding standards and work.
This commit is contained in:
mark_story 2013-03-30 22:23:47 -04:00
parent 632c4feb5d
commit d28c2f8e72
2 changed files with 26 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -596,55 +596,39 @@ class CakeTimeTest extends CakeTestCase {
$result = $this->Time->isToday('-1 day');
$this->assertFalse($result);
}
/**
* testIsFuture method
*
* @return void
*/
public function testIsFuture() {
$result = $this->Time->isFuture('+1 month');
$this->assertTrue($result);
$result = $this->Time->isFuture('+1 days');
$this->assertTrue($result);
$result = $this->Time->isFuture('+1 minute');
$this->assertTrue($result);
$result = $this->Time->isFuture('+1 second');
$this->assertTrue($result);
$result = $this->Time->isFuture('-1 second');
$this->assertFalse($result);
$result = $this->Time->isFuture('-1 day');
$this->assertFalse($result);
$result = $this->Time->isFuture('-1 week');
$this->assertFalse($result);
$result = $this->Time->isFuture('-1 month');
$this->assertFalse($result);
$this->assertTrue($this->Time->isFuture('+1 month'));
$this->assertTrue($this->Time->isFuture('+1 days'));
$this->assertTrue($this->Time->isFuture('+1 minute'));
$this->assertTrue($this->Time->isFuture('+1 second'));
$this->assertFalse($this->Time->isFuture('-1 second'));
$this->assertFalse($this->Time->isFuture('-1 day'));
$this->assertFalse($this->Time->isFuture('-1 week'));
$this->assertFalse($this->Time->isFuture('-1 month'));
}
/**
* testIsPast method
*
* @return void
*/
public function testIsPast() {
$result = $this->Time->isFuture('+1 month');
$this->assertFalse($result);
$result = $this->Time->isFuture('+1 days');
$this->assertFalse($result);
$result = $this->Time->isFuture('+1 minute');
$this->assertFalse($result);
$result = $this->Time->isFuture('+1 second');
$this->assertFalse($result);
$result = $this->Time->isFuture('-1 second');
$this->assertTrue($result);
$result = $this->Time->isFuture('-1 day');
$this->assertTrue($result);
$result = $this->Time->isFuture('-1 week');
$this->assertTrue($result);
$result = $this->Time->isFuture('-1 month');
$this->assertTrue($result);
$this->assertFalse($this->Time->isPast('+1 month'));
$this->assertFalse($this->Time->isPast('+1 days'));
$this->assertFalse($this->Time->isPast('+1 minute'));
$this->assertFalse($this->Time->isPast('+1 second'));
$this->assertTrue($this->Time->isPast('-1 second'));
$this->assertTrue($this->Time->isPast('-1 day'));
$this->assertTrue($this->Time->isPast('-1 week'));
$this->assertTrue($this->Time->isPast('-1 month'));
}
/**

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

@ -465,7 +465,7 @@ class CakeTime {
$timestamp = self::fromString($dateString, $timezone);
return date('Y-m-d', $timestamp) == date('Y-m-d', time());
}
/**
* Returns true if given datetime string is in the future.
*
@ -475,10 +475,10 @@ class CakeTime {
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
*/
public static function isFuture($dateString, $timezone = null) {
$date = self::fromString($dateString, $timezone);
return date('Y-m-d H:i:s', $date) < date('Y-m-d H:i:s', time());
$timestamp = self::fromString($dateString, $timezone);
return $timestamp > time();
}
/**
* Returns true if given datetime string is in the past.
*
@ -488,8 +488,8 @@ class CakeTime {
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
*/
public static function isPast($dateString, $timezone = null) {
$date = self::fromString($dateString, $timezone);
return date('Y-m-d H:i:s', $date) > date('Y-m-d H:i:s', time());
$timestamp = self::fromString($dateString, $timezone);
return $timestamp < time();
}
/**