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

# Conflicts:
#	phpunit.xml.dist

Author: dereuromark

phpunit.xml.dist

@@ -8,12 +8,10 @@
 		<ini name="error_reporting" value="32767"/>
 	</php>
 
-	<!-- Add any additional test suites you want to run here -->
 	<testsuites>
 		<testsuite name="markup">
 			<directory>tests/TestCase/</directory>
 		</testsuite>
-		<!-- Add plugin test suites here. -->
 	</testsuites>
 
 	<source>

tests/bootstrap.php

@@ -1,8 +1,12 @@
 <?php
 
-require dirname(__DIR__) . '/vendor/cakephp/cakephp/src/basics.php';
-require dirname(__DIR__) . '/vendor/autoload.php';
+use Cake\Cache\Cache;
+use Cake\Core\Configure;
+use Cake\Datasource\ConnectionManager;
 
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
 define('ROOT', dirname(__DIR__));
 define('APP_DIR', 'src');
 
@@ -25,12 +29,16 @@
 define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 define('CAKE', CORE_PATH . 'src' . DS);
 
-Cake\Core\Configure::write('App', [
+require dirname(__DIR__) . '/vendor/autoload.php';
+require CORE_PATH . 'config/bootstrap.php';
+require CAKE_CORE_INCLUDE_PATH . '/src/functions.php';
+
+Configure::write('App', [
 	'namespace' => 'App',
 	'encoding' => 'UTF-8',
 ]);
 
-Cake\Core\Configure::write('debug', true);
+Configure::write('debug', true);
 
 $cache = [
 	'default' => [
@@ -53,10 +61,10 @@
 	],
 ];
 
-Cake\Cache\Cache::setConfig($cache);
+Cache::setConfig($cache);
 
 if (file_exists(CONFIG . 'app_local.php')) {
-	Cake\Core\Configure::load('app_local', 'default');
+	Configure::load('app_local', 'default');
 }
 
 // Ensure default test connection is defined
@@ -65,7 +73,7 @@
 	putenv('db_dsn=sqlite::memory:');
 }
 
-Cake\Datasource\ConnectionManager::setConfig('test', [
+ConnectionManager::setConfig('test', [
 	'className' => 'Cake\Database\Connection',
 	'driver' => getenv('db_class') ?: null,
 	'dsn' => getenv('db_dsn') ?: null,