From 2903356ea3bc22ab87f522ef7cc58d5a9d476c2f Mon Sep 17 00:00:00 2001 From: antograssiot Date: Fri, 29 Aug 2014 18:22:17 +0200 Subject: [PATCH] move Configure namespace to Core\Configure --- src/Core/Configure.php | 4 ++-- src/{ => Core}/Configure/ConfigEngineInterface.php | 2 +- src/{ => Core}/Configure/Engine/IniConfig.php | 4 ++-- src/{ => Core}/Configure/Engine/PhpConfig.php | 4 ++-- src/View/StringTemplate.php | 2 +- tests/TestCase/{ => Core}/Configure/Engine/IniConfigTest.php | 4 ++-- tests/TestCase/{ => Core}/Configure/Engine/PhpConfigTest.php | 4 ++-- tests/TestCase/Core/ConfigureTest.php | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename src/{ => Core}/Configure/ConfigEngineInterface.php (97%) rename src/{ => Core}/Configure/Engine/IniConfig.php (98%) rename src/{ => Core}/Configure/Engine/PhpConfig.php (97%) rename tests/TestCase/{ => Core}/Configure/Engine/IniConfigTest.php (98%) rename tests/TestCase/{ => Core}/Configure/Engine/PhpConfigTest.php (97%) diff --git a/src/Core/Configure.php b/src/Core/Configure.php index 648eb242367..0e3fde082aa 100644 --- a/src/Core/Configure.php +++ b/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; diff --git a/src/Configure/ConfigEngineInterface.php b/src/Core/Configure/ConfigEngineInterface.php similarity index 97% rename from src/Configure/ConfigEngineInterface.php rename to src/Core/Configure/ConfigEngineInterface.php index d5129803f52..225912d6c0d 100644 --- a/src/Configure/ConfigEngineInterface.php +++ b/src/Core/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() diff --git a/src/Configure/Engine/IniConfig.php b/src/Core/Configure/Engine/IniConfig.php similarity index 98% rename from src/Configure/Engine/IniConfig.php rename to src/Core/Configure/Engine/IniConfig.php index f6813dbaa9f..34f7f53c2d8 100644 --- a/src/Configure/Engine/IniConfig.php +++ b/src/Core/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; diff --git a/src/Configure/Engine/PhpConfig.php b/src/Core/Configure/Engine/PhpConfig.php similarity index 97% rename from src/Configure/Engine/PhpConfig.php rename to src/Core/Configure/Engine/PhpConfig.php index 5fb76e8b6f9..db1662fd4fb 100644 --- a/src/Configure/Engine/PhpConfig.php +++ b/src/Core/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; diff --git a/src/View/StringTemplate.php b/src/View/StringTemplate.php index db01c7902c2..ed8ace64b04 100644 --- a/src/View/StringTemplate.php +++ b/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; /** diff --git a/tests/TestCase/Configure/Engine/IniConfigTest.php b/tests/TestCase/Core/Configure/Engine/IniConfigTest.php similarity index 98% rename from tests/TestCase/Configure/Engine/IniConfigTest.php rename to tests/TestCase/Core/Configure/Engine/IniConfigTest.php index eee9a7808db..07c928c7be7 100644 --- a/tests/TestCase/Configure/Engine/IniConfigTest.php +++ b/tests/TestCase/Core/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; diff --git a/tests/TestCase/Configure/Engine/PhpConfigTest.php b/tests/TestCase/Core/Configure/Engine/PhpConfigTest.php similarity index 97% rename from tests/TestCase/Configure/Engine/PhpConfigTest.php rename to tests/TestCase/Core/Configure/Engine/PhpConfigTest.php index 6385b80d1e3..ca190ad0690 100644 --- a/tests/TestCase/Configure/Engine/PhpConfigTest.php +++ b/tests/TestCase/Core/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; diff --git a/tests/TestCase/Core/ConfigureTest.php b/tests/TestCase/Core/ConfigureTest.php index fa13ba25f8a..01f714855b1 100644 --- a/tests/TestCase/Core/ConfigureTest.php +++ b/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;