Merge remote-tracking branch 'origin/master' into cake4

dereuromark · Dec 30, 2019 · 551e48f · 551e48f
2 parents 4a82ff6 + ef5ba4c
commit 551e48f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -46,6 +46,12 @@
 ]);
 Cake\Core\Configure::write('debug', true);
 
+class_alias(TestApp\Controller\AppController::class, 'App\Controller\AppController');
+class_alias(Cake\View\View::class, 'App\View\AppView');
+
+class_alias(TestApp\Model\Table\UsersTable::class, 'App\Model\Table\UsersTable');
+class_alias(TestApp\Model\Entity\User::class, 'App\Model\Entity\User');
+
 mb_internal_encoding('UTF-8');
 
 class_alias(TestApp\Application::class, 'App\Application');

diff --git a/tests/test_app/src/Controller/AppController.php b/tests/test_app/src/Controller/AppController.php
@@ -2,7 +2,7 @@
 
 namespace TestApp\Controller;
 
-use Tools\Controller\Controller;
+use Cake\Controller\Controller;
 
 class AppController extends Controller {
 }