Merge remote-tracking branch 'origin/master' into 3.next

src/Controller/Exception/AuthSecurityException.php

@@ -21,5 +21,5 @@ class AuthSecurityException extends SecurityException
      * Security Exception type
      * @var string
      */
-    public $type = 'auth';
+    protected $_type = 'auth';
 }

src/ORM/Association/BelongsToMany.php

@@ -673,8 +673,8 @@ class BelongsToMany extends Association
     /**
      * Associates the source entity to each of the target entities provided by
      * creating links in the junction table. Both the source entity and each of
-     * the target entities are assumed to be already persisted, if the are marked
-     * as new or their status is unknown, an exception will be thrown.
+     * the target entities are assumed to be already persisted, if they are marked
+     * as new or their status is unknown then an exception will be thrown.
      *
      * When using this method, all entities in `$targetEntities` will be appended to
      * the source entity's property corresponding to this association object.

tests/TestCase/Controller/Exception/AuthSecurityExceptionTest.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         3.2.6
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Cake\Test\TestCase\Controller\Exception;
+
+use Cake\Controller\Exception\AuthSecurityException;
+use Cake\TestSuite\TestCase;
+
+/**
+ * AuthSecurityException Test class
+ *
+ */
+class AuthSecurityExceptionTest extends TestCase
+{
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->authSecurityException = new AuthSecurityException;
+    }
+
+    /**
+     * Test the getType() function.
+     *
+     * @return void
+     */
+    public function testGetType()
+    {
+        $this->assertEquals(
+            'auth',
+            $this->authSecurityException->getType(),
+            '::getType should always return the type of `auth`.'
+        );
+    }
+}

tests/TestCase/Controller/Exception/SecurityExceptionTest.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         3.2.6
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Cake\Test\TestCase\Controller\Exception;
+
+use Cake\Controller\Exception\SecurityException;
+use Cake\TestSuite\TestCase;
+
+/**
+ * SecurityException Test class
+ *
+ */
+class SecurityExceptionTest extends TestCase
+{
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->securityException = new SecurityException;
+    }
+
+    /**
+     * Test the getType() function.
+     *
+     * @return void
+     */
+    public function testGetType()
+    {
+        $this->assertEquals(
+            'secure',
+            $this->securityException->getType(),
+            '::getType should always return the type of `secure`.'
+        );
+    }
+
+    /**
+     * Test the setMessage() function.
+     *
+     * @return void
+     */
+    public function testSetMessage()
+    {
+        $sampleMessage = 'foo';
+        $this->securityException->setMessage($sampleMessage);
+        $this->assertEquals(
+            $sampleMessage,
+            $this->securityException->getMessage(),
+            '::getMessage should always return the message set.'
+        );
+    }
+
+    /**
+     * Test the setReason() and corresponding getReason() function.
+     *
+     * @return void
+     */
+    public function testSetGetReason()
+    {
+        $sampleReason = 'canary';
+        $this->securityException->setReason($sampleReason);
+        $this->assertEquals(
+            $sampleReason,
+            $this->securityException->getReason(),
+            '::getReason should always return the reason set.'
+        );
+    }
+}

tests/TestCase/Database/ConnectionTest.php

@@ -129,8 +129,9 @@ class ConnectionTest extends TestCase
         $connection = new Connection(['driver' => 'TestPlugin.TestDriver']);
         $this->assertInstanceOf('\TestPlugin\Database\Driver\TestDriver', $connection->driver());
 
-        $connection = new Connection(['driver' => 'Sqlite']);
-        $this->assertInstanceOf('\Cake\Database\Driver\Sqlite', $connection->driver());
+        list(, $name) = namespaceSplit(get_class($this->connection->driver()));
+        $connection = new Connection(['driver' => $name]);
+        $this->assertInstanceOf(get_class($this->connection->driver()), $connection->driver());
     }
 
     /**

tests/test_app/Plugin/TestPlugin/src/Database/Driver/TestDriver.php

@@ -17,4 +17,8 @@ use Cake\Database\Driver\Sqlite;
 
 class TestDriver extends Sqlite
 {
+    public function enabled()
+    {
+        return true;
+    }
 }

tests/test_app/TestApp/Database/Driver/TestDriver.php

@@ -17,4 +17,9 @@ use Cake\Database\Driver\Sqlite;
 
 class TestDriver extends Sqlite
 {
+
+    public function enabled()
+    {
+        return true;
+    }
 }