Using Time instead of Carbon in the rest of the tests

tests/TestCase/Controller/Component/Auth/BasicAuthenticateTest.php

@@ -23,7 +23,7 @@ use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Security;
-use Carbon\Carbon;
+use Cake\Utility\Time;
 
 /**
  * Test case for BasicAuthentication
@@ -173,8 +173,8 @@ class BasicAuthenticateTest extends TestCase {
 		$expected = array(
 			'id' => 1,
 			'username' => 'mariano',
-			'created' => new Carbon('2007-03-17 01:16:23'),
-			'updated' => new Carbon('2007-03-17 01:18:31')
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
 		);
 		$this->assertEquals($expected, $result);
 	}
@@ -230,8 +230,8 @@ class BasicAuthenticateTest extends TestCase {
 		$expected = array(
 			'id' => 1,
 			'username' => 'mariano',
-			'created' => new Carbon('2007-03-17 01:16:23'),
-			'updated' => new Carbon('2007-03-17 01:18:31')
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
 		);
 		$this->assertEquals($expected, $result);
 	}

tests/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php

@@ -22,7 +22,7 @@ use Cake\Network\Request;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Carbon\Carbon;
+use Cake\Utility\Time;
 
 /**
  * Test case for DigestAuthentication
@@ -169,8 +169,8 @@ DIGEST;
 		$expected = array(
 			'id' => 1,
 			'username' => 'mariano',
-			'created' => new Carbon('2007-03-17 01:16:23'),
-			'updated' => new Carbon('2007-03-17 01:18:31')
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
 		);
 		$this->assertEquals($expected, $result);
 	}

tests/TestCase/Controller/Component/Auth/FormAuthenticateTest.php

@@ -26,7 +26,7 @@ use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Security;
-use Carbon\Carbon;
+use Cake\Utility\Time;
 
 /**
  * Test case for FormAuthentication
@@ -200,8 +200,8 @@ class FormAuthenticateTest extends TestCase {
 		$expected = [
 			'id' => 1,
 			'username' => 'mariano',
-			'created' => new Carbon('2007-03-17 01:16:23'),
-			'updated' => new Carbon('2007-03-17 01:18:31')
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
 		];
 		$this->assertEquals($expected, $result);
 	}
@@ -249,8 +249,8 @@ class FormAuthenticateTest extends TestCase {
 		$expected = [
 			'id' => 1,
 			'username' => 'gwoo',
-			'created' => new Carbon('2007-03-17 01:16:23'),
-			'updated' => new Carbon('2007-03-17 01:18:31')
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
 		];
 		$this->assertEquals($expected, $result);
 		Plugin::unload();
@@ -288,8 +288,8 @@ class FormAuthenticateTest extends TestCase {
 		$expected = [
 			'id' => 1,
 			'username' => 'mariano',
-			'created' => new Carbon('2007-03-17 01:16:23'),
-			'updated' => new Carbon('2007-03-17 01:18:31')
+			'created' => new Time('2007-03-17 01:16:23'),
+			'updated' => new Time('2007-03-17 01:18:31')
 		];
 		$this->assertEquals($expected, $result);
 

tests/TestCase/ORM/MarshallerTest.php

@@ -19,7 +19,7 @@ use Cake\ORM\Marshaller;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Carbon\Carbon;
+use Cake\Utility\Time;
 
 /**
  * Test entity for mass assignment.
@@ -131,7 +131,7 @@ class MarshallerTest extends TestCase {
 		$marshall = new Marshaller($this->comments);
 		$result = $marshall->one($data, []);
 
-		$this->assertEquals(new Carbon('2014-02-14 00:00:00'), $result->created);
+		$this->assertEquals(new Time('2014-02-14 00:00:00'), $result->created);
 
 		$data['created'] = [
 			'year' => '2014',
@@ -142,7 +142,7 @@ class MarshallerTest extends TestCase {
 			'meridian' => 'pm'
 		];
 		$result = $marshall->one($data, []);
-		$this->assertEquals(new Carbon('2014-02-14 21:25:00'), $result->created);
+		$this->assertEquals(new Time('2014-02-14 21:25:00'), $result->created);
 
 		$data['created'] = [
 			'year' => '2014',
@@ -152,11 +152,11 @@ class MarshallerTest extends TestCase {
 			'minute' => 25,
 		];
 		$result = $marshall->one($data, []);
-		$this->assertEquals(new Carbon('2014-02-14 09:25:00'), $result->created);
+		$this->assertEquals(new Time('2014-02-14 09:25:00'), $result->created);
 
 		$data['created'] = '2014-02-14 09:25:00';
 		$result = $marshall->one($data, []);
-		$this->assertEquals(new Carbon('2014-02-14 09:25:00'), $result->created);
+		$this->assertEquals(new Time('2014-02-14 09:25:00'), $result->created);
 
 		$data['created'] = 1392387900;
 		$result = $marshall->one($data, []);

tests/TestCase/ORM/QueryRegressionTest.php

@@ -18,7 +18,7 @@ use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Carbon\Carbon;
+use Cake\Utility\Time;
 
 /**
  * Contains regression test for the Query builder
@@ -52,8 +52,8 @@ class QueryRegressionTest extends TestCase {
 	public function testSelectTimestampColumn() {
 		$table = TableRegistry::get('users');
 		$user = $table->find()->where(['id' => 1])->first();
-		$this->assertEquals(new Carbon('2007-03-17 01:16:23'), $user->created);
-		$this->assertEquals(new Carbon('2007-03-17 01:18:31'), $user->updated);
+		$this->assertEquals(new Time('2007-03-17 01:16:23'), $user->created);
+		$this->assertEquals(new Time('2007-03-17 01:18:31'), $user->updated);
 	}
 
 /**

tests/TestCase/ORM/TableTest.php

@@ -22,7 +22,7 @@ use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\Validation\Validator;
-use Carbon\Carbon;
+use Cake\Utility\Time;
 
 /**
  * Used to test correct class is instantiated when using TableRegistry::get();
@@ -285,15 +285,15 @@ class TableTest extends \Cake\TestSuite\TestCase {
 				'id' => 1,
 				'username' => 'mariano',
 				'password' => '$2a$10$u05j8FjsvLBNdfhBhc21LOuVMpzpabVXQ9OpC2wO3pSO0q6t7HHMO',
-				'created' => new Carbon('2007-03-17 01:16:23'),
-				'updated' => new Carbon('2007-03-17 01:18:31'),
+				'created' => new Time('2007-03-17 01:16:23'),
+				'updated' => new Time('2007-03-17 01:18:31'),
 			],
 			[
 				'id' => 2,
 				'username' => 'nate',
 				'password' => '$2a$10$u05j8FjsvLBNdfhBhc21LOuVMpzpabVXQ9OpC2wO3pSO0q6t7HHMO',
-				'created' => new Carbon('2008-03-17 01:18:23'),
-				'updated' => new Carbon('2008-03-17 01:20:31'),
+				'created' => new Time('2008-03-17 01:18:23'),
+				'updated' => new Time('2008-03-17 01:20:31'),
 			],
 		];
 		$this->assertEquals($expected, $results);
@@ -348,7 +348,7 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		]);
 		$query = $table->find('all')
 			->select(['id', 'username'])
-			->where(['created >=' => new Carbon('2010-01-22 00:00')])
+			->where(['created >=' => new Time('2010-01-22 00:00')])
 			->hydrate(false)
 			->order('id');
 		$expected = [
@@ -357,7 +357,7 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		];
 		$this->assertSame($expected, $query->toArray());
 
-		$query->orWhere(['users.created' => new Carbon('2008-03-17 01:18:23')]);
+		$query->orWhere(['users.created' => new Time('2008-03-17 01:18:23')]);
 		$expected = [
 			['id' => 2, 'username' => 'nate'],
 			['id' => 3, 'username' => 'larry'],
@@ -1118,8 +1118,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$entity = new \Cake\ORM\Entity([
 			'username' => 'superuser',
 			'password' => 'root',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$table = TableRegistry::get('users');
 		$this->assertSame($entity, $table->save($entity));
@@ -1153,8 +1153,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 			'username' => 'superuser',
 			'password' => 'root',
 			'crazyness' => 'super crazy value',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00'),
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00'),
 		]);
 		$table = TableRegistry::get('users');
 		$this->assertSame($entity, $table->save($entity));
@@ -1175,8 +1175,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$table = TableRegistry::get('users');
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$listener = function($e, $entity, $options) use ($data) {
 			$this->assertSame($data, $entity);
@@ -1200,8 +1200,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
 			'password' => 'foo',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$listener1 = function($e, $entity, $options) {
 			$options['crazy'] = true;
@@ -1229,8 +1229,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$table = TableRegistry::get('users');
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$listener = function($e, $entity) {
 			$e->stopPropagation();
@@ -1253,8 +1253,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$table = TableRegistry::get('users');
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 
 		$called = false;
@@ -1288,8 +1288,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$statement = $this->getMock('\Cake\Database\Statement\StatementDecorator');
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 
 		$table->expects($this->once())->method('exists')
@@ -1336,8 +1336,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$connection->expects($this->once())->method('commit');
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$this->assertSame($data, $table->save($data));
 	}
@@ -1383,8 +1383,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$table->save($data);
 	}
@@ -1434,8 +1434,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 
 		$data = new \Cake\ORM\Entity([
 			'username' => 'superuser',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$table->save($data);
 	}
@@ -1451,8 +1451,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$entity = new \Cake\ORM\Entity([
 			'username' => 'superuser',
 			'password' => 'root',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$entity->clean();
 		$entity->dirty('username', true);
@@ -1478,8 +1478,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$entity = new \Cake\ORM\Entity([
 			'username' => 'superuser',
 			'password' => 'root',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$table = TableRegistry::get('users');
 		$this->assertSame($entity, $table->save($entity));
@@ -1499,8 +1499,8 @@ class TableTest extends \Cake\TestSuite\TestCase {
 		$entity = new \Cake\ORM\Entity([
 			'username' => 'superuser',
 			'password' => 'root',
-			'created' => new Carbon('2013-10-10 00:00'),
-			'updated' => new Carbon('2013-10-10 00:00')
+			'created' => new Time('2013-10-10 00:00'),
+			'updated' => new Time('2013-10-10 00:00')
 		]);
 		$table = TableRegistry::get('users');
 		$this->assertSame($entity, $table->save($entity));