Rename Database/Exception to Database/Error.

src/Database/Connection.php

@@ -14,9 +14,6 @@
  */
 namespace Cake\Database;
 
-use Cake\Database\Exception\MissingConnectionException;
-use Cake\Database\Exception\MissingDriverException;
-use Cake\Database\Exception\MissingExtensionException;
 use Cake\Database\Log\LoggedQuery;
 use Cake\Database\Log\LoggingStatement;
 use Cake\Database\Log\QueryLogger;
@@ -137,8 +134,8 @@ class Connection {
  *
  * @param string|Driver $driver
  * @param array|null $config Either config for a new driver or null.
- * @throws \Cake\Database\Exception\MissingDriverException When a driver class is missing.
- * @throws \Cake\Database\Exception\MissingExtensionException When a driver's PHP extension is missing.
+ * @throws \Cake\Database\Error\MissingDriverException When a driver class is missing.
+ * @throws \Cake\Database\Error\MissingExtensionException When a driver's PHP extension is missing.
  * @return Driver
  */
 	public function driver($driver = null, $config = null) {
@@ -147,12 +144,12 @@ class Connection {
 		}
 		if (is_string($driver)) {
 			if (!class_exists($driver)) {
-				throw new MissingDriverException(['driver' => $driver]);
+				throw new Error\MissingDriverException(['driver' => $driver]);
 			}
 			$driver = new $driver($config);
 		}
 		if (!$driver->enabled()) {
-			throw new MissingExtensionException(['driver' => get_class($driver)]);
+			throw new Error\MissingExtensionException(['driver' => get_class($driver)]);
 		}
 		return $this->_driver = $driver;
 	}
@@ -160,7 +157,7 @@ class Connection {
 /**
  * Connects to the configured database.
  *
- * @throws \Cake\Database\Exception\MissingConnectionException if credentials are invalid
+ * @throws \Cake\Database\Error\MissingConnectionException if credentials are invalid
  * @return boolean true on success or false if already connected.
  */
 	public function connect() {
@@ -168,7 +165,7 @@ class Connection {
 			$this->_driver->connect();
 			return true;
 		} catch(\Exception $e) {
-			throw new MissingConnectionException(['reason' => $e->getMessage()]);
+			throw new Error\MissingConnectionException(['reason' => $e->getMessage()]);
 		}
 	}
 

src/Database/Exception/MissingConnectionException.php

@@ -12,10 +12,15 @@
  * @since         3.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-namespace Cake\Database\Exception;
+namespace Cake\Database\Error;
 
-class MissingConnectionException extends \Cake\Error\Exception {
+use Cake\Error\Exception;
 
+class MissingConnectionException extends Exception {
+
+/**
+ * @inheritdoc
+ */
 	protected $_messageTemplate = 'Connection to database could not be established: %s';
 
 }

src/Database/Exception/MissingDriverException.php

@@ -12,10 +12,15 @@
  * @since         3.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-namespace Cake\Database\Exception;
+namespace Cake\Database\Error;
+
+use Cake\Error\Exception;
 
 class MissingDriverException extends \Cake\Error\Exception {
 
+/**
+ * @inheritdoc
+ */
 	protected $_messageTemplate = 'Database driver "%s" could not be found.';
 
 }

src/Database/Exception/MissingExtensionException.php

@@ -12,10 +12,15 @@
  * @since         3.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-namespace Cake\Database\Exception;
+namespace Cake\Database\Error;
+
+use Cake\Error\Exception;
 
 class MissingExtensionException extends \Cake\Error\Exception {
 
+/**
+ * @inheritdoc
+ */
 	protected $_messageTemplate = 'Database driver %s cannot be used due to a missing PHP extension or unmet dependency';
 
 }

tests/TestCase/Database/ConnectionTest.php

@@ -64,7 +64,7 @@ class ConnectionTest extends TestCase {
 /**
  * Tests creating a connection using no driver throws an exception
  *
- * @expectedException \Cake\Database\Exception\MissingDriverException
+ * @expectedException \Cake\Database\Error\MissingDriverException
  * @expectedExceptionMessage Database driver "" could not be found.
  * @return void
  */
@@ -75,7 +75,7 @@ class ConnectionTest extends TestCase {
 /**
  * Tests creating a connection using an invalid driver throws an exception
  *
- * @expectedException \Cake\Database\Exception\MissingDriverException
+ * @expectedException \Cake\Database\Error\MissingDriverException
  * @expectedExceptionMessage Database driver "" could not be found.
  * @return void
  */
@@ -86,7 +86,7 @@ class ConnectionTest extends TestCase {
 /**
  * Tests creating a connection using an invalid driver throws an exception
  *
- * @expectedException \Cake\Database\Exception\MissingDriverException
+ * @expectedException \Cake\Database\Error\MissingDriverException
  * @expectedExceptionMessage Database driver "\Foo\InvalidDriver" could not be found.
  * @return void
  */
@@ -97,7 +97,7 @@ class ConnectionTest extends TestCase {
 /**
  * Tests trying to use a disabled driver throws an exception
  *
- * @expectedException \Cake\Database\Exception\MissingExtensionException
+ * @expectedException \Cake\Database\Error\MissingExtensionException
  * @expectedExceptionMessage Database driver DriverMock cannot be used due to a missing PHP extension or unmet dependency
  * @return void
  */
@@ -109,7 +109,7 @@ class ConnectionTest extends TestCase {
 /**
  * Tests that connecting with invalid credentials or database name throws an exception
  *
- * @expectedException \Cake\Database\Exception\MissingConnectionException
+ * @expectedException \Cake\Database\Error\MissingConnectionException
  * @return void
  **/
 	public function testWrongCredentials() {