Browse Source

Move Utility/Debugger to Error/Debugger.

ADmad 11 years ago
parent
commit
bf51a2b2b2
3 changed files with 12 additions and 10 deletions
  1. 3 1
      src/Utility/Debugger.php
  2. 2 2
      src/basics.php
  3. 7 7
      tests/TestCase/Utility/DebuggerTest.php

+ 3 - 1
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\Error\Exception;
 use Cake\Log\Log;
+use Cake\Utility\Hash;
+use Cake\Utility\String;
 
 /**
  * Provide custom logging and error handling.

+ 2 - 2
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.

+ 7 - 7
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;
 
 /**
@@ -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;