Merge branch '3.next'

Author: markstory

composer.json

@@ -24,15 +24,15 @@
     },
     "require": {
         "php": ">=5.6.0",
-        "cakephp/cakephp": "^3.4.0",
+        "cakephp/cakephp": "dev-3.next as 3.6.0",
         "cakephp/chronos": "^1.0.0",
         "cakephp/plugin-installer": "^1.0.0",
         "composer/composer": "^1.3.0",
         "jdorn/sql-formatter": "^1.2.0"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",
-        "phpunit/phpunit": "^5.7|^6.0"
+        "phpunit/phpunit": "^5.7.14|^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -42,8 +42,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Cake\\Test\\": "vendor/cakephp/cakephp/tests",
-            "DebugKit\\Test\\": "tests"
+            "Cake\\Test\\": "vendor/cakephp/cakephp/tests/",
+            "DebugKit\\Test\\": "tests/",
+            "DebugKit\\TestApp\\": "tests/test_app/"
         }
     },
     "suggest": {

config/bootstrap.php

@@ -28,7 +28,7 @@
     return;
 }
 
-$hasDebugKitConfig = ConnectionManager::config('debug_kit');
+$hasDebugKitConfig = ConnectionManager::getConfig('debug_kit');
 if (!$hasDebugKitConfig && !in_array('sqlite', PDO::getAvailableDrivers())) {
     $msg = 'DebugKit not enabled. You need to either install pdo_sqlite, ' .
         'or define the "debug_kit" connection name.';
@@ -37,7 +37,7 @@
 }
 
 if (!$hasDebugKitConfig) {
-    ConnectionManager::config('debug_kit', [
+    ConnectionManager::setConfig('debug_kit', [
         'className' => 'Cake\Database\Connection',
         'driver' => 'Cake\Database\Driver\Sqlite',
         'database' => TMP . 'debug_kit.sqlite',

config/routes.php

@@ -3,7 +3,7 @@
 use Cake\Routing\Router;
 
 Router::plugin('DebugKit', ['path' => '/debug-kit'], function (RouteBuilder $routes) {
-    $routes->extensions('json');
+    $routes->setExtensions('json');
     $routes->connect(
         '/toolbar/clear-cache',
         ['controller' => 'Toolbar', 'action' => 'clearCache']

src/Cache/Engine/DebugEngine.php

@@ -249,6 +249,7 @@ public function groups()
      * This method uses func_get_args() as not doing so confuses the
      * proxied class.
      *
+     * @deprecated 3.6.0 use setConfig()/getConfig() instead.
      * @param string $key The key to set/read.
      * @param mixed $value The value to set.
      * @param bool $merge Whether or not configuration should be merged.
@@ -259,6 +260,32 @@ public function config($key = null, $value = null, $merge = true)
         return call_user_func_array([$this->_engine, 'config'], func_get_args());
     }
 
+    /**
+     * Returns the config.
+     *
+     * @param string|null $key The key to get or null for the whole config.
+     * @param mixed $default The return value when the key does not exist.
+     * @return mixed Config value being read.
+     */
+    public function getConfig($key = null, $default = null)
+    {
+        return $this->_engine->getConfig($key, $default);
+    }
+
+    /**
+     * Sets the config.
+     *
+     * @param string|array $key The key to set, or a complete array of configs.
+     * @param mixed|null $value The value to set.
+     * @param bool $merge Whether to recursively merge or overwrite existing config, defaults to true.
+     * @return $this
+     * @throws \Cake\Core\Exception\Exception When trying to set a key that is invalid.
+     */
+    public function setConfig($key, $value = null, $merge = true)
+    {
+        return $this->_engine->setConfig($key, $value, $merge);
+    }
+
     /**
      * {@inheritDoc}
      */

src/Controller/ComposerController.php

@@ -16,7 +16,7 @@
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\Event;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 use Cake\View\JsonView;
 use Composer\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -43,7 +43,7 @@ public function initialize()
      *
      * @param \Cake\Event\Event $event The event.
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function beforeFilter(Event $event)
     {

src/Controller/MailPreviewController.php

@@ -19,7 +19,7 @@
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Event\Event;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 use Cake\Utility\Inflector;
 use DebugKit\Mailer\AbstractResult;
 use DebugKit\Mailer\PreviewResult;
@@ -39,7 +39,7 @@ class MailPreviewController extends Controller
      *
      * @param \Cake\Event\Event $event The beforeFilter event.
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function beforeFilter(Event $event)
     {
@@ -93,15 +93,15 @@ public function sent($panelId, $number)
         $email = $content['emails'][$number];
         $email = new SentMailResult(array_filter($email['headers']), $email['message']);
 
-        $partType = $this->request->query('part');
+        $partType = $this->request->getQuery('part');
         if ($partType) {
             return $this->respondWithPart($email, $partType);
         }
 
         $this->set('noHeader', true);
         $this->set('email', $email);
         $this->set('plugin', '');
-        $this->set('part', $this->findPreferredPart($email, $this->request->query('part')));
+        $this->set('part', $this->findPreferredPart($email, $this->request->getQuery('part')));
         $this->viewBuilder()->template('email');
     }
 
@@ -114,9 +114,9 @@ public function sent($panelId, $number)
      */
     public function email($name, $method)
     {
-        $plugin = $this->request->query('plugin');
+        $plugin = $this->request->getQuery('plugin');
         $email = $this->findPreview($name, $method, $plugin);
-        $partType = $this->request->query('part');
+        $partType = $this->request->getQuery('part');
 
         $this->viewBuilder()->layout(false);
 
@@ -128,7 +128,7 @@ public function email($name, $method)
         $this->set('title', $humanName);
         $this->set('email', $email);
         $this->set('plugin', $plugin);
-        $this->set('part', $this->findPreferredPart($email, $this->request->query('part')));
+        $this->set('part', $this->findPreferredPart($email, $this->request->getQuery('part')));
     }
 
     /**
@@ -147,13 +147,13 @@ protected function respondWithPart($email, $partType)
             throw new NotFoundException(__d('debug_kit', "Email part '{0}' not found in email", $partType));
         }
 
-        $this->response->type($partType);
+        $response = $this->response->withType($partType);
         if ($part === 'text') {
             $part = '<pre>' . $part . "</pre>";
         }
-        $this->response->body($part);
+        $response = $response->withStringBody($part);
 
-        return $this->response;
+        return $response;
     }
 
     /**
@@ -251,7 +251,7 @@ protected function findPreferredPart(AbstractResult $email, $partType)
      * @param string $emailName The mailer preview method
      * @param string|null $plugin The plugin where the mailer preview should be found
      * @return \DebugKit\Mailer\PreviewResult The result of the email preview
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     protected function findPreview($previewName, $emailName, $plugin = null)
     {

src/Controller/PanelsController.php

@@ -15,7 +15,7 @@
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\Event;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 
 /**
  * Provides access to panel data.
@@ -37,7 +37,7 @@ class PanelsController extends Controller
      *
      * @param \Cake\Event\Event $event The event.
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function beforeFilter(Event $event)
     {
@@ -67,7 +67,7 @@ public function beforeRender(Event $event)
      *
      * @param string $requestId Request id
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function index($requestId = null)
     {

src/Controller/RequestsController.php

@@ -15,7 +15,7 @@
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\Event;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 
 /**
  * Provides access to panel data.
@@ -30,7 +30,7 @@ class RequestsController extends Controller
      *
      * @param \Cake\Event\Event $event The event.
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function beforeFilter(Event $event)
     {
@@ -39,7 +39,7 @@ public function beforeFilter(Event $event)
             throw new NotFoundException();
         }
 
-        $this->response->header(['Content-Security-Policy' => '']);
+        $this->response = $this->response->withHeader('Content-Security-Policy', '');
     }
 
     /**

src/Controller/ToolbarController.php

@@ -16,7 +16,7 @@
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Event\Event;
-use Cake\Network\Exception\NotFoundException;
+use Cake\Http\Exception\NotFoundException;
 
 /**
  * Provides utility features need by the toolbar.
@@ -43,7 +43,7 @@ class ToolbarController extends Controller
      *
      * @param \Cake\Event\Event $event The event.
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function beforeFilter(Event $event)
     {
@@ -57,15 +57,15 @@ public function beforeFilter(Event $event)
      * Clear a named cache.
      *
      * @return void
-     * @throws \Cake\Network\Exception\NotFoundException
+     * @throws \Cake\Http\Exception\NotFoundException
      */
     public function clearCache()
     {
         $this->request->allowMethod('post');
-        if (!$this->request->data('name')) {
+        if (!$this->request->getData('name')) {
             throw new NotFoundException(__d('debug_kit', 'Invalid cache engine name.'));
         }
-        $result = Cache::clear(false, $this->request->data('name'));
+        $result = Cache::clear(false, $this->request->getData('name'));
         $this->set([
             '_serialize' => ['success'],
             'success' => $result,

src/Model/Behavior/TimedBehavior.php

@@ -32,7 +32,7 @@ class TimedBehavior extends Behavior
      */
     public function beforeFind(Event $event, $query)
     {
-        $alias = $event->subject()->alias();
+        $alias = $event->getSubject()->getAlias();
         DebugTimer::start($alias . '_find', $alias . '->find()');
 
         return $query->formatResults(function ($results) use ($alias) {
@@ -50,7 +50,7 @@ public function beforeFind(Event $event, $query)
      */
     public function beforeSave(Event $event)
     {
-        $alias = $event->subject()->alias();
+        $alias = $event->getSubject()->getAlias();
         DebugTimer::start($alias . '_save', $alias . '->save()');
     }
 
@@ -62,7 +62,7 @@ public function beforeSave(Event $event)
      */
     public function afterSave(Event $event)
     {
-        $alias = $event->subject()->alias();
+        $alias = $event->getSubject()->getAlias();
         DebugTimer::stop($alias . '_save');
     }
 }