Fix export of test_app folder

Author: dereuromark

.gitattributes

@@ -33,3 +33,11 @@
 *.ico binary
 *.mo binary
 *.pdf binary
+
+# Remove files for archives generated using `git archive`
+phpunit.xml.dist export-ignore
+.travis.yml export-ignore
+.gitignore export-ignore
+.gitattributes export-ignore
+.editorconfig export-ignore
+tests/test_app export-ignore

composer.json

@@ -36,15 +36,15 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"Queue\\": "src",
-			"Queue\\Test\\Fixture\\": "tests/Fixture"
+			"Queue\\": "src/",
+			"Queue\\Test\\Fixture\\": "tests/Fixture/"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"Queue\\Test\\": "tests",
-			"TestApp\\": "tests/test_app/src",
-			"Cake\\Test\\": "vendor/cakephp/cakephp/tests"
+			"Queue\\Test\\": "tests/",
+			"App\\": "tests/test_app/src/",
+			"Cake\\Test\\": "vendor/cakephp/cakephp/tests/"
 		}
 	},
 	"scripts": {

src/Controller/Admin/QueueController.php

@@ -23,7 +23,7 @@ class QueueController extends AppController {
 	 * QueueController::beforeFilter()
 	 *
 	 * @param \Cake\Event\Event $event
-	 * @return void
+	 * @return \Cake\Http\Response|null
 	 */
 	public function beforeFilter(Event $event) {
 		$this->QueuedJobs->initConfig();
@@ -35,7 +35,7 @@ public function beforeFilter(Event $event) {
 	 * Admin center.
 	 * Manage queues from admin backend (without the need to open ssh console window).
 	 *
-	 * @return void
+	 * @return \Cake\Http\Response|null
 	 */
 	public function index() {
 		$status = $this->_status();

src/Template/Admin/Queue/index.ctp

@@ -5,9 +5,9 @@
 use Cake\Core\Configure;
 ?>
 <div class="page index col-xs-12">
-<h2><?php echo __d('queue', 'Queue');?></h2>
+<h1><?php echo __d('queue', 'Queue');?></h1>
 
-<h3><?php echo __d('queue', 'Status'); ?></h3>
+<h2><?php echo __d('queue', 'Status'); ?></h2>
 <?php if ($status) { ?>
 <?php
 	$running = (time() - $status['time']) < MINUTE;
@@ -21,7 +21,7 @@ use Cake\Core\Configure;
 n/a
 <?php } ?>
 
-<h3><?php echo __d('queue', 'Queued Jobs'); ?></h3>
+<h2><?php echo __d('queue', 'Queued Jobs'); ?></h2>
 <?php
  echo $current;
 ?> task(s) await processing
@@ -50,7 +50,7 @@ foreach ($pendingDetails as $item) {
 ?>
 </ol>
 
-<h3><?php echo __d('queue', 'Statistics'); ?></h3>
+<h2><?php echo __d('queue', 'Statistics'); ?></h2>
 <ul>
 <?php
 foreach ($data as $item) {
@@ -69,7 +69,7 @@ if (empty($data)) {
 ?>
 </ul>
 
-<h3>Settings</h3>
+<h2>Settings</h2>
 <ul>
 <?php
 	$configurations = Configure::read('Queue');
@@ -88,7 +88,7 @@ if (empty($data)) {
 ?>
 </ul>
 
-	<h3>Trigger Test/Demo Jobs</h3>
+	<h2>Trigger Test/Demo Jobs</h2>
 	<ul>
 		<?php
 		foreach ($tasks as $task) {

src/Template/Admin/Queue/processes.ctp

@@ -7,9 +7,9 @@ use Cake\I18n\Time;
 
 ?>
 <div class="page index col-xs-12">
-<h2><?php echo __d('queue', 'Queue');?></h2>
+<h1><?php echo __d('queue', 'Queue');?></h1>
 
-<h3><?php echo __d('queue', 'Current Queue Processes'); ?></h3>
+<h2><?php echo __d('queue', 'Current Queue Processes'); ?></h2>
 <ul>
 <?php
 foreach ($processes as $process => $timestamp) {

tests/bootstrap.php

@@ -33,7 +33,7 @@
 require CORE_PATH . 'config/bootstrap.php';
 
 Cake\Core\Configure::write('App', [
-	'namespace' => 'TestApp',
+	'namespace' => 'App',
 	'encoding' => 'UTF-8',
 	'paths' => [
 		'templates' => [ROOT . DS . 'tests' . DS . 'test_app' . DS . 'src' . DS . 'Template' . DS],
@@ -89,7 +89,6 @@
 
 DispatcherFactory::add('Routing');
 DispatcherFactory::add('ControllerFactory');
-class_alias(AppController::class, 'App\Controller\AppController');
 
 Cake\Mailer\Email::configTransport('default', [
 	'className' => 'Debug',

tests/test_app/src/Controller/AppController.php

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

tests/test_app/src/Model/Table/QueuedJobsTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace TestApp\Model\Table;
+namespace App\Model\Table;
 
 use Queue\Model\Table\QueuedJobsTable as BaseQueuedJobsTable;
 

tests/test_app/src/Shell/TestQueueShell.php

@@ -1,5 +1,5 @@
 <?php
-namespace TestApp\Shell;
+namespace App\Shell;
 
 use Cake\Console\Shell;
 use Queue\Shell\QueueShell;