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

Adds two new time testing methods: 'isFuture' and 'isPast'

Browse source 
TestCases included
This commit is contained in:
Roberto Frega 2013-03-20 15:38:39 -03:00 committed by mark_story
parent 3fc627c5f8
commit 632c4feb5d
2 changed files with 76 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -596,6 +596,56 @@ 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);
}
/**
* 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);
}
/**
* testIsThisWeek method

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

@ -465,6 +465,32 @@ 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.
*
* @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
* @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
* @return boolean True if datetime string is in the future
* @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());
}
/**
* Returns true if given datetime string is in the past.
*
* @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
* @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
* @return boolean True if datetime string is in the past
* @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());
}
/**
* Returns true if given datetime string is within this week.