Skip to content

Commit d12b1b4

Browse files
committed
Moving Cake\Error\Exception to Cake\Core\Error
1 parent ce94b81 commit d12b1b4

File tree

114 files changed

+213
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+213
-211
lines changed

src/Auth/BaseAuthorize.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ abstract public function authorize($user, Request $request);
9494
*
9595
* @param Controller $controller null to get, a controller to set.
9696
* @return mixed
97-
* @throws \Cake\Error\Exception
97+
* @throws \Cake\Core\Error\Exception
9898
*/
9999
public function controller(Controller $controller = null) {
100100
if ($controller) {

src/Auth/ControllerAuthorize.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ControllerAuthorize extends BaseAuthorize {
4343
*
4444
* @param Controller $controller null to get, a controller to set.
4545
* @return mixed
46-
* @throws \Cake\Error\Exception
46+
* @throws \Cake\Core\Error\Exception
4747
*/
4848
public function controller(Controller $controller = null) {
4949
if ($controller) {

src/Cache/Cache.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
* @param string $name Name of the configuration
6262
* @param array $config Optional associative array of settings passed to the engine
6363
* @return array [engine, settings] on success, false on failure
64-
* @throws \Cake\Error\Exception
64+
* @throws \Cake\Core\Error\Exception
6565
*/
6666
class Cache {
6767

@@ -213,7 +213,7 @@ public static function write($key, $value, $config = 'default') {
213213
* @param array $data An array of data to be stored in the cache
214214
* @param string $config Optional string configuration name to write to. Defaults to 'default'
215215
* @return array of bools for each key provided, indicating true for success or false for fail
216-
* @throws \Cake\Error\Exception
216+
* @throws \Cake\Core\Error\Exception
217217
*/
218218
public static function writeMany($data, $config = 'default') {
219219
$engine = static::engine($config);
@@ -394,7 +394,7 @@ public static function clearGroup($group, $config = 'default') {
394394
*
395395
* @param string $group group name or null to retrieve all group mappings
396396
* @return array map of group and all configuration that has the same group
397-
* @throws \Cake\Error\Exception
397+
* @throws \Cake\Core\Error\Exception
398398
*/
399399
public static function groupConfigs($group = null) {
400400
if ($group === null) {

src/Cache/CacheRegistry.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function _resolveClassName($class) {
4848
* @param string $class The classname that is missing.
4949
* @param string $plugin The plugin the cache is missing in.
5050
* @return void
51-
* @throws \Cake\Error\Exception
51+
* @throws \Cake\Core\Error\Exception
5252
*/
5353
protected function _throwMissingClassError($class, $plugin) {
5454
throw new Error\Exception(sprintf('Cache engine %s is not available.', $class));
@@ -63,7 +63,7 @@ protected function _throwMissingClassError($class, $plugin) {
6363
* @param string $alias The alias of the object.
6464
* @param array $config An array of settings to use for the cache engine.
6565
* @return CacheEngine The constructed CacheEngine class.
66-
* @throws \Cake\Error\Exception when an object doesn't implement
66+
* @throws \Cake\Core\Error\Exception when an object doesn't implement
6767
* the correct interface.
6868
*/
6969
protected function _create($class, $alias, $config) {

src/Cache/Engine/FileEngine.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ protected function _clearDirectory($path, $now, $threshold) {
320320
* @param string $key The key to decrement
321321
* @param int $offset The number to offset
322322
* @return void
323-
* @throws \Cake\Error\Exception
323+
* @throws \Cake\Core\Error\Exception
324324
*/
325325
public function decrement($key, $offset = 1) {
326326
throw new Error\Exception('Files cannot be atomically decremented.');
@@ -332,7 +332,7 @@ public function decrement($key, $offset = 1) {
332332
* @param string $key The key to decrement
333333
* @param int $offset The number to offset
334334
* @return void
335-
* @throws \Cake\Error\Exception
335+
* @throws \Cake\Core\Error\Exception
336336
*/
337337
public function increment($key, $offset = 1) {
338338
throw new Error\Exception('Files cannot be atomically incremented.');

src/Cache/Engine/MemcachedEngine.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class MemcachedEngine extends CacheEngine {
9494
*
9595
* @param array $config array of setting for the engine
9696
* @return bool True if the engine has been successfully initialized, false if not
97-
* @throws \Cake\Error\Exception when you try use authentication without Memcached compiled with SASL support
97+
* @throws \Cake\Core\Error\Exception when you try use authentication without Memcached compiled with SASL support
9898
*/
9999
public function init(array $config = []) {
100100
if (!class_exists('Memcached')) {
@@ -166,7 +166,7 @@ public function init(array $config = []) {
166166
* Settings the memcached instance
167167
*
168168
* @return void
169-
* @throws \Cake\Error\Exception when the Memcached extension is not built with the desired serializer engine
169+
* @throws \Cake\Core\Error\Exception when the Memcached extension is not built with the desired serializer engine
170170
*/
171171
protected function _setOptions() {
172172
$this->_Memcached->setOption(Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
@@ -303,7 +303,7 @@ public function readMany($keys) {
303303
* @param string $key Identifier for the data
304304
* @param int $offset How much to increment
305305
* @return bool|int New incremented value, false otherwise
306-
* @throws \Cake\Error\Exception when you try to increment with compress = true
306+
* @throws \Cake\Core\Error\Exception when you try to increment with compress = true
307307
*/
308308
public function increment($key, $offset = 1) {
309309
$key = $this->_key($key);
@@ -317,7 +317,7 @@ public function increment($key, $offset = 1) {
317317
* @param string $key Identifier for the data
318318
* @param int $offset How much to subtract
319319
* @return bool|int New decremented value, false otherwise
320-
* @throws \Cake\Error\Exception when you try to decrement with compress = true
320+
* @throws \Cake\Core\Error\Exception when you try to decrement with compress = true
321321
*/
322322
public function decrement($key, $offset = 1) {
323323
$key = $this->_key($key);

src/Configure/Engine/IniConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function __construct($path = null, $section = null) {
9292
* @param string $key The identifier to read from. If the key has a . it will be treated
9393
* as a plugin prefix. The chosen file must be on the engine's path.
9494
* @return array Parsed configuration values.
95-
* @throws \Cake\Error\Exception when files don't exist.
95+
* @throws \Cake\Core\Error\Exception when files don't exist.
9696
* Or when files contain '..' as this could lead to abusive reads.
9797
*/
9898
public function read($key) {

src/Configure/Engine/PhpConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function __construct($path = null) {
5555
* @param string $key The identifier to read from. If the key has a . it will be treated
5656
* as a plugin prefix.
5757
* @return array Parsed configuration values.
58-
* @throws \Cake\Error\Exception when files don't exist or they don't contain `$config`.
58+
* @throws \Cake\Core\Error\Exception when files don't exist or they don't contain `$config`.
5959
* Or when files contain '..' as this could lead to abusive reads.
6060
*/
6161
public function read($key) {

src/Console/Error/ConsoleException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
namespace Cake\Console\Error;
1515

16-
use Cake\Error\Exception;
16+
use Cake\Core\Error\Exception;
1717

1818
/**
1919
* Exception class for Console libraries. This exception will be thrown from Console library

src/Console/Error/MissingShellException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
namespace Cake\Console\Error;
1515

16-
use Cake\Error\Exception;
16+
use Cake\Core\Error\Exception;
1717

1818
/**
1919
* Used when a shell cannot be found.

0 commit comments

Comments
 (0)