Merge remote-tracking branch 'origin/3.0' into 3.0-move-exception

Conflicts:
	src/Cache/CacheRegistry.php
	src/Core/Configure.php

CONTRIBUTING.md

@@ -34,7 +34,7 @@ chance of keeping on top of things.
 * Core test cases should continue to pass. You can run tests locally or enable
   [travis-ci](https://travis-ci.org/) for your fork, so all tests and codesniffs
   will be executed.
-* Your work should apply the [CakePHP coding standards](http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html).
+* Your work should apply the [CakePHP coding standards](http://book.cakephp.org/3.0/en/contributing/cakephp-coding-conventions.html).
 
 ## Which branch to base the work
 

config/bootstrap.php

@@ -15,4 +15,9 @@
 
 define('TIME_START', microtime(true));
 
+// Compatibility aliases. These will be removed for the first RC release.
+class_alias('Cake\Error\Debugger', 'Cake\Utility\Debugger');
+class_alias('Cake\Core\Configure\Engine\PhpConfig', 'Cake\Configure\Engine\PhpConfig');
+class_alias('Cake\Core\Configure\Engine\IniConfig', 'Cake\Configure\Engine\IniConfig');
+
 require CAKE . 'basics.php';

src/Cache/CacheRegistry.php

@@ -16,7 +16,7 @@ namespace Cake\Cache;
 
 use Cake\Core\App;
 use Cake\Core\Error\Exception;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 
 /**
  * An object registry for cache engines.
@@ -28,7 +28,7 @@ class CacheRegistry extends ObjectRegistry {
 /**
  * Resolve a cache engine classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -43,7 +43,7 @@ class CacheRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a cache engine is missing.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the cache is missing in.
@@ -57,7 +57,7 @@ class CacheRegistry extends ObjectRegistry {
 /**
  * Create the cache engine instance.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string|CacheEngine $class The classname or object to make.
  * @param string $alias The alias of the object.

src/Console/TaskRegistry.php

@@ -15,7 +15,7 @@
 namespace Cake\Console;
 
 use Cake\Core\App;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 
 /**
  * Registry for Tasks. Provides features
@@ -42,7 +42,7 @@ class TaskRegistry extends ObjectRegistry {
 /**
  * Resolve a task classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -54,7 +54,7 @@ class TaskRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a task is missing.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the task is missing in.
@@ -71,7 +71,7 @@ class TaskRegistry extends ObjectRegistry {
 /**
  * Create the task instance.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname to create.
  * @param string $alias The alias of the task.

src/Controller/Component/AuthComponent.php

@@ -20,11 +20,11 @@ use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Error;
+use Cake\Error\Debugger;
 use Cake\Event\Event;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\Routing\Router;
-use Cake\Utility\Debugger;
 use Cake\Utility\Hash;
 
 /**

src/Controller/ComponentRegistry.php

@@ -16,7 +16,7 @@ namespace Cake\Controller;
 
 use Cake\Core\App;
 use Cake\Event\EventManagerTrait;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 
 /**
  * ComponentRegistry is a registry for loaded components
@@ -58,7 +58,7 @@ class ComponentRegistry extends ObjectRegistry {
 /**
  * Resolve a component classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -70,7 +70,7 @@ class ComponentRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a component is missing.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the component is missing in.
@@ -87,7 +87,7 @@ class ComponentRegistry extends ObjectRegistry {
 /**
  * Create the component instance.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  * Enabled components will be registered with the event manager.
  *
  * @param string $class The classname to create.

src/Core/Configure.php

@@ -15,8 +15,8 @@
 namespace Cake\Core;
 
 use Cake\Cache\Cache;
-use Cake\Configure\ConfigEngineInterface;
-use Cake\Configure\Engine\PhpConfig;
+use Cake\Core\Configure\ConfigEngineInterface;
+use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\Error\Exception;
 use Cake\Utility\Hash;
 

src/Configure/ConfigEngineInterface.php

@@ -12,7 +12,7 @@
  * @since         1.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Configure;
+namespace Cake\Core\Configure;
 
 /**
  * An interface for creating objects compatible with Configure::load()

src/Configure/Engine/IniConfig.php

@@ -12,9 +12,9 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Configure\Engine;
+namespace Cake\Core\Configure\Engine;
 
-use Cake\Configure\ConfigEngineInterface;
+use Cake\Core\Configure\ConfigEngineInterface;
 use Cake\Core\Plugin;
 use Cake\Error;
 use Cake\Utility\Hash;

src/Configure/Engine/PhpConfig.php

@@ -12,9 +12,9 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Configure\Engine;
+namespace Cake\Core\Configure\Engine;
 
-use Cake\Configure\ConfigEngineInterface;
+use Cake\Core\Configure\ConfigEngineInterface;
 use Cake\Core\Plugin;
 use Cake\Error;
 

src/Utility/ConventionsTrait.php

@@ -12,7 +12,7 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\Core;
 
 use Cake\Core\App;
 use Cake\Core\Plugin;

src/Utility/ObjectRegistry.php

@@ -12,7 +12,7 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\Core;
 
 /**
  * Acts as a registry/factory for objects.

src/Datasource/ConnectionRegistry.php

@@ -16,7 +16,7 @@ namespace Cake\Datasource;
 
 use Cake\Core\App;
 use Cake\Datasource\Error\MissingDatasourceException;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 
 /**
  * A registry object for connection instances.
@@ -28,7 +28,7 @@ class ConnectionRegistry extends ObjectRegistry {
 /**
  * Resolve a driver classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -43,7 +43,7 @@ class ConnectionRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a driver is missing
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the driver is missing in.
@@ -60,7 +60,7 @@ class ConnectionRegistry extends ObjectRegistry {
 /**
  * Create the connection object with the correct settings.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string|object $class The classname or object to make.
  * @param string $alias The alias of the object.

src/Error/BaseErrorHandler.php

@@ -15,9 +15,9 @@
 namespace Cake\Error;
 
 use Cake\Core\Configure;
+use Cake\Error\Debugger;
 use Cake\Log\Log;
 use Cake\Routing\Router;
-use Cake\Utility\Debugger;
 
 /**
  * Base error handler that provides logic common to the CLI + web

src/Utility/Debugger.php

@@ -12,11 +12,13 @@
  * @since         1.2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Utility;
+namespace Cake\Error;
 
 use Cake\Core\Configure;
 use Cake\Core\Error\Exception;
 use Cake\Log\Log;
+use Cake\Utility\Hash;
+use Cake\Utility\String;
 
 /**
  * Provide custom logging and error handling.

src/Error/ErrorHandler.php

@@ -17,7 +17,7 @@
 namespace Cake\Error;
 
 use Cake\Core\App;
-use Cake\Utility\Debugger;
+use Cake\Error\Debugger;
 
 /**
  * Error Handler provides basic error and exception handling for your application. It captures and

src/Log/LogEngineRegistry.php

@@ -17,7 +17,7 @@ namespace Cake\Log;
 use Cake\Core\App;
 use Cake\Error;
 use Cake\Log\LogInterface;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 
 /**
  * Registry of loaded log engines
@@ -27,7 +27,7 @@ class LogEngineRegistry extends ObjectRegistry {
 /**
  * Resolve a logger classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -43,7 +43,7 @@ class LogEngineRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a logger is missing.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the logger is missing in.
@@ -57,7 +57,7 @@ class LogEngineRegistry extends ObjectRegistry {
 /**
  * Create the logger instance.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string|LogInterface $class The classname or object to make.
  * @param string $alias The alias of the object.

src/ORM/BehaviorRegistry.php

@@ -19,7 +19,7 @@ use Cake\Core\Error\Exception;
 use Cake\Event\EventManagerTrait;
 use Cake\ORM\Behavior;
 use Cake\ORM\Table;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 
 /**
  * BehaviorRegistry is used as a registry for loaded behaviors and handles loading
@@ -65,7 +65,7 @@ class BehaviorRegistry extends ObjectRegistry {
 /**
  * Resolve a behavior classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -77,7 +77,7 @@ class BehaviorRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a behavior is missing.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the behavior is missing in.
@@ -94,7 +94,7 @@ class BehaviorRegistry extends ObjectRegistry {
 /**
  * Create the behavior instance.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  * Enabled behaviors will be registered with the event manager.
  *
  * @param string $class The classname that is missing.

src/Shell/BakeShell.php

@@ -20,7 +20,7 @@ use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Datasource\ConnectionManager;
 use Cake\Model\Model;
-use Cake\Utility\ConventionsTrait;
+use Cake\Core\ConventionsTrait;
 use Cake\Utility\Inflector;
 
 /**

src/Shell/Task/BakeTask.php

@@ -17,7 +17,7 @@ namespace Cake\Shell\Task;
 use Cake\Cache\Cache;
 use Cake\Console\Shell;
 use Cake\Core\Configure;
-use Cake\Utility\ConventionsTrait;
+use Cake\Core\ConventionsTrait;
 
 /**
  * Base class for Bake Tasks.

src/Shell/Task/TemplateTask.php

@@ -17,7 +17,7 @@ namespace Cake\Shell\Task;
 use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Plugin;
-use Cake\Utility\ConventionsTrait;
+use Cake\Core\ConventionsTrait;
 use Cake\Utility\Folder;
 use Cake\View\ViewVarsTrait;
 

src/Template/Element/exception_stack_trace.ctp

@@ -14,7 +14,7 @@
  * @since         1.3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-use Cake\Utility\Debugger;
+use Cake\Error\Debugger;
 ?>
 <h3>Stack Trace</h3>
 <ul class="cake-stack-trace">

src/Template/Error/missing_route.ctp

@@ -14,7 +14,7 @@
  */
 
 use Cake\Routing\Router;
-use Cake\Utility\Debugger;
+use Cake\Error\Debugger;
 
 ?>
 <h2>Missing Route</h2>

src/Template/Error/pdo_error.ctp

@@ -12,7 +12,7 @@
  * @since         0.10.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-use Cake\Utility\Debugger;
+use Cake\Error\Debugger;
 ?>
 <h2>Database Error</h2>
 <p class="error">

src/TestSuite/ControllerTestCase.php

@@ -201,13 +201,13 @@ abstract class ControllerTestCase extends TestCase {
  * @param string $name The name of the function
  * @param array $arguments Array of arguments
  * @return the return of _testAction
- * @throws \Cake\Error\BadMethodCallException when you call methods that don't exist.
+ * @throws \BadMethodCallException when you call methods that don't exist.
  */
 	public function __call($name, $arguments) {
 		if ($name === 'testAction') {
 			return call_user_func_array(array($this, '_testAction'), $arguments);
 		}
-		throw new Error\BadMethodCallException("Method '{$name}' does not exist.");
+		throw new \BadMethodCallException("Method '{$name}' does not exist.");
 	}
 
 /**

src/Validation/Validator.php

@@ -23,7 +23,7 @@ use Cake\Validation\ValidationSet;
  *
  * Implements ArrayAccess to easily modify rules in the set
  *
- * @link http://book.cakephp.org/2.0/en/data-validation.html
+ * @link http://book.cakephp.org/3.0/en/core-libraries/validation.html
  */
 class Validator implements \ArrayAccess, \IteratorAggregate, \Countable {
 
@@ -248,7 +248,7 @@ class Validator implements \ArrayAccess, \IteratorAggregate, \Countable {
  *		));
  * }}}
  *
