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

# Conflicts:
#	.travis.yml
#	tests/TestCase/BootstrapTest.php
#	tests/TestCase/Controller/Component/CommonComponentTest.php
#	tests/TestCase/Controller/Component/MobileComponentTest.php
#	tests/TestCase/Mailer/EmailTest.php
#	tests/TestCase/Model/Behavior/BitmaskedBehaviorTest.php
#	tests/TestCase/Model/Behavior/SluggedBehaviorTest.php
#	tests/TestCase/Utility/TextTest.php
#	tests/bootstrap.php

.travis.yml

@@ -33,9 +33,6 @@ matrix:
     - php: 7.3
       env: CODECOVERAGE=1 DEFAULT=0
 
-  allow_failures:
-    - php: 7.4snapshot
-
 before_install:
   - phpenv config-rm xdebug.ini
 

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": {

src/View/Helper/TimeHelper.php

@@ -7,7 +7,6 @@ use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
 use Cake\View\Helper\TimeHelper as CakeTimeHelper;
 use Cake\View\View;
-use DateTime;
 
 /**
  * Wrapper for TimeHelper and TimeLib
@@ -143,20 +142,17 @@ class TimeHelper extends CakeTimeHelper {
 	 * Returns red/specialGreen/green date depending on the current day
 	 * // TODO refactor! $userOffset is deprecated!
 	 *
-	 * @param \DateTime $date Date
+	 * @param \DateTimeInterface $date Date
 	 * @param array $options
 	 * @param array $attr HTML attributes
 	 * @return string Nicely formatted date
 	 */
