Remove inline FQCN into use statements.

tests/TestCase/Controller/Component/PaginatorComponentTest.php

@@ -21,6 +21,7 @@ use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Cake\Network\Exception\NotFoundException;
 use Cake\Network\Request;
+use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
@@ -930,7 +931,7 @@ class PaginatorComponentTest extends TestCase
 
         $table = TableRegistry::get('PaginatorPosts');
         $data = ['author_id' => 3, 'title' => 'Fourth Post', 'body' => 'Article Body, unpublished', 'published' => 'N'];
-        $result = $table->save(new \Cake\ORM\Entity($data));
+        $result = $table->save(new Entity($data));
         $this->assertNotEmpty($result);
 
         $result = $this->Paginator->paginate($table);
@@ -985,7 +986,7 @@ class PaginatorComponentTest extends TestCase
         $this->loadFixtures('Posts');
         $table = TableRegistry::get('PaginatorPosts');
         $data = ['author_id' => 3, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N'];
-        $table->save(new \Cake\ORM\Entity($data));
+        $table->save(new Entity($data));
 
         $settings = [
             'finder' => 'list',

tests/TestCase/Database/Driver/PostgresTest.php

@@ -14,6 +14,7 @@
  */
 namespace Cake\Test\TestCase\Database\Driver;
 
+use Cake\Database\Query;
 use Cake\TestSuite\TestCase;
 use \PDO;
 
@@ -155,7 +156,7 @@ class PostgresTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->insert(['id', 'title'])
             ->into('articles')
             ->values([1, 'foo']);
@@ -163,7 +164,7 @@ class PostgresTest extends TestCase
         $query = $translator($query);
         $this->assertEquals('RETURNING *', $query->clause('epilog'));
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->insert(['id', 'title'])
             ->into('articles')
             ->values([1, 'foo'])

tests/TestCase/Database/Driver/SqlserverTest.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Test\TestCase\Database\Driver;
 
-use Cake\Core\Configure;
+use Cake\Database\Query;
 use Cake\TestSuite\TestCase;
 use \PDO;
 
@@ -119,14 +119,14 @@ class SqlserverTest extends TestCase
             ->method('driver')
             ->will($this->returnValue($driver));
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->order(['id'])
             ->offset(10);
         $this->assertEquals('SELECT id, title FROM articles ORDER BY id OFFSET 10 ROWS', $query->sql());
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->order(['id'])
@@ -134,13 +134,13 @@ class SqlserverTest extends TestCase
             ->offset(50);
         $this->assertEquals('SELECT id, title FROM articles ORDER BY id OFFSET 50 ROWS FETCH FIRST 10 ROWS ONLY', $query->sql());
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->offset(10);
         $this->assertEquals('SELECT id, title FROM articles ORDER BY (SELECT NULL) OFFSET 10 ROWS', $query->sql());
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->limit(10);
@@ -172,14 +172,14 @@ class SqlserverTest extends TestCase
             ->method('driver')
             ->will($this->returnValue($driver));
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->limit(10);
         $expected = 'SELECT TOP 10 id, title FROM articles';
         $this->assertEquals($expected, $query->sql());
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->offset(10);
@@ -188,7 +188,7 @@ class SqlserverTest extends TestCase
             'WHERE _cake_paging_._cake_page_rownum_ > 10';
         $this->assertEquals($expected, $query->sql());
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->order(['id'])
@@ -198,7 +198,7 @@ class SqlserverTest extends TestCase
             'WHERE _cake_paging_._cake_page_rownum_ > 10';
         $this->assertEquals($expected, $query->sql());
 
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->select(['id', 'title'])
             ->from('articles')
             ->order(['id'])
@@ -230,7 +230,7 @@ class SqlserverTest extends TestCase
             ->expects($this->any())
             ->method('driver')
             ->will($this->returnValue($driver));
-        $query = new \Cake\Database\Query($connection);
+        $query = new Query($connection);
         $query->insert(['title'])
             ->into('articles')
             ->values(['title' => 'A new article']);

tests/TestCase/ORM/CompositeKeysTest.php

@@ -409,7 +409,7 @@ class CompositeKeyTest extends TestCase
      */
     public function testSaveNewEntity()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 5,
             'site_id' => 1,
             'title' => 'Fifth Article',
@@ -435,7 +435,7 @@ class CompositeKeyTest extends TestCase
      */
     public function testSaveNewEntityMissingKey()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 5,
             'title' => 'Fifth Article',
             'body' => 'Fifth Article Body',
@@ -453,7 +453,7 @@ class CompositeKeyTest extends TestCase
     public function testDelete()
     {
         $table = TableRegistry::get('SiteAuthors');
-        $table->save(new \Cake\ORM\Entity(['id' => 1, 'site_id' => 2]));
+        $table->save(new Entity(['id' => 1, 'site_id' => 2]));
         $entity = $table->get([1, 1]);
         $result = $table->delete($entity);
         $this->assertTrue($result);

tests/TestCase/ORM/QueryRegressionTest.php

@@ -15,6 +15,8 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Plugin;
+use Cake\Database\Expression\Comparison;
+use Cake\Database\Expression\QueryExpression;
 use Cake\I18n\Time;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
@@ -348,7 +350,7 @@ class QueryRegressionTest extends TestCase
         $this->loadFixtures('Articles');
         $articles = TableRegistry::get('Articles');
         $article = $articles->newEntity();
-        $article->title = new \Cake\Database\Expression\QueryExpression("SELECT 'jose'");
+        $article->title = new QueryExpression("SELECT 'jose'");
         $this->assertSame($article, $articles->save($article));
     }
 
@@ -701,8 +703,8 @@ class QueryRegressionTest extends TestCase
         $query = $table->find();
         $query->where([
             'OR' => [
-                new \Cake\Database\Expression\Comparison('id', 1, 'integer', '>'),
-                new \Cake\Database\Expression\Comparison('id', 3, 'integer', '<')
+                new Comparison('id', 1, 'integer', '>'),
+                new Comparison('id', 3, 'integer', '<')
             ]
         ]);
 

tests/TestCase/ORM/ResultSetTest.php

@@ -139,7 +139,7 @@ class ResultSetTest extends TestCase
 
         // Use a loop to test Iterator implementation
         foreach ($results as $i => $row) {
-            $expected = new \Cake\ORM\Entity($this->fixtureData[$i]);
+            $expected = new Entity($this->fixtureData[$i]);
             $expected->isNew(false);
             $expected->source($this->table->alias());
             $expected->clean();

tests/TestCase/ORM/RulesCheckerIntegrationTest.php

@@ -93,10 +93,10 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testSaveHasOneWithValidationError()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
-        $entity->article = new \Cake\ORM\Entity([
+        $entity->article = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
@@ -132,15 +132,15 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testSaveHasManyWithErrorsAtomic()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
         $entity->articles = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => '1',
                 'body' => 'A body'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => 'Another Title',
                 'body' => 'Another body'
             ])
@@ -181,15 +181,15 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testSaveHasManyWithErrorsNonAtomic()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
         $entity->articles = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => 'A title',
                 'body' => 'A body'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => '1',
                 'body' => 'Another body'
             ])
@@ -225,15 +225,15 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testSaveBelongsToManyWithValidationErrorInJointEntity()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
         $entity->tags = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => 'Something New'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => '100'
             ])
         ];
