From 1e3865acc7a684be350b5ffcaca3aa7685a31ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=BCttner?= Date: Mon, 18 Nov 2013 11:56:00 +0100 Subject: [PATCH] formatting app::uses blocks (refs #2265) --- app/Controller/AppController.php | 1 + app/Controller/PagesController.php | 1 + app/View/Helper/AppHelper.php | 1 + lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php | 1 + lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php | 1 + lib/Cake/Test/Case/BasicsTest.php | 1 + lib/Cake/Test/Case/Console/TaskCollectionTest.php | 1 + lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php | 1 + lib/Cake/Test/Case/Log/LogEngineCollectionTest.php | 1 + lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php | 1 + lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php | 1 + lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php | 1 + lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php | 1 + lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php | 1 + lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php | 1 + lib/Cake/Test/Case/Model/BehaviorCollectionTest.php | 1 + lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php | 1 + lib/Cake/Test/Case/Model/ModelIntegrationTest.php | 1 + lib/Cake/Test/Case/Model/ModelTestBase.php | 1 + lib/Cake/Test/bake_compare/Controller/NoActions.ctp | 2 ++ lib/Cake/Test/bake_compare/Controller/NoHelpersOrComponents.ctp | 2 ++ lib/Cake/Test/bake_compare/Controller/Scaffold.ctp | 2 ++ .../Test/test_app/Model/Datasource/Database/TestLocalDriver.php | 2 ++ .../Plugin/TestPlugin/Model/Datasource/Database/DboDummy.php | 1 + .../test_app/Plugin/TestPlugin/Model/Datasource/TestSource.php | 1 + 25 files changed, 29 insertions(+) diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php index 55316850c..c1999b330 100644 --- a/app/Controller/AppController.php +++ b/app/Controller/AppController.php @@ -20,6 +20,7 @@ * @since CakePHP(tm) v 0.2.9 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ + App::uses('Controller', 'Controller'); /** diff --git a/app/Controller/PagesController.php b/app/Controller/PagesController.php index 7c428d827..7dbe8c563 100644 --- a/app/Controller/PagesController.php +++ b/app/Controller/PagesController.php @@ -19,6 +19,7 @@ * @since CakePHP(tm) v 0.2.9 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ + App::uses('AppController', 'Controller'); /** diff --git a/app/View/Helper/AppHelper.php b/app/View/Helper/AppHelper.php index 2e5229aba..43b9f560b 100644 --- a/app/View/Helper/AppHelper.php +++ b/app/View/Helper/AppHelper.php @@ -20,6 +20,7 @@ * @since CakePHP(tm) v 0.2.9 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ + App::uses('Helper', 'View'); /** diff --git a/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php b/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php index e5c071088..4cea67db0 100644 --- a/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php +++ b/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php @@ -14,6 +14,7 @@ * @since CakePHP(tm) v 2.4.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ + App::uses('AbstractPasswordHasher', 'Controller/Component/Auth'); App::uses('Security', 'Utility'); diff --git a/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php b/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php index 4877c0284..2a264684b 100644 --- a/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php +++ b/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php @@ -14,6 +14,7 @@ * @since CakePHP(tm) v 2.4.0 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ + App::uses('AbstractPasswordHasher', 'Controller/Component/Auth'); App::uses('Security', 'Utility'); diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php index 38f5fda6f..eff3e9b41 100644 --- a/lib/Cake/Test/Case/BasicsTest.php +++ b/lib/Cake/Test/Case/BasicsTest.php @@ -19,6 +19,7 @@ */ require_once CAKE . 'basics.php'; + App::uses('Folder', 'Utility'); App::uses('CakeResponse', 'Network'); diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php index ba1553611..845ff3824 100644 --- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php @@ -20,6 +20,7 @@ App::uses('TaskCollection', 'Console'); App::uses('Shell', 'Console'); + /** * Extended Task */ diff --git a/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php b/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php index ca6c0055e..5add025c9 100644 --- a/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php +++ b/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php @@ -16,6 +16,7 @@ * @since CakePHP(tm) v 2.4 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + App::uses('SyslogLog', 'Log/Engine'); /** diff --git a/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php b/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php index 92133d10b..ad3e37be2 100644 --- a/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php +++ b/lib/Cake/Test/Case/Log/LogEngineCollectionTest.php @@ -17,6 +17,7 @@ * @since CakePHP(tm) v 2.4 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ + App::uses('LogEngineCollection', 'Log'); App::uses('FileLog', 'Log/Engine'); diff --git a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php index f979870e6..1ede99272 100644 --- a/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php @@ -20,6 +20,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php index f90526ed7..fe18575b8 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php @@ -15,6 +15,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php index c5252945b..d2352a8a6 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php @@ -20,6 +20,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php index baf0d0388..986f65965 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php @@ -22,6 +22,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php index 92f93ab07..4c39fc6f9 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php @@ -22,6 +22,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php index 63d7f6875..ab10ad315 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php @@ -23,6 +23,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); App::uses('String', 'Utility'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php index 5bb173503..5081fe919 100644 --- a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php +++ b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php @@ -21,6 +21,7 @@ */ App::uses('AppModel', 'Model'); + require_once dirname(__FILE__) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php index 944266af3..34ee2b010 100644 --- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php @@ -24,6 +24,7 @@ App::uses('DboSource', 'Model/Datasource'); App::uses('DboTestSource', 'Model/Datasource'); App::uses('DboSecondTestSource', 'Model/Datasource'); App::uses('MockDataSource', 'Model/Datasource'); + require_once dirname(dirname(__FILE__)) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php index cbe20026c..91740ec85 100644 --- a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php +++ b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php @@ -19,6 +19,7 @@ */ require_once dirname(__FILE__) . DS . 'ModelTestBase.php'; + App::uses('DboSource', 'Model/Datasource'); App::uses('DboMock', 'Model/Datasource'); diff --git a/lib/Cake/Test/Case/Model/ModelTestBase.php b/lib/Cake/Test/Case/Model/ModelTestBase.php index f68729158..df725fc4c 100644 --- a/lib/Cake/Test/Case/Model/ModelTestBase.php +++ b/lib/Cake/Test/Case/Model/ModelTestBase.php @@ -20,6 +20,7 @@ App::uses('Model', 'Model'); App::uses('AppModel', 'Model'); + require_once dirname(__FILE__) . DS . 'models.php'; /** diff --git a/lib/Cake/Test/bake_compare/Controller/NoActions.ctp b/lib/Cake/Test/bake_compare/Controller/NoActions.ctp index 54efe9f9f..2b9fb5f19 100644 --- a/lib/Cake/Test/bake_compare/Controller/NoActions.ctp +++ b/lib/Cake/Test/bake_compare/Controller/NoActions.ctp @@ -1,5 +1,7 @@