- * @param string $field The name of the field from wich the rule will be removed
+ * @param string $field The name of the field from which the rule will be removed
  * @param array|string $name The alias for a single rule or multiple rules array
  * @param array|\Cake\Validation\ValidationRule $rule the rule to add
  * @return Validator this instance

src/View/HelperRegistry.php

@@ -16,7 +16,7 @@ namespace Cake\View;
 
 use Cake\Core\App;
 use Cake\Event\EventManagerTrait;
-use Cake\Utility\ObjectRegistry;
+use Cake\Core\ObjectRegistry;
 use Cake\View\View;
 
 /**
@@ -94,7 +94,7 @@ class HelperRegistry extends ObjectRegistry {
 /**
  * Resolve a helper classname.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class Partial classname to resolve.
  * @return string|false Either the correct classname or false.
@@ -106,7 +106,7 @@ class HelperRegistry extends ObjectRegistry {
 /**
  * Throws an exception when a helper is missing.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  *
  * @param string $class The classname that is missing.
  * @param string $plugin The plugin the helper is missing in.
@@ -123,7 +123,7 @@ class HelperRegistry extends ObjectRegistry {
 /**
  * Create the helper instance.
  *
- * Part of the template method for Cake\Utility\ObjectRegistry::load()
+ * Part of the template method for Cake\Core\ObjectRegistry::load()
  * Enabled helpers will be registered with the event manager.
  *
  * @param string $class The class to create.

src/View/StringTemplate.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\View;
 
-use Cake\Configure\Engine\PhpConfig;
+use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\InstanceConfigTrait;
 
 /**

src/basics.php

@@ -13,10 +13,10 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 use Cake\Cache\Cache;
+use Cake\Collection\Collection;
 use Cake\Core\Configure;
+use Cake\Error\Debugger;
 use Cake\I18n\I18n;
-use Cake\Utility\Debugger;
-use Cake\Collection\Collection;
 
 /**
  * Basic defines for timing functions.

tests/TestCase/BasicsTest.php

@@ -502,13 +502,13 @@ EXPECTED;
  */
 	public function testStackTrace() {
 		ob_start();
-		list($r, $expected) = [stackTrace(), \Cake\Utility\Debugger::trace()];
+		list($r, $expected) = [stackTrace(), \Cake\Error\Debugger::trace()];
 		$result = ob_get_clean();
 		$this->assertEquals($expected, $result);
 
 		$opts = ['args' => true];
 		ob_start();
-		list($r, $expected) = [stackTrace($opts), \Cake\Utility\Debugger::trace($opts)];
+		list($r, $expected) = [stackTrace($opts), \Cake\Error\Debugger::trace($opts)];
 		$result = ob_get_clean();
 		$this->assertEquals($expected, $result);
 	}

