Removing a pointless import in CakeRequest.

Moving inclusion of ObjectCollection to bootstrap. This avoids repetitive calls to import()
cakephp · Feb 5, 2011 · 304f12d · 304f12d
1 parent 8e267f7
commit 304f12d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 9 deletions.
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
@@ -27,6 +27,7 @@
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {
 
 /**