-	public function published(DateTime $date, array $options = [], array $attr = []) {
-		$niceDate = '';
+	public function published($date, array $options = [], array $attr = []) {
 		$when = null;
-		$span = '';
-		$spanEnd = '';
 		$whenArray = ['-1' => 'already', '0' => 'today', '1' => 'notyet'];
 		$titles = ['-1' => __d('tools', 'publishedAlready'), '0' => __d('tools', 'publishedToday'), '1' => __d('tools', 'publishedNotYet')];
 
-		$y = $this->isThisYear($date) ? '' : ' Y';
+		//$y = $this->isThisYear($date) ? '' : ' Y';
 
 		$format = (!empty($options['format']) ? $options['format'] : FORMAT_NICE_YMD);
 

tests/TestCase/BootstrapTest.php

@@ -5,9 +5,6 @@ namespace Tools\Test\TestCase;
 use DateTime;
 use Tools\TestSuite\TestCase;
 
-/**
- * RssViewTest
- */
 class BootstrapTest extends TestCase {
 
 	/**
@@ -151,6 +148,10 @@ class BootstrapTest extends TestCase {
 		$result = returns([]);
 		$expected = '(array)';
 		$this->assertTextContains($expected, $result);
+
+		$foo = 1;
+		$is = returns($foo);
+		$this->assertSame('(int)1', $is);
 	}
 
 	/**

tests/TestCase/Controller/Component/CommonComponentTest.php

@@ -2,18 +2,18 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use App\Controller\CommonComponentTestController;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
 use Cake\Routing\Router;
+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,12 +2,12 @@
 
 namespace Tools\Test\TestCase\Controller\Component;
 
-use App\Controller\MobileComponentTestController;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\Http\ServerRequest;
 use Cake\Routing\Router;
 use Detection\MobileDetect;
+use TestApp\Controller\MobileComponentTestController;
 use Tools\TestSuite\TestCase;
 
 /**
@@ -28,7 +28,7 @@ class MobileComponentTest extends TestCase {
 	protected $event;
 
 	/**
-	 * @var \App\Controller\MobileComponentTestController
+	 * @var \TestApp\Controller\MobileComponentTestController
 	 */
 	protected $Controller;
 
@@ -97,7 +97,7 @@ class MobileComponentTest extends TestCase {
 	 */
 	public function testMobileForceActivated() {
 		$request = $this->Controller->getRequest()
-			->withAttribute('params', ['controller' => 'MyController'])
+			->withAttribute('params', ['controller' => 'MyController', 'action' => 'myAction'])
 			->withQueryParams(['mobile' => 1]);
 		$this->Controller->setRequest($request);
 
@@ -110,7 +110,7 @@ class MobileComponentTest extends TestCase {
 
 		$configure = Configure::read('User');
 		$this->assertSame(['isMobile' => 0, 'setMobile' => 1], $configure);
-		$this->assertEquals(['desktopUrl' => '/my-controller?mobile=0'], $this->Controller->viewBuilder()->getVars());
+		$this->assertEquals(['desktopUrl' => '/my-controller/my-action?mobile=0'], $this->Controller->viewBuilder()->getVars());
 	}
 
 	/**
@@ -118,7 +118,7 @@ class MobileComponentTest extends TestCase {
 	 */
 	public function testMobileForceDeactivated() {
 		$request = $this->Controller->getRequest()
-			->withAttribute('params', ['controller' => 'MyController'])
+			->withAttribute('params', ['controller' => 'MyController', 'action' => 'myAction'])
 			->withQueryParams(['mobile' => 0]);
 		$this->Controller->setRequest($request);
 
@@ -129,7 +129,7 @@ class MobileComponentTest extends TestCase {
 		$this->Controller->Mobile->setMobile();
 		$configure = Configure::read('User');
 		$this->assertSame(['isMobile' => 0, 'setMobile' => 0], $configure);
-		$this->assertEquals(['mobileUrl' => '/my-controller?mobile=1'], $this->Controller->viewBuilder()->getVars());
+		$this->assertEquals(['mobileUrl' => '/my-controller/my-action?mobile=1'], $this->Controller->viewBuilder()->getVars());
 	}
 
 	/**
@@ -138,6 +138,10 @@ class MobileComponentTest extends TestCase {
 	public function testMobileFakeMobile() {
 		$_SERVER['HTTP_USER_AGENT'] = 'Some Android device';
 
+		$request = $this->Controller->getRequest()
+			->withAttribute('params', ['controller' => 'MyController', 'action' => 'myAction']);
+		$this->Controller->setRequest($request);
+
 		$this->Controller->Mobile->beforeFilter($this->event);
 		$this->assertTrue($this->Controller->Mobile->isMobile);
 
@@ -150,7 +154,11 @@ class MobileComponentTest extends TestCase {
 	 * @return void
 	 */
 	public function testMobileFakeMobileForceDeactivated() {
-		$this->Controller->setRequest($this->Controller->getRequest()->withQueryParams(['mobile' => 0]));
+		$request = $this->Controller->getRequest()
+			->withAttribute('params', ['controller' => 'MyController', 'action' => 'myAction'])
+			->withQueryParams(['mobile' => 0]);
+		$this->Controller->setRequest($request);
+
 		$_SERVER['HTTP_USER_AGENT'] = 'Some Android device';
 
 		$this->Controller->Mobile->beforeFilter($this->event);
@@ -173,6 +181,10 @@ class MobileComponentTest extends TestCase {
 		$this->Controller->Mobile->setConfig('auto', true);
 		$_SERVER['HTTP_USER_AGENT'] = 'Some Android device';
 
+		$request = $this->Controller->getRequest()
+			->withAttribute('params', ['controller' => 'MyController', 'action' => 'myAction']);
+		$this->Controller->setRequest($request);
+
 		$this->Controller->Mobile->beforeFilter($this->event);
 		$this->assertTrue($this->Controller->Mobile->isMobile);
 

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,13 +2,13 @@
 
 namespace Tools\Test\TestCase\Mailer;
 
-use App\Mailer\TestEmail;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Log\Log;
 use Cake\Mailer\Message;
 use Cake\Mailer\TransportFactory;
 use InvalidArgumentException;
+use TestApp\Mailer\TestEmail;
 use Tools\Mailer\Email;
 use Tools\TestSuite\TestCase;
 
@@ -18,7 +18,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,9 +2,9 @@
 
 namespace Tools\Test\TestCase\Model\Behavior;
 
-use App\Model\Entity\BitmaskedComment;
 use Cake\ORM\TableRegistry;
 use RuntimeException;
+use TestApp\Model\Entity\BitmaskedComment;
 use Tools\TestSuite\TestCase;
 
 class BitmaskedBehaviorTest extends TestCase {

tests/TestCase/Model/Behavior/PasswordableBehaviorTest.php

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

tests/TestCase/Model/Behavior/ResetBehaviorTest.php

@@ -3,6 +3,7 @@
 namespace Tools\Model\Behavior;
 
 use Cake\ORM\TableRegistry;
+use TestApp\Model\Table\ResetCommentsTable;
 use Tools\Model\Table\Table;
 use Tools\TestSuite\TestCase;
 
@@ -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()->where(['id' => 6])->first();
 		$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()->where(['id' => 6])->first();
 		$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()->where(['id' => 6])->first();
 		$this->assertEquals('Second Comment for Second Article', $x['comment']);

tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -2,11 +2,11 @@
 
 namespace Tools\Test\TestCase\Model\Behavior;
 
-use App\Model\Entity\SluggedArticle;
 use Cake\Core\Configure;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
 use RuntimeException;
+use TestApp\Model\Entity\SluggedArticle;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Text;
 
@@ -650,7 +650,7 @@ class SluggedBehaviorTest extends TestCase {
 		$this->articles->setEntityClass(SluggedArticle::class);
 
 		$this->expectException(RuntimeException::class);
-		$this->expectExceptionMessage('(SluggedBehavior::setup) model `SluggedArticles` is missing the field `specialNonExistent` (specified in the setup for entity `App\Model\Entity\SluggedArticle`.');
+		$this->expectExceptionMessage('(SluggedBehavior::setup) model `SluggedArticles` is missing the field `specialNonExistent` (specified in the setup for entity `TestApp\Model\Entity\SluggedArticle`.');
 
 		$this->articles->addBehavior('Tools.Slugged', [
 			'label' => [

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 {
@@ -164,6 +164,10 @@ class MimeTest extends TestCase {
 		foreach ($plugin as $key => $value) {
 			$diff['pluginonly'][$key] = $value;
 		}
+
+		$this->assertNotEmpty($diff['coreonly']);
+		$this->assertNotEmpty($diff['pluginonly']);
+		$this->assertNotEmpty($diff['modified']);
 	}
 
 }

tests/TestCase/Utility/TimeTest.php

@@ -682,25 +682,23 @@ class TimeTest extends TestCase {
 	 */
 	public function testFuzzyFromOffset() {
 		$ret = $this->Time->fuzzyFromOffset(MONTH);
-		//pr($ret);
+		$this->assertSame('about a month', $ret);
 
 		$ret = $this->Time->fuzzyFromOffset(120);
-		//pr($ret);
+		$this->assertSame('a few minutes', $ret);
 
 		$ret = $this->Time->fuzzyFromOffset(DAY);
-		//pr($ret);
+		$this->assertSame('about a day', $ret);
 
 		$ret = $this->Time->fuzzyFromOffset(DAY + 2 * MINUTE);
-		//pr($ret);
+		$this->assertSame('about a day', $ret);
 
 		// FIX ME! Doesn't work!
 		$ret = $this->Time->fuzzyFromOffset(-DAY);
-		//pr($ret);
+		//dd($ret);
 	}
 
 	/**
-	 * TimeTest::testCweekMod()
-	 *
 	 * @return void
 	 */
 	public function testCweekMod() {

tests/TestCase/View/Helper/CommonHelperTest.php

@@ -2,9 +2,9 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
-use Cake\Routing\Route\DashedRoute;
 use Cake\Routing\RouteBuilder;
 use Cake\Routing\Router;
+use Cake\Routing\Route\DashedRoute;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\View\Helper\CommonHelper;

tests/TestCase/View/Helper/TimeHelperTest.php

@@ -2,6 +2,7 @@
 
 namespace Tools\Test\TestCase\View\Helper;
 
+use Cake\I18n\FrozenTime;
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
 use Tools\Utility\Time;
@@ -78,7 +79,7 @@ class TimeHelperTest extends TestCase {
 		$expected = 'class="published notyet';
 		$this->assertStringContainsString($expected, $result);
 
-		$result = $this->Time->published((new Time(date(FORMAT_DB_DATETIME)))->subDays(2));
+		$result = $this->Time->published((new FrozenTime(date(FORMAT_DB_DATETIME)))->subDays(2));
 		$expected = 'class="published already';
 		$this->assertStringContainsString($expected, $result);
 	}

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
 	 */
 	protected $Timeline;
 

tests/bootstrap.php

@@ -35,7 +35,7 @@ require_once 'vendor/cakephp/cakephp/src/basics.php';
 require_once 'vendor/autoload.php';
 
 Cake\Core\Configure::write('App', [
-		'namespace' => 'App',
+		'namespace' => 'TestApp',
 		'encoding' => 'UTF-8',
 		'fullBaseUrl' => '/',
 ]);
@@ -45,7 +45,7 @@ Cake\Core\Configure::write('Config', [
 		'adminEmail' => 'test@example.com',
 		'adminName' => 'Mark',
 ]);
-Cake\Mailer\Email::setConfig('default', ['transport' => 'Debug']);
+Cake\Mailer\Mailer::setConfig('default', ['transport' => 'Debug']);
 Cake\Mailer\TransportFactory::setConfig('Debug', [
 		'className' => 'Debug',
 ]);
@@ -121,3 +121,5 @@ Cake\Datasource\ConnectionManager::setConfig('test', [
 	'quoteIdentifiers' => true,
 	'cacheMetadata' => true,
 ]);
+
+class_alias(TestApp\Controller\AppController::class, 'App\Controller\AppController');

tests/test_app/Application.php

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

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 Cake\Mailer\Message;
 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\TableSchemaInterface;
 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;