@@ -265,15 +265,15 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testSaveBelongsToManyWithValidationErrorInJointEntityNonAtomic()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
         $entity->tags = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => 'Something New'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => 'New one'
             ])
         ];
@@ -1302,15 +1302,15 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testAvoidExistsInOnAutomaticSaving()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
         $entity->articles = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => '1',
                 'body' => 'A body'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => 'Another Title',
                 'body' => 'Another body'
             ])
@@ -1365,15 +1365,15 @@ class RulesCheckerIntegrationTest extends TestCase
      */
     public function testCountOfAssociatedItems()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
         $entity->tags = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => 'Something New'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => '100'
             ])
         ];

tests/TestCase/ORM/TableTest.php

@@ -1709,7 +1709,7 @@ class TableTest extends TestCase
      */
     public function testSaveNewEntity()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'username' => 'superuser',
             'password' => 'root',
             'created' => new Time('2013-10-10 00:00'),
@@ -1731,7 +1731,7 @@ class TableTest extends TestCase
      */
     public function testSaveNewEmptyEntity()
     {
-        $entity = new \Cake\ORM\Entity();
+        $entity = new Entity();
         $table = TableRegistry::get('users');
         $this->assertFalse($table->save($entity));
     }
@@ -2102,7 +2102,7 @@ class TableTest extends TestCase
      */
     public function testSaveEntityOnlySchemaFields()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'username' => 'superuser',
             'password' => 'root',
             'crazyness' => 'super crazy value',
