Move tests to TestApp namespace.

composer.json

@@ -34,7 +34,7 @@
 			"Tools\\Test\\": "tests/",
 			"Cake\\Test\\": "vendor/cakephp/cakephp/tests/",
 			"Cake\\PHPStan\\": "vendor/cakephp/cakephp/tests/PHPStan/",
-			"App\\": "tests/test_app/"
+			"TestApp\\": "tests/test_app/"
 		}
 	},
 	"suggest": {

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -2,17 +2,17 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use App\Controller\CommonComponentTestController;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
+use TestApp\Controller\CommonComponentTestController;
 use Tools\Controller\Component\CommonComponent;
 use Tools\TestSuite\TestCase;
 
 class CommonComponentTest extends TestCase {
 
 	/**
-	 * @var \App\Controller\CommonComponentTestController
+	 * @var \TestApp\Controller\CommonComponentTestController
 	 */
 	protected $Controller;
 

tests/TestCase/Controller/Component/MobileComponentTest.php

@@ -2,11 +2,11 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use App\Controller\MobileComponentTestController;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
 use Detection\MobileDetect;
+use TestApp\Controller\MobileComponentTestController;
 use Tools\TestSuite\TestCase;
 
 /**
@@ -27,7 +27,7 @@ class MobileComponentTest extends TestCase {
 	protected $event;
 
 	/**
-	 * @var \App\Controller\MobileComponentTestController
+	 * @var \TestApp\Controller\MobileComponentTestController
 	 */
 	protected $Controller;
 

tests/TestCase/Controller/Component/RefererRedirectComponentTest.php

@@ -2,12 +2,12 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use App\Controller\RefererRedirectComponentTestController;
 use Cake\Controller\ComponentRegistry;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
+use TestApp\Controller\RefererRedirectComponentTestController;
 use Tools\Controller\Component\RefererRedirectComponent;
 use Tools\TestSuite\TestCase;
 
@@ -19,7 +19,7 @@ class RefererRedirectComponentTest extends TestCase {
 	protected $event;
 
 	/**
-	 * @var \App\Controller\RefererRedirectComponentTestController
+	 * @var \TestApp\Controller\RefererRedirectComponentTestController
 	 */
 	protected $Controller;
 

tests/TestCase/Controller/Component/UrlComponentTest.php

@@ -2,13 +2,13 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use App\Controller\UrlComponentTestController;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
 use Cake\Routing\RouteBuilder;
 use Cake\Routing\Router;
 use Cake\Routing\Route\DashedRoute;
+use TestApp\Controller\UrlComponentTestController;
 use Tools\TestSuite\TestCase;
 
 class UrlComponentTest extends TestCase {
@@ -19,7 +19,7 @@ class UrlComponentTest extends TestCase {
 	protected $event;
 
 	/**
-	 * @var \App\Controller\UrlComponentTestController
+	 * @var \TestApp\Controller\UrlComponentTestController
 	 */
 	protected $Controller;
 

tests/TestCase/Mailer/EmailTest.php

@@ -2,11 +2,11 @@
 
 namespace Tools\Test\TestCase\Mailer;
 
-use App\Mailer\TestEmail;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Log\Log;
 use Cake\Mailer\TransportFactory;
+use TestApp\Mailer\TestEmail;
 use Tools\Mailer\Email;
 use Tools\TestSuite\TestCase;
 
@@ -16,7 +16,7 @@ use Tools\TestSuite\TestCase;
 class EmailTest extends TestCase {
 
 	/**
-	 * @var \App\Mailer\TestEmail
+	 * @var \TestApp\Mailer\TestEmail
 	 */
 	protected $Email;
 

tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php

@@ -2,8 +2,8 @@
 
 namespace Tools\Test\TestCase\Model\Behavior;
 
-use App\Model\Entity\BitmaskedComment;
 use Cake\ORM\TableRegistry;
+use TestApp\Model\Entity\BitmaskedComment;
 use Tools\TestSuite\TestCase;
 
 class BitmaskedBehaviorTest extends TestCase {

tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

@@ -20,7 +20,7 @@ class PasswordableBehaviorTest extends TestCase {
 	];
 
 	/**
-	 * @var \App\Model\Table\ToolsUsersTable
+	 * @var \TestApp\Model\Table\ToolsUsersTable
 	 */
 	public $Users;
 

tests/TestCase/Model/Behavior/ResetBehaviorTest.php

@@ -3,27 +3,28 @@
 namespace Tools\Model\Behavior;
 
 use Cake\ORM\TableRegistry;
+use TestApp\Model\Table\ResetCommentsTable;
 use Tools\Model\Table\Table;
 use Tools\TestSuite\TestCase;
 
 class ResetBehaviorTest extends TestCase {
 
 	/**
-	 * @var \Tools\Model\Behavior\ResetBehavior
+	 * @var array
 	 */
-	public $ResetBehavior;
+	public $fixtures = [
+		'plugin.Tools.ResetComments',
+	];
 
 	/**
-	 * @var \Tools\Model\Table\Table
+	 * @var \Tools\Model\Behavior\ResetBehavior
 	 */
-	public $Table;
+	protected $ResetBehavior;
 
 	/**
-	 * @var array
+	 * @var \Tools\Model\Table\Table
 	 */
-	public $fixtures = [
-		'plugin.Tools.ResetComments',
-	];
+	protected $Table;
 
 	/**
 	 * @return void
@@ -141,7 +142,7 @@ class ResetBehaviorTest extends TestCase {
 	 */
 	public function testResetWithStaticCallback() {
 		$this->Table->removeBehavior('Reset');
-		$this->Table->addBehavior('Tools.Reset', ['callback' => 'App\Model\Table\ResetCommentsTable::customStaticCallback']);
+		$this->Table->addBehavior('Tools.Reset', ['callback' => ResetCommentsTable::class . '::customStaticCallback']);
 
 		$x = $this->Table->find('first', ['conditions' => ['id' => 6]]);
 		$this->assertEquals('Second Comment for Second Article', $x['comment']);
@@ -164,7 +165,7 @@ class ResetBehaviorTest extends TestCase {
 		$this->Table->addBehavior('Tools.Reset', [
 			'fields' => ['id'],
 			'updateFields' => ['comment'],
-			'callback' => 'App\Model\Table\ResetCommentsTable::fieldsCallback']);
+			'callback' => ResetCommentsTable::class . '::fieldsCallback']);
 
 		$x = $this->Table->find('first', ['conditions' => ['id' => 6]]);
 		$this->assertEquals('Second Comment for Second Article', $x['comment']);
@@ -187,7 +188,7 @@ class ResetBehaviorTest extends TestCase {
 		$this->Table->addBehavior('Tools.Reset', [
 			'fields' => ['id'],
 			'updateFields' => ['id'],
-			'callback' => 'App\Model\Table\ResetCommentsTable::fieldsCallbackAuto']);
+			'callback' => ResetCommentsTable::class . '::fieldsCallbackAuto']);
 
 		$x = $this->Table->find('first', ['conditions' => ['id' => 6]]);
 		$this->assertEquals('Second Comment for Second Article', $x['comment']);

tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -2,10 +2,10 @@
 
 namespace Tools\Test\TestCase\Model\Behavior;
 
-use App\Model\Entity\SluggedArticle;
 use Cake\Core\Configure;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
+use TestApp\Model\Entity\SluggedArticle;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Text;
 
@@ -647,7 +647,7 @@ class SluggedBehaviorTest extends TestCase {
 	 * Tests slug generation fails with invalid entity config.
 	 *
 	 * @expectedException \RuntimeException
-	 * @expectedExceptionMessage (SluggedBehavior::setup) model `SluggedArticles` is missing the field `specialNonExistent` (specified in the setup for entity `App\Model\Entity\SluggedArticle`.
+	 * @expectedExceptionMessage (SluggedBehavior::setup) model `SluggedArticles` is missing the field `specialNonExistent` (specified in the setup for entity `TestApp\Model\Entity\SluggedArticle`.
 	 *
 	 * @return void
 	 */

tests/TestCase/Utility/MimeTest.php

@@ -2,9 +2,9 @@
 
 namespace Tools\Test\TestCase\Utility;
 
-use App\Http\TestResponse;
-use App\Utility\TestMime;
 use Cake\Core\Plugin;
+use TestApp\Http\TestResponse;
+use TestApp\Utility\TestMime;
 use Tools\TestSuite\TestCase;
 
 class MimeTest extends TestCase {

tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -2,9 +2,9 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
-use App\View\Helper\TimelineHelper;
 use Cake\View\View;
 use DateTime;
+use TestApp\View\Helper\TimelineHelper;
 use Tools\TestSuite\TestCase;
 
 /**
@@ -13,7 +13,7 @@ use Tools\TestSuite\TestCase;
 class TimelineHelperTest extends TestCase {
 
 	/**
-	 * @var \App\View\Helper\TimelineHelper
+	 * @var \TestApp\View\Helper\TimelineHelper
 	 */
 	public $Timeline;
 

tests/bootstrap.php

@@ -31,7 +31,7 @@ require CORE_PATH . 'config/bootstrap.php';
 require ROOT . DS . 'config/bootstrap.php';
 
 Cake\Core\Configure::write('App', [
-		'namespace' => 'App',
+		'namespace' => 'TestApp',
 		'encoding' => 'UTF-8']);
 Cake\Core\Configure::write('debug', true);
 
@@ -98,3 +98,5 @@ Cake\Datasource\ConnectionManager::setConfig('test', [
 	'quoteIdentifiers' => true,
 	'cacheMetadata' => true,
 ]);
+
+class_alias(TestApp\Controller\AppController::class, 'App\Controller\AppController');

tests/test_app/Auth/ComplexPasswordHasher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Auth;
+namespace TestApp\Auth;
 
 use Cake\Auth\DefaultPasswordHasher;
 

tests/test_app/Controller/AppController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace TestApp\Controller;
 
 use Cake\Controller\Controller;
 

tests/test_app/Controller/CommonComponentTestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace TestApp\Controller;
 
 use Tools\Controller\Controller;
 

tests/test_app/Controller/Component/AppleComponent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Component;
+namespace TestApp\Controller\Component;
 
 use Cake\Event\Event;
 use Shim\Controller\Component\Component;

tests/test_app/Controller/Component/BananaComponent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Component;
+namespace TestApp\Controller\Component;
 
 use Cake\Event\Event;
 use Shim\Controller\Component\Component;

tests/test_app/Controller/Component/TestComponent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Component;
+namespace TestApp\Controller\Component;
 
 use Cake\Event\Event;
 use Shim\Controller\Component\Component;

tests/test_app/Controller/MobileComponentTestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace TestApp\Controller;
 
 use Tools\Controller\Controller;
 

tests/test_app/Controller/RefererRedirectComponentTestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace TestApp\Controller;
 
 use Tools\Controller\Controller;
 

tests/test_app/Controller/UrlComponentTestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace TestApp\Controller;
 
 use Tools\Controller\Controller;
 

tests/test_app/Http/TestResponse.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http;
+namespace TestApp\Http;
 
 use Cake\Http\Response;
 

tests/test_app/Mailer/TestEmail.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Mailer;
+namespace TestApp\Mailer;
 
 use Tools\Mailer\Email;
 

tests/test_app/Model/Entity/BitmaskedComment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Entity;
+namespace TestApp\Model\Entity;
 
 use Tools\Model\Entity\Entity;
 

tests/test_app/Model/Entity/SluggedArticle.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Entity;
+namespace TestApp\Model\Entity;
 
 use Cake\ORM\Entity;
 

tests/test_app/Model/Table/AuthorsTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Tools\Model\Table\Table;
 

tests/test_app/Model/Table/BitmaskedCommentsTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Tools\Model\Table\Table;
 

tests/test_app/Model/Table/DataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Cake\Database\Schema\TableSchema;
 use Tools\Model\Table\Table;

tests/test_app/Model/Table/JsonableCommentsTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Tools\Model\Table\Table;
 

tests/test_app/Model/Table/PostsTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Tools\Model\Table\Table;
 

tests/test_app/Model/Table/ResetCommentsTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Cake\ORM\Entity;
 use Tools\Model\Table\Table;

tests/test_app/Model/Table/RolesTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Tools\Model\Table\Table;
 

tests/test_app/Model/Table/ToolsUsersTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Table;
+namespace TestApp\Model\Table;
 
 use Tools\Model\Table\Table;
 

tests/test_app/Utility/TestMime.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Utility;
+namespace TestApp\Utility;
 
 use Tools\Utility\Mime;
 

tests/test_app/View/Helper/TimelineHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\View\Helper;
+namespace TestApp\View\Helper;
 
 use Tools\View\Helper\TimelineHelper as ToolsTimelineHelper;