From 012ca14282c66fac67fb7b97314c4395ae51af0c Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Mon, 21 Apr 2014 19:15:09 +0200 Subject: [PATCH] Starting to replace Carbon with Time --- src/Database/Type/DateTimeType.php | 2 +- .../Database/Type/DateTimeTypeTest.php | 30 +++++++++---------- tests/TestCase/Database/Type/DateTypeTest.php | 26 ++++++++-------- tests/TestCase/Database/Type/TimeTypeTest.php | 24 +++++++-------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/Database/Type/DateTimeType.php b/src/Database/Type/DateTimeType.php index 66bb64608a7..2c2e59a2d7d 100644 --- a/src/Database/Type/DateTimeType.php +++ b/src/Database/Type/DateTimeType.php @@ -28,7 +28,7 @@ class DateTimeType extends \Cake\Database\Type { * * @var string */ - public static $dateTimeClass = 'Carbon\Carbon'; + public static $dateTimeClass = 'Cake\Utility\Time'; /** * String format to use for DateTime parsing diff --git a/tests/TestCase/Database/Type/DateTimeTypeTest.php b/tests/TestCase/Database/Type/DateTimeTypeTest.php index 878180630e6..b7477dbe1b1 100644 --- a/tests/TestCase/Database/Type/DateTimeTypeTest.php +++ b/tests/TestCase/Database/Type/DateTimeTypeTest.php @@ -17,7 +17,7 @@ use Cake\Database\Type; use Cake\Database\Type\DateTimeType; use Cake\TestSuite\TestCase; -use Carbon\Carbon; +use Cake\Utility\Time; /** * Test for the DateTime type. @@ -44,7 +44,7 @@ public function testToPHP() { $this->assertNull($this->type->toPHP(null, $this->driver)); $result = $this->type->toPHP('2001-01-04 12:13:14', $this->driver); - $this->assertInstanceOf('Carbon\Carbon', $result); + $this->assertInstanceOf('Cake\Utility\Time', $result); $this->assertEquals('2001', $result->format('Y')); $this->assertEquals('01', $result->format('m')); $this->assertEquals('04', $result->format('d')); @@ -64,7 +64,7 @@ public function testToPHP() { public function testToPHPIncludingMilliseconds() { $in = '2014-03-24 20:44:36.315113'; $result = $this->type->toPHP($in, $this->driver); - $this->assertInstanceOf('Carbon\Carbon', $result); + $this->assertInstanceOf('Cake\Utility\Time', $result); } /** @@ -77,7 +77,7 @@ public function testToDatabase() { $result = $this->type->toDatabase($value, $this->driver); $this->assertEquals($value, $result); - $date = new Carbon('2013-08-12 15:16:17'); + $date = new Time('2013-08-12 15:16:17'); $result = $this->type->toDatabase($date, $this->driver); $this->assertEquals('2013-08-12 15:16:17', $result); } @@ -98,15 +98,15 @@ public function marshalProvider() { ['2013-nope!', '2013-nope!'], // valid string types - ['1392387900', new Carbon('@1392387900')], - [1392387900, new Carbon('@1392387900')], - ['2014-02-14', new Carbon('2014-02-14')], - ['2014-02-14 13:14:15', new Carbon('2014-02-14 13:14:15')], + ['1392387900', new Time('@1392387900')], + [1392387900, new Time('@1392387900')], + ['2014-02-14', new Time('2014-02-14')], + ['2014-02-14 13:14:15', new Time('2014-02-14 13:14:15')], // valid array types [ ['year' => 2014, 'month' => 2, 'day' => 14, 'hour' => 13, 'minute' => 14, 'second' => 15], - new Carbon('2014-02-14 13:14:15') + new Time('2014-02-14 13:14:15') ], [ [ @@ -114,7 +114,7 @@ public function marshalProvider() { 'hour' => 1, 'minute' => 14, 'second' => 15, 'meridian' => 'am' ], - new Carbon('2014-02-14 01:14:15') + new Time('2014-02-14 01:14:15') ], [ [ @@ -122,30 +122,30 @@ public function marshalProvider() { 'hour' => 1, 'minute' => 14, 'second' => 15, 'meridian' => 'pm' ], - new Carbon('2014-02-14 13:14:15') + new Time('2014-02-14 13:14:15') ], [ [ 'year' => 2014, 'month' => 2, 'day' => 14, ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], // Invalid array types [ ['year' => 'farts', 'month' => 'derp'], - new Carbon(date('Y-m-d 00:00:00')) + new Time(date('Y-m-d 00:00:00')) ], [ ['year' => 'farts', 'month' => 'derp', 'day' => 'farts'], - new Carbon(date('Y-m-d 00:00:00')) + new Time(date('Y-m-d 00:00:00')) ], [ [ 'year' => '2014', 'month' => '02', 'day' => '14', 'hour' => 'farts', 'minute' => 'farts' ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], ]; } diff --git a/tests/TestCase/Database/Type/DateTypeTest.php b/tests/TestCase/Database/Type/DateTypeTest.php index 4b81a0f6eb5..0a3b7f8551b 100644 --- a/tests/TestCase/Database/Type/DateTypeTest.php +++ b/tests/TestCase/Database/Type/DateTypeTest.php @@ -17,7 +17,7 @@ use Cake\Database\Type; use Cake\Database\Type\DateType; use Cake\TestSuite\TestCase; -use Carbon\Carbon; +use Cake\Utility\Time; /** * Test for the Date type. @@ -70,11 +70,11 @@ public function testToDatabase() { $result = $this->type->toDatabase($value, $this->driver); $this->assertEquals($value, $result); - $date = new Carbon('2013-08-12'); + $date = new Time('2013-08-12'); $result = $this->type->toDatabase($date, $this->driver); $this->assertEquals('2013-08-12', $result); - $date = new Carbon('2013-08-12 15:16:18'); + $date = new Time('2013-08-12 15:16:18'); $result = $this->type->toDatabase($date, $this->driver); $this->assertEquals('2013-08-12', $result); } @@ -85,7 +85,7 @@ public function testToDatabase() { * @return array */ public function marshalProvider() { - $date = new Carbon('@1392387900'); + $date = new Time('@1392387900'); $date->setTime(0, 0, 0); return [ @@ -100,13 +100,13 @@ public function marshalProvider() { // valid string types ['1392387900', $date], [1392387900, $date], - ['2014-02-14', new Carbon('2014-02-14')], - ['2014-02-14 13:14:15', new Carbon('2014-02-14 00:00:00')], + ['2014-02-14', new Time('2014-02-14')], + ['2014-02-14 13:14:15', new Time('2014-02-14 00:00:00')], // valid array types [ ['year' => 2014, 'month' => 2, 'day' => 14, 'hour' => 13, 'minute' => 14, 'second' => 15], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], [ [ @@ -114,7 +114,7 @@ public function marshalProvider() { 'hour' => 1, 'minute' => 14, 'second' => 15, 'meridian' => 'am' ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], [ [ @@ -122,30 +122,30 @@ public function marshalProvider() { 'hour' => 1, 'minute' => 14, 'second' => 15, 'meridian' => 'pm' ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], [ [ 'year' => 2014, 'month' => 2, 'day' => 14, ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], // Invalid array types [ ['year' => 'farts', 'month' => 'derp'], - new Carbon(date('Y-m-d 00:00:00')) + new Time(date('Y-m-d 00:00:00')) ], [ ['year' => 'farts', 'month' => 'derp', 'day' => 'farts'], - new Carbon(date('Y-m-d 00:00:00')) + new Time(date('Y-m-d 00:00:00')) ], [ [ 'year' => '2014', 'month' => '02', 'day' => '14', 'hour' => 'farts', 'minute' => 'farts' ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], ]; } diff --git a/tests/TestCase/Database/Type/TimeTypeTest.php b/tests/TestCase/Database/Type/TimeTypeTest.php index fb377a42475..47582b84cb6 100644 --- a/tests/TestCase/Database/Type/TimeTypeTest.php +++ b/tests/TestCase/Database/Type/TimeTypeTest.php @@ -17,7 +17,7 @@ use Cake\Database\Type; use Cake\Database\Type\TimeType; use Cake\TestSuite\TestCase; -use Carbon\Carbon; +use Cake\Utility\Time; /** * Test for the Time type. @@ -70,11 +70,11 @@ public function testToDatabase() { $result = $this->type->toDatabase($value, $this->driver); $this->assertEquals($value, $result); - $date = new Carbon('16:30:15'); + $date = new Time('16:30:15'); $result = $this->type->toDatabase($date, $this->driver); $this->assertEquals('16:30:15', $result); - $date = new Carbon('2013-08-12 15:16:18'); + $date = new Time('2013-08-12 15:16:18'); $result = $this->type->toDatabase($date, $this->driver); $this->assertEquals('15:16:18', $result); } @@ -85,7 +85,7 @@ public function testToDatabase() { * @return array */ public function marshalProvider() { - $date = new Carbon('@1392387900'); + $date = new Time('@1392387900'); return [ // invalid types. @@ -99,13 +99,13 @@ public function marshalProvider() { // valid string types ['1392387900', $date], [1392387900, $date], - ['13:10:10', new Carbon('13:10:10')], - ['2014-02-14 13:14:15', new Carbon('2014-02-14 13:14:15')], + ['13:10:10', new Time('13:10:10')], + ['2014-02-14 13:14:15', new Time('2014-02-14 13:14:15')], // valid array types [ ['year' => 2014, 'month' => 2, 'day' => 14, 'hour' => 13, 'minute' => 14, 'second' => 15], - new Carbon('2014-02-14 13:14:15') + new Time('2014-02-14 13:14:15') ], [ [ @@ -113,7 +113,7 @@ public function marshalProvider() { 'hour' => 1, 'minute' => 14, 'second' => 15, 'meridian' => 'am' ], - new Carbon('2014-02-14 01:14:15') + new Time('2014-02-14 01:14:15') ], [ [ @@ -121,26 +121,26 @@ public function marshalProvider() { 'hour' => 1, 'minute' => 14, 'second' => 15, 'meridian' => 'pm' ], - new Carbon('2014-02-14 13:14:15') + new Time('2014-02-14 13:14:15') ], [ [ 'hour' => 1, 'minute' => 14, 'second' => 15, ], - new Carbon('01:14:15') + new Time('01:14:15') ], // Invalid array types [ ['hour' => 'nope', 'minute' => 14, 'second' => 15], - new Carbon(date('Y-m-d 00:14:15')) + new Time(date('Y-m-d 00:14:15')) ], [ [ 'year' => '2014', 'month' => '02', 'day' => '14', 'hour' => 'nope', 'minute' => 'nope' ], - new Carbon('2014-02-14 00:00:00') + new Time('2014-02-14 00:00:00') ], ]; }