From 304f12d0edde3347bce6b79c26dabcf415f26b29 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 5 Feb 2011 01:28:41 -0500 Subject: [PATCH] Removing a pointless import in CakeRequest. Moving inclusion of ObjectCollection to bootstrap. This avoids repetitive calls to import() --- cake/bootstrap.php | 1 + cake/console/libs/task_collection.php | 2 -- cake/libs/cake_request.php | 1 - cake/libs/controller/component_collection.php | 2 -- cake/libs/model/behavior_collection.php | 2 -- cake/libs/view/helper_collection.php | 2 -- 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/cake/bootstrap.php b/cake/bootstrap.php index 65931eb39..aa30770fc 100644 --- a/cake/bootstrap.php +++ b/cake/bootstrap.php @@ -27,6 +27,7 @@ require CORE_PATH . 'cake' . DS . 'basics.php'; require CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php'; require LIBS . 'error' . DS . 'exceptions.php'; require LIBS . 'object.php'; +require LIBS . 'object_collection.php'; require LIBS . 'inflector.php'; require LIBS . 'app.php'; require LIBS . 'configure.php'; diff --git a/cake/console/libs/task_collection.php b/cake/console/libs/task_collection.php index df29d3d26..da476f220 100644 --- a/cake/console/libs/task_collection.php +++ b/cake/console/libs/task_collection.php @@ -15,8 +15,6 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'ObjectCollection'); - class TaskCollection extends ObjectCollection { /** * Shell to use to set params to tasks. diff --git a/cake/libs/cake_request.php b/cake/libs/cake_request.php index b7a10058e..90ffa8cbf 100644 --- a/cake/libs/cake_request.php +++ b/cake/libs/cake_request.php @@ -15,7 +15,6 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Set'); /** * A class that helps wrap Request information and particulars about a single request. diff --git a/cake/libs/controller/component_collection.php b/cake/libs/controller/component_collection.php index 2a483cc21..07a2a6eef 100644 --- a/cake/libs/controller/component_collection.php +++ b/cake/libs/controller/component_collection.php @@ -15,8 +15,6 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'ObjectCollection'); - class ComponentCollection extends ObjectCollection { /** diff --git a/cake/libs/model/behavior_collection.php b/cake/libs/model/behavior_collection.php index 30c9c1469..8bd92198f 100644 --- a/cake/libs/model/behavior_collection.php +++ b/cake/libs/model/behavior_collection.php @@ -18,8 +18,6 @@ * @since CakePHP(tm) v 1.2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'ObjectCollection'); - /** * Model behavior collection class. * diff --git a/cake/libs/view/helper_collection.php b/cake/libs/view/helper_collection.php index d90289e21..c967ec676 100644 --- a/cake/libs/view/helper_collection.php +++ b/cake/libs/view/helper_collection.php @@ -15,8 +15,6 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'ObjectCollection'); - class HelperCollection extends ObjectCollection { /**