Skip to content
Permalink
Browse files

Core\Error -> Core\Exception

  • Loading branch information...
lorenzo committed Aug 30, 2014
1 parent ed9494e commit ef8cedff9a5e543bcffe9bae0742819db037266e
Showing with 254 additions and 254 deletions.
  1. +2 −2 src/Auth/BaseAuthorize.php
  2. +2 −2 src/Auth/ControllerAuthorize.php
  3. +5 −5 src/Cache/Cache.php
  4. +3 −3 src/Cache/CacheRegistry.php
  5. +3 −3 src/Cache/Engine/FileEngine.php
  6. +5 −5 src/Cache/Engine/MemcachedEngine.php
  7. +1 −1 src/Console/Error/ConsoleException.php
  8. +1 −1 src/Console/Error/MissingShellException.php
  9. +1 −1 src/Console/Error/MissingShellMethodException.php
  10. +1 −1 src/Console/Error/MissingTaskException.php
  11. +2 −2 src/Console/ShellDispatcher.php
  12. +3 −3 src/Controller/Component/AuthComponent.php
  13. +2 −2 src/Controller/Component/RequestHandlerComponent.php
  14. +2 −2 src/Controller/Controller.php
  15. +1 −1 src/Controller/Error/MissingActionException.php
  16. +1 −1 src/Controller/Error/MissingComponentException.php
  17. +1 −1 src/Controller/Error/MissingControllerException.php
  18. +1 −1 src/Controller/Error/PrivateActionException.php
  19. +2 −2 src/Core/Configure.php
  20. +2 −2 src/Core/Configure/Engine/IniConfig.php
  21. +2 −2 src/Core/Configure/Engine/PhpConfig.php
  22. +1 −1 src/Core/{Error → Exception}/Exception.php
  23. +2 −2 src/Core/{Error → Exception}/MissingPluginException.php
  24. +4 −4 src/Core/InstanceConfigTrait.php
  25. +1 −1 src/Core/ObjectRegistry.php
  26. +7 −7 src/Core/Plugin.php
  27. +2 −2 src/Core/StaticConfigTrait.php
  28. +1 −1 src/Database/Error/MissingConnectionException.php
  29. +2 −2 src/Database/Error/MissingDriverException.php
  30. +2 −2 src/Database/Error/MissingExtensionException.php
  31. +1 −1 src/Database/Exception.php
  32. +2 −2 src/Database/Type/BinaryType.php
  33. +1 −1 src/Database/Type/FloatType.php
  34. +1 −1 src/Database/Type/IntegerType.php
  35. +1 −1 src/Datasource/ConnectionManager.php
  36. +1 −1 src/Datasource/Error/MissingDatasourceConfigException.php
  37. +1 −1 src/Datasource/Error/MissingDatasourceException.php
  38. +2 −2 src/Error/Debugger.php
  39. +3 −3 src/Error/ExceptionRenderer.php
  40. +1 −1 src/Error/FatalErrorException.php
  41. +1 −1 src/Error/HttpException.php
  42. +2 −2 src/Log/Engine/ConsoleLog.php
  43. +3 −3 src/Log/Log.php
  44. +3 −3 src/Log/LogEngineRegistry.php
  45. +1 −1 src/Model/Error/MissingModelException.php
  46. +2 −2 src/Model/ModelAwareTrait.php
  47. +4 −4 src/Network/Email/Email.php
  48. +1 −1 src/Network/Error/SocketException.php
  49. +3 −3 src/Network/Http/Adapter/Stream.php
  50. +3 −3 src/Network/Http/Auth/Oauth.php
  51. +3 −3 src/Network/Http/Client.php
  52. +2 −2 src/Network/Http/Request.php
  53. +2 −2 src/Network/Request.php
  54. +4 −4 src/Network/Response.php
  55. +2 −2 src/ORM/Behavior.php
  56. +4 −4 src/ORM/BehaviorRegistry.php
  57. +1 −1 src/ORM/Error/MissingBehaviorException.php
  58. +1 −1 src/ORM/Error/MissingEntityException.php
  59. +1 −1 src/ORM/Error/MissingTableClassException.php
  60. +3 −3 src/ORM/Table.php
  61. +2 −2 src/Routing/Dispatcher.php
  62. +2 −2 src/Routing/DispatcherFilter.php
  63. +1 −1 src/Routing/Error/MissingDispatcherFilterException.php
  64. +1 −1 src/Routing/Error/MissingRouteException.php
  65. +1 −1 src/Routing/Filter/LocaleSelectorFilter.php
  66. +3 −3 src/Routing/RouteBuilder.php
  67. +2 −2 src/Routing/Router.php
  68. +2 −2 src/Shell/Task/TestTask.php
  69. +2 −2 src/TestSuite/Fixture/FixtureManager.php
  70. +3 −3 src/TestSuite/Fixture/TestFixture.php
  71. +1 −1 src/Utility/Error/XmlException.php
  72. +2 −2 src/Utility/Number.php
  73. +5 −5 src/Utility/Security.php
  74. +2 −2 src/Validation/Validation.php
  75. +1 −1 src/View/Error/MissingCellException.php
  76. +1 −1 src/View/Error/MissingCellViewException.php
  77. +1 −1 src/View/Error/MissingElementException.php
  78. +1 −1 src/View/Error/MissingHelperException.php
  79. +1 −1 src/View/Error/MissingLayoutException.php
  80. +1 −1 src/View/Error/MissingViewException.php
  81. +2 −2 src/View/Helper/FormHelper.php
  82. +2 −2 src/View/Helper/NumberHelper.php
  83. +2 −2 src/View/Helper/TextHelper.php
  84. +5 −5 src/View/View.php
  85. +2 −2 src/View/ViewBlock.php
  86. +1 −1 tests/TestCase/Auth/ControllerAuthorizeTest.php
  87. +7 −7 tests/TestCase/Cache/CacheTest.php
  88. +5 −5 tests/TestCase/Cache/Engine/MemcachedEngineTest.php
  89. +1 −1 tests/TestCase/Console/ConsoleErrorHandlerTest.php
  90. +2 −2 tests/TestCase/Controller/Component/AuthComponentTest.php
  91. +1 −1 tests/TestCase/Controller/Component/RequestHandlerComponentTest.php
  92. +3 −3 tests/TestCase/Core/Configure/Engine/IniConfigTest.php
  93. +4 −4 tests/TestCase/Core/Configure/Engine/PhpConfigTest.php
  94. +1 −1 tests/TestCase/Core/ConfigureTest.php
  95. +3 −3 tests/TestCase/Core/PluginTest.php
  96. +1 −1 tests/TestCase/Database/Type/BinaryTypeTest.php
  97. +3 −3 tests/TestCase/Datasource/ConnectionManagerTest.php
  98. +1 −1 tests/TestCase/Error/DebuggerTest.php
  99. +2 −2 tests/TestCase/Error/ExceptionRendererTest.php
  100. +5 −5 tests/TestCase/Log/LogTest.php
  101. +5 −5 tests/TestCase/Network/Email/EmailTest.php
  102. +1 −1 tests/TestCase/Network/Http/Auth/OauthTest.php
  103. +2 −2 tests/TestCase/Network/Http/ClientTest.php
  104. +1 −1 tests/TestCase/Network/Http/RequestTest.php
  105. +1 −1 tests/TestCase/Network/RequestTest.php
  106. +2 −2 tests/TestCase/Network/ResponseTest.php
  107. +6 −6 tests/TestCase/ORM/BehaviorRegistryTest.php
  108. +2 −2 tests/TestCase/ORM/BehaviorTest.php
  109. +3 −3 tests/TestCase/ORM/TableTest.php
  110. +1 −1 tests/TestCase/Routing/DispatcherFilterTest.php
  111. +2 −2 tests/TestCase/Routing/RouteBuilderTest.php
  112. +1 −1 tests/TestCase/Routing/RouterTest.php
  113. +1 −1 tests/TestCase/Utility/NumberTest.php
  114. +5 −5 tests/TestCase/Utility/SecurityTest.php
  115. +1 −1 tests/TestCase/Utility/XmlTest.php
  116. +1 −1 tests/TestCase/Validation/ValidationTest.php
  117. +1 −1 tests/TestCase/View/Helper/FormHelperTest.php
  118. +1 −1 tests/TestCase/View/StringTemplateTest.php
  119. +4 −4 tests/TestCase/View/ViewTest.php