tests/TestCase/Configure/Engine/IniConfigTest.php

@@ -12,10 +12,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Configure\Engine;
+namespace Cake\Test\TestCase\Core\Configure\Engine;
 
-use Cake\Configure\Engine\IniConfig;
 use Cake\Core\App;
+use Cake\Core\Configure\Engine\IniConfig;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 

tests/TestCase/Configure/Engine/PhpConfigTest.php

@@ -12,10 +12,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Configure\Engine;
+namespace Cake\Test\TestCase\Core\Configure\Engine;
 
-use Cake\Configure\Engine\PhpConfig;
 use Cake\Core\App;
+use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 

tests/TestCase/Core/ConfigureTest.php

@@ -15,9 +15,9 @@
 namespace Cake\Test\TestCase\Core;
 
 use Cake\Cache\Cache;
-use Cake\Configure\Engine\PhpConfig;
 use Cake\Core\App;
 use Cake\Core\Configure;
+use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 

tests/TestCase/Utility/DebuggerTest.php

@@ -12,13 +12,13 @@
  * @since         1.2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Utility;
+namespace Cake\Test\TestCase\Error;
 
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
+use Cake\Error\Debugger;
 use Cake\Log\Log;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Debugger;
 use Cake\View\View;
 
 /**
@@ -117,7 +117,7 @@ class DebuggerTest extends TestCase {
  * @return void
  */
 	public function testOutput() {
-		set_error_handler('Cake\Utility\Debugger::showError');
+		set_error_handler('Cake\Error\Debugger::showError');
 		$this->_restoreError = true;
 
 		$result = Debugger::output(false);
@@ -174,7 +174,7 @@ class DebuggerTest extends TestCase {
  * @return void
  */
 	public function testChangeOutputFormats() {
-		set_error_handler('Cake\Utility\Debugger::showError');
+		set_error_handler('Cake\Error\Debugger::showError');
 		$this->_restoreError = true;
 
 		Debugger::output('js', array(
@@ -233,7 +233,7 @@ class DebuggerTest extends TestCase {
  * @return void
  */
 	public function testAddFormat() {
-		set_error_handler('Cake\Utility\Debugger::showError');
+		set_error_handler('Cake\Error\Debugger::showError');
 		$this->_restoreError = true;
 
 		Debugger::addFormat('js', array(
@@ -272,7 +272,7 @@ class DebuggerTest extends TestCase {
  * @return void
  */
 	public function testAddFormatCallback() {
-		set_error_handler('Cake\Utility\Debugger::showError');
+		set_error_handler('Cake\Error\Debugger::showError');
 		$this->_restoreError = true;
 
 		Debugger::addFormat('callback', array('callback' => array($this, 'customFormat')));
@@ -559,7 +559,7 @@ TEXT;
  */
 	public function testGetInstance() {
 		$result = Debugger::getInstance();
-		$this->assertInstanceOf('Cake\Utility\Debugger', $result);
+		$this->assertInstanceOf('Cake\Error\Debugger', $result);
 
 		$result = Debugger::getInstance(__NAMESPACE__ . '\DebuggerTestCaseDebugger');
 		$this->assertInstanceOf(__NAMESPACE__ . '\DebuggerTestCaseDebugger', $result);
@@ -567,8 +567,8 @@ TEXT;
 		$result = Debugger::getInstance();
 		$this->assertInstanceOf(__NAMESPACE__ . '\DebuggerTestCaseDebugger', $result);
 
-		$result = Debugger::getInstance('Cake\Utility\Debugger');
-		$this->assertInstanceOf('Cake\Utility\Debugger', $result);
+		$result = Debugger::getInstance('Cake\Error\Debugger');
+		$this->assertInstanceOf('Cake\Error\Debugger', $result);
 	}
 
 /**
@@ -623,12 +623,12 @@ TEXT;
  */
 	public function testTraceExclude() {
 		$result = Debugger::trace();
-		$this->assertRegExp('/^Cake\\\Test\\\TestCase\\\Utility\\\DebuggerTest::testTraceExclude/', $result);
+		$this->assertRegExp('/^Cake\\\Test\\\TestCase\\\Error\\\DebuggerTest::testTraceExclude/', $result);
 
 		$result = Debugger::trace(array(
-			'exclude' => array('Cake\Test\TestCase\Utility\DebuggerTest::testTraceExclude')
+			'exclude' => array('Cake\Test\TestCase\Error\DebuggerTest::testTraceExclude')
 		));
-		$this->assertNotRegExp('/^Cake\\\Test\\\TestCase\\\Utility\\\DebuggerTest::testTraceExclude/', $result);
+		$this->assertNotRegExp('/^Cake\\\Test\\\TestCase\\\Error\\\DebuggerTest::testTraceExclude/', $result);
 	}
 
 /**
@@ -640,10 +640,10 @@ TEXT;
 		$object = new DebuggableThing();
 		$result = Debugger::exportVar($object, 2);
 		$expected = <<<eos
-object(Cake\Test\TestCase\Utility\DebuggableThing) {
+object(Cake\Test\TestCase\Error\DebuggableThing) {
 
 	'foo' => 'bar',
-	'inner' => object(Cake\Test\TestCase\Utility\DebuggableThing) {}
+	'inner' => object(Cake\Test\TestCase\Error\DebuggableThing) {}
 
 }
 eos;

tests/test_app/TestApp/Template/Pages/home.ctp

@@ -4,7 +4,7 @@ use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Datasource\ConnectionManager;
 use Cake\Error;
-use Cake\Utility\Debugger;
+use Cake\Error\Debugger;
 use Cake\Validation\Validation;
 
 if (!Configure::read('debug')):
@@ -19,8 +19,8 @@ endif;
 <?php if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')): ?>
 <p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
 	URL rewriting is not properly configured on your server.
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
-	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
+	1) <a target="_blank" href="http://book.cakephp.org/3.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
+	2) <a target="_blank" href="http://book.cakephp.org/3.0/en/development/configuration.html#core-configuration-baseurl" style="color:#fff;">I don't / can't use URL rewriting</a>
 </p>
 <?php endif; ?>
 
@@ -103,8 +103,8 @@ You can also add some CSS styles for your pages at: APP/webroot/css.;
 <p>
 	<?php
 		echo $this->Html->link(
-			'<strong>New</strong> CakePHP 2.0 Docs',
-			'http://book.cakephp.org/2.0/en/',
+			'<strong>New</strong> CakePHP 3.0 Docs',
+			'http://book.cakephp.org/3.0/en/',
 			array('target' => '_blank', 'escape' => false)
 		);
 	?>
@@ -113,7 +113,7 @@ You can also add some CSS styles for your pages at: APP/webroot/css.;
 	<?php
 		echo $this->Html->link(
 			'The 15 min Blog Tutorial',
-			'http://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
+			'http://book.cakephp.org/3.0/en/getting-started.html#blog-tutorial',
 			array('target' => '_blank', 'escape' => false)
 		);
 	?>