From fbbb5c9337de2cfffa9dca839f51655acd7b3401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?= Date: Sat, 4 Dec 2010 02:45:22 -0430 Subject: [PATCH] Moving more clases to the new layout while trying to make controller related classes load --- .../Cake/Controller/Component/AclComponent.php | 0 .../Cake/Controller/Component/AuthComponent.php | 0 .../Cake/Controller/Component/CookieComponent.php | 0 .../Cake/Controller/Component/EmailComponent.php | 0 .../Controller/Component/RequestHandlerComponent.php | 0 .../Cake/Controller/Component/SecurityComponent.php | 0 .../Cake/Controller/Component/SessionComponent.php | 0 lib/Cake/Controller/ComponentCollection.php | 9 ++------- lib/Cake/Controller/Controller.php | 2 +- .../Cake/Network/CakeResponse.php | 0 .../Cake/Utility/ObjectCollection.php | 0 11 files changed, 3 insertions(+), 8 deletions(-) rename cake/libs/controller/components/acl.php => lib/Cake/Controller/Component/AclComponent.php (100%) rename cake/libs/controller/components/auth.php => lib/Cake/Controller/Component/AuthComponent.php (100%) rename cake/libs/controller/components/cookie.php => lib/Cake/Controller/Component/CookieComponent.php (100%) rename cake/libs/controller/components/email.php => lib/Cake/Controller/Component/EmailComponent.php (100%) rename cake/libs/controller/components/request_handler.php => lib/Cake/Controller/Component/RequestHandlerComponent.php (100%) rename cake/libs/controller/components/security.php => lib/Cake/Controller/Component/SecurityComponent.php (100%) rename cake/libs/controller/components/session.php => lib/Cake/Controller/Component/SessionComponent.php (100%) rename cake/libs/cake_response.php => lib/Cake/Network/CakeResponse.php (100%) rename cake/libs/object_collection.php => lib/Cake/Utility/ObjectCollection.php (100%) diff --git a/cake/libs/controller/components/acl.php b/lib/Cake/Controller/Component/AclComponent.php similarity index 100% rename from cake/libs/controller/components/acl.php rename to lib/Cake/Controller/Component/AclComponent.php diff --git a/cake/libs/controller/components/auth.php b/lib/Cake/Controller/Component/AuthComponent.php similarity index 100% rename from cake/libs/controller/components/auth.php rename to lib/Cake/Controller/Component/AuthComponent.php diff --git a/cake/libs/controller/components/cookie.php b/lib/Cake/Controller/Component/CookieComponent.php similarity index 100% rename from cake/libs/controller/components/cookie.php rename to lib/Cake/Controller/Component/CookieComponent.php diff --git a/cake/libs/controller/components/email.php b/lib/Cake/Controller/Component/EmailComponent.php similarity index 100% rename from cake/libs/controller/components/email.php rename to lib/Cake/Controller/Component/EmailComponent.php diff --git a/cake/libs/controller/components/request_handler.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php similarity index 100% rename from cake/libs/controller/components/request_handler.php rename to lib/Cake/Controller/Component/RequestHandlerComponent.php diff --git a/cake/libs/controller/components/security.php b/lib/Cake/Controller/Component/SecurityComponent.php similarity index 100% rename from cake/libs/controller/components/security.php rename to lib/Cake/Controller/Component/SecurityComponent.php diff --git a/cake/libs/controller/components/session.php b/lib/Cake/Controller/Component/SessionComponent.php similarity index 100% rename from cake/libs/controller/components/session.php rename to lib/Cake/Controller/Component/SessionComponent.php diff --git a/lib/Cake/Controller/ComponentCollection.php b/lib/Cake/Controller/ComponentCollection.php index 9aa589566..f17a1f729 100644 --- a/lib/Cake/Controller/ComponentCollection.php +++ b/lib/Cake/Controller/ComponentCollection.php @@ -16,7 +16,7 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::uses('ObjectCollection', 'Core'); +App::uses('ObjectCollection', 'Utility'); class ComponentCollection extends ObjectCollection { @@ -70,13 +70,8 @@ class ComponentCollection extends ObjectCollection { return $this->_loaded[$name]; } $componentClass = $name . 'Component'; + App::uses($componentClass, 'Controller/Component'); if (!class_exists($componentClass)) { - if (!App::import('Component', $component)) { - throw new MissingComponentFileException(array( - 'file' => Inflector::underscore($component) . '.php', - 'class' => $componentClass - )); - } if (!class_exists($componentClass)) { throw new MissingComponentFileException(array( 'file' => Inflector::underscore($component) . '.php', diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index a5c1ba8a1..21fce12ee 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -21,7 +21,7 @@ /** * Include files */ -App::uses('CakeResponse', 'Core'); +App::uses('CakeResponse', 'Network'); App::uses('ClassRegistry', 'Core'); App::uses('ComponentCollection', 'Controller'); App::uses('View', 'View'); diff --git a/cake/libs/cake_response.php b/lib/Cake/Network/CakeResponse.php similarity index 100% rename from cake/libs/cake_response.php rename to lib/Cake/Network/CakeResponse.php diff --git a/cake/libs/object_collection.php b/lib/Cake/Utility/ObjectCollection.php similarity index 100% rename from cake/libs/object_collection.php rename to lib/Cake/Utility/ObjectCollection.php