Baked tables use App\Model\Entity\EntityName;

src/Shell/Task/ModelTask.php

@@ -684,11 +684,13 @@ public function bakeTable($model, array $data = [])
         }
 
         $name = $model->alias();
+        $entity = $this->_entityName($model->alias());
         $data += [
             'plugin' => $this->plugin,
             'pluginPath' => $pluginPath,
             'namespace' => $ns,
             'name' => $name,
+            'entity' => $entity,
             'associations' => [],
             'primaryKey' => 'id',
             'displayField' => null,

src/Template/Bake/Model/table.ctp

@@ -17,10 +17,18 @@ use Cake\Utility\Inflector;
 <?php
 namespace <%= $namespace %>\Model\Table;
 
-use Cake\ORM\Query;
-use Cake\ORM\RulesChecker;
-use Cake\ORM\Table;
-use Cake\Validation\Validator;
+<%
+$uses = [
+    "use $namespace\\Model\\Entity\\$entity;",
+    'use Cake\ORM\Query;',
+    'use Cake\ORM\RulesChecker;',
+    'use Cake\ORM\Table;',
+    'use Cake\Validation\Validator;'
+];
+sort($uses);
+echo implode("\n", $uses);
+%>
+
 
 /**
  * <%= $name %> Model

tests/comparisons/Model/testBakeTableConfig.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\BakeArticle;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;

tests/comparisons/Model/testBakeTableRelations.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\BakeArticle;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;

tests/comparisons/Model/testBakeTableValidation.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\BakeArticle;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;

tests/comparisons/Model/testBakeTableWithPlugin.php

@@ -5,6 +5,7 @@
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
+use ModelTest\Model\Entity\BakeArticle;
 
 /**
  * BakeArticles Model

tests/comparisons/Model/testBakeWithRules.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Model\Table;
 
+use App\Model\Entity\User;
 use Cake\ORM\Query;
 use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;