@@ -2127,7 +2127,7 @@ class TableTest extends TestCase
     public function testBeforeSaveModifyData()
     {
         $table = TableRegistry::get('users');
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2152,7 +2152,7 @@ class TableTest extends TestCase
     public function testBeforeSaveModifyOptions()
     {
         $table = TableRegistry::get('users');
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'password' => 'foo',
             'created' => new Time('2013-10-10 00:00'),
@@ -2183,7 +2183,7 @@ class TableTest extends TestCase
     public function testBeforeSaveStopEvent()
     {
         $table = TableRegistry::get('users');
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2243,7 +2243,7 @@ class TableTest extends TestCase
     public function testAfterSaveCommitForNonAtomic()
     {
         $table = TableRegistry::get('users');
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2276,7 +2276,7 @@ class TableTest extends TestCase
     public function testAfterSaveCommitWithTransactionRunning()
     {
         $table = TableRegistry::get('users');
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2302,7 +2302,7 @@ class TableTest extends TestCase
     public function testAfterSaveCommitWithNonAtomicAndTransactionRunning()
     {
         $table = TableRegistry::get('users');
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2337,7 +2337,7 @@ class TableTest extends TestCase
             ->setConstructorArgs([null, $table])
             ->getMock();
         $statement = $this->getMockBuilder('\Cake\Database\Statement\StatementDecorator')->getMock();
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2377,11 +2377,11 @@ class TableTest extends TestCase
      */
     public function testAfterSaveCommitTriggeredOnlyForPrimaryTable()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
-        $entity->author = new \Cake\ORM\Entity([
+        $entity->author = new Entity([
             'name' => 'Jose'
         ]);
 
@@ -2417,7 +2417,7 @@ class TableTest extends TestCase
      */
     public function testSaveNewErrorOnNoPrimaryKey()
     {
-        $entity = new \Cake\ORM\Entity(['username' => 'superuser']);
+        $entity = new Entity(['username' => 'superuser']);
         $table = TableRegistry::get('users', [
             'schema' => [
                 'id' => ['type' => 'integer'],
@@ -2453,7 +2453,7 @@ class TableTest extends TestCase
         $connection->expects($this->once())->method('begin');
         $connection->expects($this->once())->method('commit');
         $connection->expects($this->any())->method('inTransaction')->will($this->returnValue(true));
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2494,7 +2494,7 @@ class TableTest extends TestCase
         $query->expects($this->once())->method('execute')
             ->will($this->throwException(new \PDOException));
 
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2540,7 +2540,7 @@ class TableTest extends TestCase
             ->method('execute')
             ->will($this->returnValue($statement));
 
-        $data = new \Cake\ORM\Entity([
+        $data = new Entity([
             'username' => 'superuser',
             'created' => new Time('2013-10-10 00:00'),
             'updated' => new Time('2013-10-10 00:00')
@@ -2558,7 +2558,7 @@ class TableTest extends TestCase
      */
     public function testSaveOnlyDirtyProperties()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'username' => 'superuser',
             'password' => 'root',
             'created' => new Time('2013-10-10 00:00'),
@@ -2586,7 +2586,7 @@ class TableTest extends TestCase
      */
     public function testASavedEntityIsClean()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'username' => 'superuser',
             'password' => 'root',
             'created' => new Time('2013-10-10 00:00'),
@@ -2608,7 +2608,7 @@ class TableTest extends TestCase
      */
     public function testASavedEntityIsNotNew()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'username' => 'superuser',
             'password' => 'root',
             'created' => new Time('2013-10-10 00:00'),
@@ -2628,7 +2628,7 @@ class TableTest extends TestCase
      */
     public function testSaveUpdateAuto()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 2,
             'username' => 'baggins'
         ]);
@@ -2653,7 +2653,7 @@ class TableTest extends TestCase
      */
     public function testBeforeSaveGetsCorrectPersistance()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 2,
             'username' => 'baggins'
         ]);
@@ -2681,7 +2681,7 @@ class TableTest extends TestCase
             ->setMethods(['exists'])
             ->setConstructorArgs([['table' => 'users', 'connection' => ConnectionManager::get('test')]])
             ->getMock();
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 2,
             'username' => 'baggins'
         ], ['markNew' => false]);
@@ -2725,7 +2725,7 @@ class TableTest extends TestCase
             ->with(['username' => 'baggins'])
             ->will($this->returnValue($query));
 
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 2,
             'username' => 'baggins'
         ], ['markNew' => false]);
@@ -2746,7 +2746,7 @@ class TableTest extends TestCase
             ->setConstructorArgs([['table' => 'users', 'connection' => $this->connection]])
             ->getMock();
         $table->expects($this->never())->method('query');
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'id' => 2,
         ], ['markNew' => false]);
         $this->assertSame($entity, $table->save($entity));
@@ -2784,7 +2784,7 @@ class TableTest extends TestCase
             ->setConstructorArgs([['table' => 'users', 'connection' => $this->connection]])
             ->getMock();
         $table->expects($this->never())->method('query');
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'username' => 'mariano',
         ], ['markNew' => false]);
         $this->assertSame($entity, $table->save($entity));
@@ -3031,7 +3031,7 @@ class TableTest extends TestCase
      */
     public function testDeleteCallbacks()
     {
-        $entity = new \Cake\ORM\Entity(['id' => 1, 'name' => 'mark']);
+        $entity = new Entity(['id' => 1, 'name' => 'mark']);
         $options = new \ArrayObject(['atomic' => true, 'checkRules' => false, '_primary' => true]);
 
         $mock = $this->getMockBuilder('Cake\Event\EventManager')->getMock();
@@ -3146,7 +3146,7 @@ class TableTest extends TestCase
      */
     public function testDeleteBeforeDeleteAbort()
     {
-        $entity = new \Cake\ORM\Entity(['id' => 1, 'name' => 'mark']);
+        $entity = new Entity(['id' => 1, 'name' => 'mark']);
         $options = new \ArrayObject(['atomic' => true, 'cascade' => true]);
 
         $mock = $this->getMockBuilder('Cake\Event\EventManager')->getMock();
@@ -3169,7 +3169,7 @@ class TableTest extends TestCase
      */
     public function testDeleteBeforeDeleteReturnResult()
     {
-        $entity = new \Cake\ORM\Entity(['id' => 1, 'name' => 'mark']);
+        $entity = new Entity(['id' => 1, 'name' => 'mark']);
         $options = new \ArrayObject(['atomic' => true, 'cascade' => true]);
 
         $mock = $this->getMockBuilder('Cake\Event\EventManager')->getMock();
@@ -3193,7 +3193,7 @@ class TableTest extends TestCase
      */
     public function testDeleteIsNew()
     {
-        $entity = new \Cake\ORM\Entity(['id' => 1, 'name' => 'mark']);
+        $entity = new Entity(['id' => 1, 'name' => 'mark']);
 
         $table = $this->getMockBuilder('Cake\ORM\Table')
             ->setMethods(['query'])
@@ -3495,11 +3495,11 @@ class TableTest extends TestCase
      */
     public function testSaveBelongsTo()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
-        $entity->author = new \Cake\ORM\Entity([
+        $entity->author = new Entity([
             'name' => 'Jose'
         ]);
 
@@ -3520,10 +3520,10 @@ class TableTest extends TestCase
      */
     public function testSaveHasOne()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
-        $entity->article = new \Cake\ORM\Entity([
+        $entity->article = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
@@ -3547,7 +3547,7 @@ class TableTest extends TestCase
      */
     public function testSaveOnlySaveAssociatedEntities()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
 
@@ -3572,15 +3572,15 @@ class TableTest extends TestCase
      */
     public function testSaveHasMany()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'name' => 'Jose'
         ]);
         $entity->articles = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => 'A Title',
                 'body' => 'A body'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'title' => 'Another Title',
                 'body' => 'Another body'
             ])
@@ -3634,15 +3634,15 @@ class TableTest extends TestCase
      */
     public function testSaveBelongsToMany()
     {
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'A Title',
             'body' => 'A body'
         ]);
         $entity->tags = [
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => 'Something New'
             ]),
-            new \Cake\ORM\Entity([
+            new Entity([
                 'name' => 'Another Something'
             ])
         ];
@@ -3824,7 +3824,7 @@ class TableTest extends TestCase
         $entity = $table->get(1, ['contain' => 'tags']);
         $this->assertCount(2, $entity->tags, 'Fixture data did not change.');
 
-        $tag = new \Cake\ORM\Entity([
+        $tag = new Entity([
             'id' => 2,
         ]);
         $entity->tags = [$tag];
@@ -3918,7 +3918,7 @@ class TableTest extends TestCase
         $table = $this->getMockBuilder('\Cake\ORM\Table')
             ->setMethods(['_processSave'])
             ->getMock();
-        $entity = new \Cake\ORM\Entity(
+        $entity = new Entity(
             ['id' => 'foo'],
             ['markNew' => false, 'markClean' => true]
         );
@@ -3984,13 +3984,13 @@ class TableTest extends TestCase
         $authors->hasOne('supervisors', ['targetTable' => $supervisors]);
         $supervisors->belongsToMany('tags', ['targetTable' => $tags]);
 
-        $entity = new \Cake\ORM\Entity([
+        $entity = new Entity([
             'title' => 'bar',
-            'author' => new \Cake\ORM\Entity([
+            'author' => new Entity([
                 'name' => 'Juan',
-                'supervisor' => new \Cake\ORM\Entity(['name' => 'Marc']),
+                'supervisor' => new Entity(['name' => 'Marc']),
                 'tags' => [
-                    new \Cake\ORM\Entity(['name' => 'foo'])
+                    new Entity(['name' => 'foo'])
                 ]
             ]),
         ]);
@@ -4040,7 +4040,7 @@ class TableTest extends TestCase
         $source = ['source' => 'tags'];
         $options = ['markNew' => false];
 
-        $article = new \Cake\ORM\Entity([
+        $article = new Entity([
             'id' => 1,
         ], $options);
 
@@ -4596,7 +4596,7 @@ class TableTest extends TestCase
         $tagsTable = TableRegistry::get('tags');
         $options = ['markNew' => false];
 
-        $article = new \Cake\ORM\Entity(['id' => 1], $options);
+        $article = new Entity(['id' => 1], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['id' => 1], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['id' => 2], $options);
 
@@ -4618,11 +4618,11 @@ class TableTest extends TestCase
         $tagsTable = TableRegistry::get('tags');
         $options = ['markNew' => false];
 
-        $article = new \Cake\ORM\Entity(['id' => 1], $options);
+        $article = new Entity(['id' => 1], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['id' => 1], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['id' => 2], $options);
 
-        $tags[1]->_joinData = new \Cake\ORM\Entity([
+        $tags[1]->_joinData = new Entity([
             'article_id' => 1,
             'tag_id' => 2
         ], $options);
@@ -4644,7 +4644,7 @@ class TableTest extends TestCase
         $tagsTable = TableRegistry::get('tags');
         $options = ['markNew' => false];
 
-        $article = new \Cake\ORM\Entity(['id' => 1], $options);
+        $article = new Entity(['id' => 1], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['id' => 2], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['id' => 3], $options);
         $tags[] = new \TestApp\Model\Entity\Tag(['name' => 'foo']);
@@ -4674,7 +4674,7 @@ class TableTest extends TestCase
         $tagsTable = TableRegistry::get('tags');
         $options = ['markNew' => false];
 
-        $article = new \Cake\ORM\Entity(['id' => 1], $options);
+        $article = new Entity(['id' => 1], $options);
         $tags = [];
 
         $table->association('tags')->replaceLinks($article, $tags);
@@ -4696,10 +4696,10 @@ class TableTest extends TestCase
         $tagsTable = TableRegistry::get('tags');
         $options = ['markNew' => false];
 
-        $article = new \Cake\ORM\Entity(['id' => 1], $options);
+        $article = new Entity(['id' => 1], $options);
         $tags[] = new \TestApp\Model\Entity\Tag([
             'id' => 2,
-            '_joinData' => new \Cake\ORM\Entity([
+            '_joinData' => new Entity([
                 'article_id' => 1,
                 'tag_id' => 2,
             ])
@@ -5138,7 +5138,7 @@ class TableTest extends TestCase
             ]])
             ->getMock();
 
-        $query = (new \Cake\ORM\Query($this->connection, $table))->select();
+        $query = (new Query($this->connection, $table))->select();
         $table->expects($this->once())->method('callFinder')
             ->with('all', $query, []);
         $table->find();
@@ -5179,7 +5179,7 @@ class TableTest extends TestCase
             ->setConstructorArgs([$this->connection, $table])
             ->getMock();
 
-        $entity = new \Cake\ORM\Entity;
+        $entity = new Entity;
         $table->expects($this->once())->method('query')
             ->will($this->returnValue($query));
         $table->expects($this->once())->method('callFinder')
@@ -5229,7 +5229,7 @@ class TableTest extends TestCase
             ->setConstructorArgs([$this->connection, $table])
             ->getMock();
 
-        $entity = new \Cake\ORM\Entity;
+        $entity = new Entity;
         $table->expects($this->once())->method('query')
             ->will($this->returnValue($query));
         $table->expects($this->once())->method('callFinder')
@@ -5289,7 +5289,7 @@ class TableTest extends TestCase
             ->setConstructorArgs([$this->connection, $table])
             ->getMock();
 
-        $entity = new \Cake\ORM\Entity;
+        $entity = new Entity;
         $table->expects($this->once())->method('query')
             ->will($this->returnValue($query));
         $table->expects($this->once())->method('callFinder')
@@ -5378,7 +5378,7 @@ class TableTest extends TestCase
         $table->expects($this->once())->method('marshaller')
             ->will($this->returnValue($marshaller));
 
-        $entity = new \Cake\ORM\Entity;
+        $entity = new Entity;
         $data = ['foo' => 'bar'];
         $marshaller->expects($this->once())
             ->method('merge')
@@ -5406,7 +5406,7 @@ class TableTest extends TestCase
         $table->expects($this->once())->method('marshaller')
             ->will($this->returnValue($marshaller));
 
-        $entities = [new \Cake\ORM\Entity];
+        $entities = [new Entity];
         $data = [['foo' => 'bar']];
         $marshaller->expects($this->once())
             ->method('mergeMany')

tests/TestCase/TestSuite/TestCaseTest.php

@@ -20,6 +20,7 @@ use Cake\Datasource\ConnectionManager;
 use Cake\Event\Event;
 use Cake\Event\EventList;
 use Cake\Event\EventManager;
+use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
@@ -437,7 +438,7 @@ class TestCaseTest extends TestCase
     {
         Configure::write('App.namespace', 'TestApp');
         $Posts = $this->getMockForModel('Posts');
-        $entity = new \Cake\ORM\Entity([]);
+        $entity = new Entity([]);
 
         $this->assertInstanceOf('TestApp\Model\Table\PostsTable', $Posts);
         $this->assertNull($Posts->save($entity));
@@ -497,7 +498,7 @@ class TestCaseTest extends TestCase
             ->method('save')
             ->will($this->returnValue(false));
 
-        $entity = new \Cake\ORM\Entity([]);
+        $entity = new Entity([]);
         $this->assertTrue($TestPluginComment->save($entity));
         $this->assertFalse($TestPluginComment->save($entity));
 
@@ -530,7 +531,7 @@ class TestCaseTest extends TestCase
             ->method('save')
             ->will($this->returnValue(false));
 
-        $entity = new \Cake\ORM\Entity([]);
+        $entity = new Entity([]);
         $this->assertTrue($Mock->save($entity));
         $this->assertFalse($Mock->save($entity));
     }

tests/TestCase/View/Form/EntityContextTest.php

@@ -171,7 +171,7 @@ class EntityContextTest extends TestCase
     public function testDefaultEntityError()
     {
         $context = new EntityContext($this->request, [
-            'entity' => new \Cake\ORM\Entity,
+            'entity' => new Entity,
         ]);
     }