Moving Cake\Error\Exception to Cake\Core\Error

Author: lorenzo

src/Auth/BaseAuthorize.php

@@ -94,7 +94,7 @@ abstract public function authorize($user, Request $request);
  *
  * @param Controller $controller null to get, a controller to set.
  * @return mixed
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function controller(Controller $controller = null) {
 		if ($controller) {

src/Auth/ControllerAuthorize.php

@@ -43,7 +43,7 @@ class ControllerAuthorize extends BaseAuthorize {
  *
  * @param Controller $controller null to get, a controller to set.
  * @return mixed
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function controller(Controller $controller = null) {
 		if ($controller) {

src/Cache/Cache.php

@@ -61,7 +61,7 @@
  * @param string $name Name of the configuration
  * @param array $config Optional associative array of settings passed to the engine
  * @return array [engine, settings] on success, false on failure
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 class Cache {
 
@@ -213,7 +213,7 @@ public static function write($key, $value, $config = 'default') {
  * @param array $data An array of data to be stored in the cache
  * @param string $config Optional string configuration name to write to. Defaults to 'default'
  * @return array of bools for each key provided, indicating true for success or false for fail
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public static function writeMany($data, $config = 'default') {
 		$engine = static::engine($config);
@@ -394,7 +394,7 @@ public static function clearGroup($group, $config = 'default') {
  *
  * @param string $group group name or null to retrieve all group mappings
  * @return array map of group and all configuration that has the same group
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public static function groupConfigs($group = null) {
 		if ($group === null) {

src/Cache/CacheRegistry.php

@@ -48,7 +48,7 @@ protected function _resolveClassName($class) {
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the cache is missing in.
  * @return void
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	protected function _throwMissingClassError($class, $plugin) {
 		throw new Error\Exception(sprintf('Cache engine %s is not available.', $class));
@@ -63,7 +63,7 @@ protected function _throwMissingClassError($class, $plugin) {
  * @param string $alias The alias of the object.
  * @param array $config An array of settings to use for the cache engine.
  * @return CacheEngine The constructed CacheEngine class.
- * @throws \Cake\Error\Exception when an object doesn't implement
+ * @throws \Cake\Core\Error\Exception when an object doesn't implement
  *    the correct interface.
  */
 	protected function _create($class, $alias, $config) {

src/Cache/Engine/FileEngine.php

@@ -320,7 +320,7 @@ protected function _clearDirectory($path, $now, $threshold) {
  * @param string $key The key to decrement
  * @param int $offset The number to offset
  * @return void
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function decrement($key, $offset = 1) {
 		throw new Error\Exception('Files cannot be atomically decremented.');
@@ -332,7 +332,7 @@ public function decrement($key, $offset = 1) {
  * @param string $key The key to decrement
  * @param int $offset The number to offset
  * @return void
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function increment($key, $offset = 1) {
 		throw new Error\Exception('Files cannot be atomically incremented.');

src/Cache/Engine/MemcachedEngine.php

@@ -94,7 +94,7 @@ class MemcachedEngine extends CacheEngine {
  *
  * @param array $config array of setting for the engine
  * @return bool True if the engine has been successfully initialized, false if not
- * @throws \Cake\Error\Exception when you try use authentication without Memcached compiled with SASL support
+ * @throws \Cake\Core\Error\Exception when you try use authentication without Memcached compiled with SASL support
  */
 	public function init(array $config = []) {
 		if (!class_exists('Memcached')) {
@@ -166,7 +166,7 @@ public function init(array $config = []) {
  * Settings the memcached instance
  *
  * @return void
- * @throws \Cake\Error\Exception when the Memcached extension is not built with the desired serializer engine
+ * @throws \Cake\Core\Error\Exception when the Memcached extension is not built with the desired serializer engine
  */
 	protected function _setOptions() {
 		$this->_Memcached->setOption(Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
@@ -303,7 +303,7 @@ public function readMany($keys) {
  * @param string $key Identifier for the data
  * @param int $offset How much to increment
  * @return bool|int New incremented value, false otherwise
- * @throws \Cake\Error\Exception when you try to increment with compress = true
+ * @throws \Cake\Core\Error\Exception when you try to increment with compress = true
  */
 	public function increment($key, $offset = 1) {
 		$key = $this->_key($key);
@@ -317,7 +317,7 @@ public function increment($key, $offset = 1) {
  * @param string $key Identifier for the data
  * @param int $offset How much to subtract
  * @return bool|int New decremented value, false otherwise
- * @throws \Cake\Error\Exception when you try to decrement with compress = true
+ * @throws \Cake\Core\Error\Exception when you try to decrement with compress = true
  */
 	public function decrement($key, $offset = 1) {
 		$key = $this->_key($key);

src/Configure/Engine/IniConfig.php

@@ -92,7 +92,7 @@ public function __construct($path = null, $section = null) {
  * @param string $key The identifier to read from. If the key has a . it will be treated
  *  as a plugin prefix. The chosen file must be on the engine's path.
  * @return array Parsed configuration values.
- * @throws \Cake\Error\Exception when files don't exist.
+ * @throws \Cake\Core\Error\Exception when files don't exist.
  *  Or when files contain '..' as this could lead to abusive reads.
  */
 	public function read($key) {

src/Configure/Engine/PhpConfig.php

@@ -55,7 +55,7 @@ public function __construct($path = null) {
  * @param string $key The identifier to read from. If the key has a . it will be treated
  *  as a plugin prefix.
  * @return array Parsed configuration values.
- * @throws \Cake\Error\Exception when files don't exist or they don't contain `$config`.
+ * @throws \Cake\Core\Error\Exception when files don't exist or they don't contain `$config`.
  *  Or when files contain '..' as this could lead to abusive reads.
  */
 	public function read($key) {

src/Console/Error/ConsoleException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Console\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Exception class for Console libraries.  This exception will be thrown from Console library

src/Console/Error/MissingShellException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Console\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Used when a shell cannot be found.

src/Console/Error/MissingShellMethodException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Console\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Used when a shell method cannot be found.

src/Console/Error/MissingTaskException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Console\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Used when a Task cannot be found.

src/Console/ShellDispatcher.php

@@ -16,7 +16,7 @@
 
 use Cake\Core\App;
 use Cake\Core\Configure;
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 use Cake\Utility\Inflector;
 
 /**
@@ -100,7 +100,7 @@ public static function run($argv) {
  * Defines current working environment.
  *
  * @return void
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	protected function _initEnvironment() {
 		if (!$this->_bootstrap()) {

src/Controller/Component/AuthComponent.php

@@ -483,7 +483,7 @@ public function isAuthorized($user = null, Request $request = null) {
  * Loads the authorization objects configured.
  *
  * @return mixed Either null when authorize is empty, or the loaded authorization objects.
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function constructAuthorize() {
 		if (empty($this->_config['authorize'])) {
@@ -741,7 +741,7 @@ public function identify() {
  * Loads the configured authentication objects.
  *
  * @return mixed either null on empty authenticate value, or an array of loaded objects.
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function constructAuthenticate() {
 		if (empty($this->_config['authenticate'])) {

src/Controller/Component/RequestHandlerComponent.php

@@ -19,7 +19,7 @@
 use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 use Cake\Event\Event;
 use Cake\Network\Response;
 use Cake\Routing\Router;
@@ -636,7 +636,7 @@ public function mapAlias($alias) {
  *    be the handling callback, all other arguments should be additional parameters
  *    for the handler.
  * @return void
- * @throws \Cake\Error\Exception
+ * @throws \Cake\Core\Error\Exception
  */
 	public function addInputType($type, $handler) {
 		if (!is_array($handler) || !isset($handler[0]) || !is_callable($handler[0])) {

src/Controller/Controller.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Controller;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 use Cake\Event\Event;
 use Cake\Event\EventListener;
 use Cake\Event\EventManagerTrait;
@@ -350,7 +350,7 @@ public function setRequest(Request $request) {
  * exists and isn't private.
  *
  * @return mixed The resulting response.
- * @throws \Cake\Error\Exception When request is not set.
+ * @throws \Cake\Core\Error\Exception When request is not set.
  * @throws \Cake\Controller\Error\PrivateActionException When actions are not public or prefixed by _
  * @throws \Cake\Controller\Error\MissingActionException When actions are not defined.
  */

src/Controller/Error/MissingActionException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Controller\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Missing Action exception - used when a controller action

src/Controller/Error/MissingComponentException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Controller\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Used when a component cannot be found.

src/Controller/Error/MissingControllerException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Controller\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Missing Controller exception - used when a controller

src/Controller/Error/PrivateActionException.php

@@ -15,7 +15,7 @@
  */
 namespace Cake\Controller\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * Private Action exception - used when a controller action

src/Core/Configure.php

@@ -17,7 +17,7 @@
 use Cake\Cache\Cache;
 use Cake\Configure\ConfigEngineInterface;
 use Cake\Configure\Engine\PhpConfig;
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 use Cake\Utility\Hash;
 
 /**
@@ -281,7 +281,7 @@ public static function load($key, $config = 'default', $merge = true) {
  * @param array $keys The name of the top-level keys you want to dump.
  *   This allows you save only some data stored in Configure.
  * @return bool success
- * @throws \Cake\Error\Exception if the adapter does not implement a `dump` method.
+ * @throws \Cake\Core\Error\Exception if the adapter does not implement a `dump` method.
  */
 	public static function dump($key, $config = 'default', $keys = []) {
 		$engine = static::_getEngine($config);

src/Error/Exception.php renamed to src/Core/Error/Exception.php

@@ -11,7 +11,7 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Error;
+namespace Cake\Core\Error;
 
 /**
  * Base class that all CakePHP Exceptions extend.
@@ -51,12 +51,12 @@ class Exception extends \RuntimeException {
  *   that are made available in the view, and sprintf()'d into Exception::$_messageTemplate
  * @param int $code The code of the error, is also the HTTP status code for the error.
  */
-	public function __construct($message, $code = 500) {
+	public function __construct($message, $code = 500, $previous = null) {
 		if (is_array($message)) {
 			$this->_attributes = $message;
 			$message = vsprintf($this->_messageTemplate, $message);
 		}
-		parent::__construct($message, $code);
+		parent::__construct($message, $code, $previous);
 	}
 
 /**

src/Core/Error/MissingPluginException.php

@@ -13,7 +13,7 @@
  */
 namespace Cake\Core\Error;
 
-use Cake\Error\Exception;
+use Exception;
 
 /**
  * Exception raised when a plugin could not be found

src/Core/InstanceConfigTrait.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Core;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 use Cake\Utility\Hash;
 
 /**
@@ -69,7 +69,7 @@ trait InstanceConfigTrait {
  * @param mixed|null $value The value to set.
  * @param bool $merge Whether to merge or overwrite existing config, defaults to true.
  * @return mixed Config value being read, or the object itself on write operations.
- * @throws \Cake\Error\Exception When trying to set a key that is invalid.
+ * @throws \Cake\Core\Error\Exception When trying to set a key that is invalid.
  */
 	public function config($key = null, $value = null, $merge = true) {
 		if (!$this->_configInitialized) {
@@ -122,7 +122,7 @@ protected function _configRead($key) {
  * @param mixed $value Value to write.
  * @param bool $merge Whether to merge or overwrite value.
  * @return void
- * @throws Cake\Error\Exception if attempting to clobber existing config
+ * @throws Cake\Core\Error\Exception if attempting to clobber existing config
  */
 	protected function _configWrite($key, $value, $merge = false) {
 		if (is_string($key) && $value === null) {
@@ -174,7 +174,7 @@ protected function _configWrite($key, $value, $merge = false) {
  *
  * @param string $key Key to delete.
  * @return void
- * @throws Cake\Error\Exception if attempting to clobber existing config
+ * @throws Cake\Core\Error\Exception if attempting to clobber existing config
  */
 	protected function _configDelete($key) {
 		if (strpos($key, '.') === false) {

src/Core/StaticConfigTrait.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Core;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 /**
  * A trait that provides a set of static methods to manage configuration
@@ -65,7 +65,7 @@ trait StaticConfigTrait {
  * @param string|array $key The name of the configuration, or an array of multiple configs.
  * @param array $config An array of name => configuration data for adapter.
  * @return mixed null when adding configuration and an array of configuration data when reading.
- * @throws \Cake\Error\Exception When trying to modify an existing config.
+ * @throws \Cake\Core\Error\Exception When trying to modify an existing config.
  */
 	public static function config($key, $config = null) {
 		// Read config.

src/Database/Error/MissingConnectionException.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Database\Error;
 
-use Cake\Error\Exception;
+use Cake\Core\Error\Exception;
 
 class MissingConnectionException extends Exception {