@@ -16,7 +16,7 @@
use Cake\Controller\ComponentRegistry;
use Cake\Controller\Controller;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Core\InstanceConfigTrait;
use Cake\Network\Request;
use Cake\Utility\Inflector;
@@ -94,7 +94,7 @@ public function __construct(ComponentRegistry $registry, array $config = array()
*
* @param Controller $controller null to get, a controller to set.
* @return mixed
* @throws \Cake\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function controller(Controller $controller = null) {
if ($controller) {
@@ -15,7 +15,7 @@
namespace Cake\Auth;
use Cake\Controller\Controller;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Network\Request;
/**
@@ -43,7 +43,7 @@ class ControllerAuthorize extends BaseAuthorize {
*
* @param Controller $controller null to get, a controller to set.
* @return mixed
* @throws \Cake\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function controller(Controller $controller = null) {
if ($controller) {
@@ -15,7 +15,7 @@
namespace Cake\Cache;
use Cake\Cache\Engine\NullEngine;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Core\StaticConfigTrait;
/**
@@ -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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
class Cache {
@@ -100,7 +100,7 @@ class Cache {
*
* @param string $name Name of the config array that needs an engine instance built
* @return void
* @throws \Cake\Core\Error\Exception When a cache engine cannot be created.
* @throws \Cake\Core\Exception\Exception When a cache engine cannot be created.
*/
protected static function _buildEngine($name) {
if (empty(static::$_registry)) {
@@ -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\Core\Error\Exception
* @throws Cake\Core\Exception\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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public static function groupConfigs($group = null) {
if ($group === null) {
@@ -15,7 +15,7 @@
namespace Cake\Cache;
use Cake\Core\App;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Core\ObjectRegistry;
/**
@@ -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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
protected function _throwMissingClassError($class, $plugin) {
throw new 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\Core\Error\Exception when an object doesn't implement
* @throws \Cake\Core\Exception\Exception when an object doesn't implement
* the correct interface.
*/
protected function _create($class, $alias, $config) {
@@ -16,7 +16,7 @@
use Cake\Cache\CacheEngine;
use Cake\Core\Configure;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Utility\Inflector;
/**
@@ -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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function decrement($key, $offset = 1) {
throw new 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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function increment($key, $offset = 1) {
throw new Exception('Files cannot be atomically incremented.');
@@ -15,7 +15,7 @@
namespace Cake\Cache\Engine;
use Cake\Cache\CacheEngine;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Utility\Inflector;
use \Memcached;
@@ -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\Core\Error\Exception when you try use authentication without Memcached compiled with SASL support
* @throws \Cake\Core\Exception\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\Core\Error\Exception when the Memcached extension is not built with the desired serializer engine
* @throws \Cake\Core\Exception\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\Core\Error\Exception when you try to increment with compress = true
* @throws \Cake\Core\Exception\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\Core\Error\Exception when you try to decrement with compress = true
* @throws \Cake\Core\Exception\Exception when you try to decrement with compress = true
*/
public function decrement($key, $offset = 1) {
$key = $this->_key($key);
@@ -13,7 +13,7 @@
*/
namespace Cake\Console\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Exception class for Console libraries. This exception will be thrown from Console library
@@ -13,7 +13,7 @@
*/
namespace Cake\Console\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Used when a shell cannot be found.
@@ -13,7 +13,7 @@
*/
namespace Cake\Console\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Used when a shell method cannot be found.
@@ -13,7 +13,7 @@
*/
namespace Cake\Console\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Used when a Task cannot be found.
@@ -16,7 +16,7 @@
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Utility\Inflector;
/**
@@ -100,7 +100,7 @@ public static function run($argv) {
* Defines current working environment.
*
* @return void
* @throws \Cake\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
protected function _initEnvironment() {
if (!$this->_bootstrap()) {
@@ -19,7 +19,7 @@
use Cake\Controller\Controller;
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Error;
use Cake\Error\Debugger;
use Cake\Event\Event;
@@ -484,7 +484,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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function constructAuthorize() {
if (empty($this->_config['authorize'])) {
@@ -742,7 +742,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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function constructAuthenticate() {
if (empty($this->_config['authenticate'])) {
@@ -19,7 +19,7 @@
use Cake\Controller\Controller;
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\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\Core\Error\Exception
* @throws \Cake\Core\Exception\Exception
*/
public function addInputType($type, $handler) {
if (!is_array($handler) || !isset($handler[0]) || !is_callable($handler[0])) {
@@ -14,7 +14,7 @@
*/
namespace Cake\Controller;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\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\Core\Error\Exception When request is not set.
* @throws \Cake\Core\Exception\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.
*/
@@ -13,7 +13,7 @@
*/
namespace Cake\Controller\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Missing Action exception - used when a controller action
@@ -13,7 +13,7 @@
*/
namespace Cake\Controller\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Used when a component cannot be found.
@@ -13,7 +13,7 @@
*/
namespace Cake\Controller\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Missing Controller exception - used when a controller
@@ -15,7 +15,7 @@
*/
namespace Cake\Controller\Error;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
/**
* Private Action exception - used when a controller action
@@ -17,7 +17,7 @@
use Cake\Cache\Cache;
use Cake\Core\Configure\ConfigEngineInterface;
use Cake\Core\Configure\Engine\PhpConfig;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\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\Core\Error\Exception if the adapter does not implement a `dump` method.
* @throws \Cake\Core\Exception\Exception if the adapter does not implement a `dump` method.
*/
public static function dump($key, $config = 'default', $keys = []) {
$engine = static::_getEngine($config);
@@ -16,7 +16,7 @@
use Cake\Core\Configure\ConfigEngineInterface;
use Cake\Core\Plugin;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Utility\Hash;
/**
@@ -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\Core\Error\Exception when files don't exist.
* @throws \Cake\Core\Exception\Exception when files don't exist.
* Or when files contain '..' as this could lead to abusive reads.
*/
public function read($key) {
@@ -15,7 +15,7 @@
namespace Cake\Core\Configure\Engine;
use Cake\Core\Configure\ConfigEngineInterface;
use Cake\Core\Error\Exception;
use Cake\Core\Exception\Exception;
use Cake\Core\Plugin;
/**
@@ -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\Core\Error\Exception when files don't exist or they don't contain `$config`.
* @throws \Cake\Core\Exception\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) {
@@ -11,7 +11,7 @@
* @since 3.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace Cake\Core\Error;
namespace Cake\Core\Exception;
/**
* Base class that all CakePHP Exceptions extend.
Oops, something went wrong.

0 comments on commit ef8cedf

Please sign in to comment.
You can’t perform that action at this time.