Browse Source

Merge pull request #4432 from antograssiot/3.0-move-configure

3.0 move Configure namespace to Core\Configure
José Lorenzo Rodríguez 11 years ago
parent
commit
a2cc77fa75

+ 2 - 0
config/bootstrap.php

@@ -17,5 +17,7 @@ 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';

+ 2 - 2
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\Error\Exception;
 use Cake\Utility\Hash;
 

+ 1 - 1
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()

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

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

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

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

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

+ 1 - 1
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;