From a3bd668dbff6fb65a260d956662a1efeed82a725 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sat, 26 May 2012 23:33:53 -0400 Subject: [PATCH] Using one "use" per class and ordered by name --- App/Config/bootstrap.php | 12 +++---- App/Config/core.php | 4 +-- App/Config/routes.php | 4 +-- App/webroot/index.php | 8 ++--- App/webroot/test.php | 4 +-- lib/Cake/Cache/Cache.php | 8 ++--- lib/Cake/Cache/Engine/ApcEngine.php | 4 +-- lib/Cake/Cache/Engine/MemcacheEngine.php | 6 ++-- lib/Cake/Config/routes.php | 6 ++-- lib/Cake/Configure/IniReader.php | 4 +-- lib/Cake/Configure/PhpReader.php | 4 +-- lib/Cake/Console/Command/AclShell.php | 12 +++---- lib/Cake/Console/Command/ApiShell.php | 6 ++-- lib/Cake/Console/Command/BakeShell.php | 8 ++--- lib/Cake/Console/Command/CommandListShell.php | 10 +++--- lib/Cake/Console/Command/ConsoleShell.php | 8 ++--- lib/Cake/Console/Command/SchemaShell.php | 14 ++++---- lib/Cake/Console/Command/Task/BakeTask.php | 4 +-- .../Console/Command/Task/ControllerTask.php | 8 ++--- .../Console/Command/Task/DbConfigTask.php | 4 +-- lib/Cake/Console/Command/Task/ExtractTask.php | 16 +++++----- lib/Cake/Console/Command/Task/FixtureTask.php | 8 ++--- lib/Cake/Console/Command/Task/ModelTask.php | 12 +++---- lib/Cake/Console/Command/Task/PluginTask.php | 10 +++--- lib/Cake/Console/Command/Task/ProjectTask.php | 14 ++++---- .../Console/Command/Task/TemplateTask.php | 6 ++-- lib/Cake/Console/Command/Task/TestTask.php | 10 +++--- lib/Cake/Console/Command/Task/ViewTask.php | 8 ++--- lib/Cake/Console/Command/TestShell.php | 12 +++---- lib/Cake/Console/Command/UpgradeShell.php | 10 +++--- lib/Cake/Console/ConsoleErrorHandler.php | 4 +-- lib/Cake/Console/ConsoleOptionParser.php | 4 +-- lib/Cake/Console/Shell.php | 20 ++++++------ lib/Cake/Console/ShellDispatcher.php | 8 ++--- lib/Cake/Console/TaskCollection.php | 6 ++-- .../Templates/skel/Config/bootstrap.php | 12 +++---- .../Console/Templates/skel/webroot/test.php | 4 +-- lib/Cake/Controller/Component/Acl/DbAcl.php | 12 +++---- lib/Cake/Controller/Component/Acl/IniAcl.php | 8 ++--- lib/Cake/Controller/Component/Acl/PhpAcl.php | 10 +++--- .../Controller/Component/AclComponent.php | 22 ++++++------- .../Component/Auth/BaseAuthenticate.php | 14 ++++---- .../Component/Auth/BaseAuthorize.php | 16 +++++----- .../Component/Auth/BasicAuthenticate.php | 6 ++-- .../Component/Auth/ControllerAuthorize.php | 8 ++--- .../Component/Auth/CrudAuthorize.php | 6 ++-- .../Component/Auth/DigestAuthenticate.php | 8 ++--- .../Component/Auth/FormAuthenticate.php | 6 ++-- .../Controller/Component/AuthComponent.php | 28 ++++++++-------- .../Controller/Component/CookieComponent.php | 14 ++++---- .../Component/PaginatorComponent.php | 10 +++--- .../Component/RequestHandlerComponent.php | 18 +++++------ .../Component/SecurityComponent.php | 18 +++++------ .../Controller/Component/SessionComponent.php | 4 +-- lib/Cake/Controller/ComponentCollection.php | 8 ++--- lib/Cake/Controller/Controller.php | 28 ++++++++-------- lib/Cake/Controller/Scaffold.php | 10 +++--- lib/Cake/Core/App.php | 6 ++-- lib/Cake/Core/Configure.php | 12 +++---- lib/Cake/Core/Object.php | 14 ++++---- lib/Cake/Core/Plugin.php | 4 +-- lib/Cake/Error/ErrorHandler.php | 8 ++--- lib/Cake/Error/ExceptionRenderer.php | 14 ++++---- lib/Cake/I18n/I18n.php | 12 +++---- lib/Cake/I18n/L10n.php | 4 +-- lib/Cake/I18n/Multibyte.php | 4 +-- lib/Cake/Log/Log.php | 6 ++-- lib/Cake/Model/AclNode.php | 6 ++-- lib/Cake/Model/Behavior/AclBehavior.php | 8 ++--- .../Model/Behavior/ContainableBehavior.php | 6 ++-- lib/Cake/Model/Behavior/TranslateBehavior.php | 12 +++---- lib/Cake/Model/Behavior/TreeBehavior.php | 6 ++-- lib/Cake/Model/BehaviorCollection.php | 10 +++--- lib/Cake/Model/ConnectionManager.php | 6 ++-- lib/Cake/Model/Datasource/DataSource.php | 8 ++--- lib/Cake/Model/Datasource/Database/Mysql.php | 10 +++--- .../Model/Datasource/Database/Postgres.php | 6 ++-- lib/Cake/Model/Datasource/Database/Sqlite.php | 6 ++-- .../Model/Datasource/Database/Sqlserver.php | 6 ++-- lib/Cake/Model/Datasource/DboSource.php | 22 ++++++------- lib/Cake/Model/Datasource/Session.php | 4 +-- .../Model/Datasource/Session/CacheSession.php | 4 +-- .../Datasource/Session/DatabaseSession.php | 4 +-- lib/Cake/Model/Model.php | 24 +++++++------- lib/Cake/Model/Schema.php | 16 +++++----- lib/Cake/Network/Email/Email.php | 12 +++---- lib/Cake/Network/Email/SmtpTransport.php | 4 +-- lib/Cake/Network/Http/HttpResponse.php | 4 +-- lib/Cake/Network/Http/HttpSocket.php | 10 +++--- lib/Cake/Network/Request.php | 6 ++-- lib/Cake/Network/Socket.php | 4 +-- lib/Cake/Routing/Dispatcher.php | 24 +++++++------- lib/Cake/Routing/Route/RedirectRoute.php | 6 ++-- lib/Cake/Routing/Route/Route.php | 4 +-- lib/Cake/Routing/Router.php | 16 +++++----- .../TestApp/Controller/AuthTestController.php | 4 +-- .../TestApp/Model/PaginatorControllerPost.php | 4 +-- lib/Cake/Test/TestCase/BasicsTest.php | 12 +++---- lib/Cake/Test/TestCase/Cache/CacheTest.php | 10 +++--- .../TestCase/Cache/Engine/ApcEngineTest.php | 6 ++-- .../TestCase/Cache/Engine/FileEngineTest.php | 8 ++--- .../Cache/Engine/MemcacheEngineTest.php | 8 ++--- .../Cache/Engine/WincacheEngineTest.php | 6 ++-- .../Cache/Engine/XcacheEngineTest.php | 6 ++-- .../Test/TestCase/Configure/IniReaderTest.php | 4 +-- .../Test/TestCase/Configure/PhpReaderTest.php | 8 ++--- .../TestCase/Console/Command/AclShellTest.php | 12 +++---- .../TestCase/Console/Command/ApiShellTest.php | 4 +-- .../Console/Command/BakeShellTest.php | 8 ++--- .../Console/Command/CommandListShellTest.php | 10 +++--- .../Console/Command/SchemaShellTest.php | 14 ++++---- .../Command/Task/ControllerTaskTest.php | 20 ++++++------ .../Console/Command/Task/DbConfigTaskTest.php | 4 +-- .../Console/Command/Task/ExtractTaskTest.php | 10 +++--- .../Console/Command/Task/FixtureTaskTest.php | 12 +++---- .../Console/Command/Task/ModelTaskTest.php | 14 ++++---- .../Console/Command/Task/PluginTaskTest.php | 10 +++--- .../Console/Command/Task/ProjectTaskTest.php | 10 +++--- .../Console/Command/Task/TemplateTaskTest.php | 6 ++-- .../Console/Command/Task/TestTaskTest.php | 16 +++++----- .../Console/Command/Task/ViewTaskTest.php | 14 ++++---- .../Console/Command/TestShellTest.php | 4 +-- .../Console/ConsoleErrorHandlerTest.php | 6 ++-- .../Console/ConsoleOptionParserTest.php | 10 +++--- .../TestCase/Console/ConsoleOutputTest.php | 4 +-- .../TestCase/Console/HelpFormatterTest.php | 8 ++--- .../TestCase/Console/ShellDispatcherTest.php | 10 +++--- lib/Cake/Test/TestCase/Console/ShellTest.php | 14 ++++---- .../TestCase/Console/TaskCollectionTest.php | 8 ++--- .../Controller/Component/Acl/DbAclTest.php | 14 ++++---- .../Controller/Component/Acl/IniAclTest.php | 6 ++-- .../Controller/Component/AclComponentTest.php | 8 ++--- .../Component/Auth/ActionsAuthorizeTest.php | 6 ++-- .../Component/Auth/BasicAuthenticateTest.php | 10 +++--- .../Auth/ControllerAuthorizeTest.php | 8 ++--- .../Component/Auth/CrudAuthorizeTest.php | 10 +++--- .../Component/Auth/DigestAuthenticateTest.php | 8 ++--- .../Component/Auth/FormAuthenticateTest.php | 18 +++++------ .../Component/AuthComponentTest.php | 32 +++++++++---------- .../Component/CookieComponentTest.php | 14 ++++---- .../Component/PaginatorComponentTest.php | 12 +++---- .../Component/RequestHandlerComponentTest.php | 20 ++++++------ .../Component/SecurityComponentTest.php | 12 +++---- .../Component/SessionComponentTest.php | 14 ++++---- .../Controller/ComponentCollectionTest.php | 10 +++--- .../TestCase/Controller/ComponentTest.php | 20 ++++++------ .../Controller/ControllerMergeVarsTest.php | 16 +++++----- .../TestCase/Controller/ControllerTest.php | 26 +++++++-------- .../Controller/PagesControllerTest.php | 10 +++--- .../Test/TestCase/Controller/ScaffoldTest.php | 12 +++---- lib/Cake/Test/TestCase/Core/AppTest.php | 6 ++-- lib/Cake/Test/TestCase/Core/ConfigureTest.php | 12 +++---- lib/Cake/Test/TestCase/Core/ObjectTest.php | 14 ++++---- lib/Cake/Test/TestCase/Core/PluginTest.php | 8 ++--- .../Test/TestCase/Error/ErrorHandlerTest.php | 20 ++++++------ .../TestCase/Error/ExceptionRendererTest.php | 20 ++++++------ .../Test/TestCase/Event/EventManagerTest.php | 10 +++--- lib/Cake/Test/TestCase/Event/EventTest.php | 4 +-- lib/Cake/Test/TestCase/I18n/I18nTest.php | 12 +++---- lib/Cake/Test/TestCase/I18n/L10nTest.php | 4 +-- lib/Cake/Test/TestCase/I18n/MultibyteTest.php | 4 +-- .../Test/TestCase/Log/Engine/FileLogTest.php | 4 +-- lib/Cake/Test/TestCase/Log/LogTest.php | 12 +++---- .../Model/Datasource/DataSourceTest.php | 8 ++--- lib/Cake/Test/TestCase/Model/models.php | 4 +-- .../Network/Email/DebugTransportTest.php | 6 ++-- .../Test/TestCase/Network/Email/EmailTest.php | 8 ++--- .../Network/Email/SmtpTransportTest.php | 8 ++--- .../Network/Http/BasicAuthenticationTest.php | 6 ++-- .../Network/Http/DigestAuthenticationTest.php | 6 ++-- .../Network/Http/HttpResponseTest.php | 6 ++-- .../TestCase/Network/Http/HttpSocketTest.php | 8 ++--- .../Test/TestCase/Network/RequestTest.php | 10 +++--- .../Test/TestCase/Network/ResponseTest.php | 6 ++-- lib/Cake/Test/TestCase/Network/SocketTest.php | 4 +-- .../Test/TestCase/Routing/DispatcherTest.php | 22 ++++++------- .../Routing/Route/PluginShortRouteTest.php | 10 +++--- .../Routing/Route/RedirectRouteTest.php | 12 +++---- .../Test/TestCase/Routing/Route/RouteTest.php | 10 +++--- lib/Cake/Test/TestCase/Routing/RouterTest.php | 14 ++++---- .../TestSuite/ControllerTestCaseTest.php | 18 +++++------ .../TestSuite/HtmlCoverageReportTest.php | 10 +++--- .../Test/TestCase/TestSuite/TestCaseTest.php | 8 ++--- .../TestCase/TestSuite/TestFixtureTest.php | 10 +++--- .../Test/TestCase/TestSuite/TestSuiteTest.php | 4 +-- .../TestCase/Utility/ClassRegistryTest.php | 10 +++--- .../Test/TestCase/Utility/DebuggerTest.php | 10 +++--- lib/Cake/Test/TestCase/Utility/FileTest.php | 6 ++-- lib/Cake/Test/TestCase/Utility/FolderTest.php | 6 ++-- lib/Cake/Test/TestCase/Utility/HashTest.php | 4 +-- .../Test/TestCase/Utility/InflectorTest.php | 4 +-- lib/Cake/Test/TestCase/Utility/NumberTest.php | 4 +-- .../TestCase/Utility/ObjectCollectionTest.php | 8 ++--- .../Test/TestCase/Utility/SanitizeTest.php | 6 ++-- .../Test/TestCase/Utility/SecurityTest.php | 6 ++-- lib/Cake/Test/TestCase/Utility/SetTest.php | 8 ++--- lib/Cake/Test/TestCase/Utility/StringTest.php | 4 +-- lib/Cake/Test/TestCase/Utility/TimeTest.php | 10 +++--- .../Test/TestCase/Utility/ValidationTest.php | 6 ++-- lib/Cake/Test/TestCase/Utility/XmlTest.php | 8 ++--- .../TestCase/View/Helper/CacheHelperTest.php | 18 +++++------ .../TestCase/View/Helper/FormHelperTest.php | 28 ++++++++-------- .../TestCase/View/Helper/HtmlHelperTest.php | 28 ++++++++-------- .../View/Helper/JqueryEngineHelperTest.php | 10 +++--- .../TestCase/View/Helper/JsHelperTest.php | 18 +++++------ .../View/Helper/MootoolsEngineHelperTest.php | 10 +++--- .../TestCase/View/Helper/NumberHelperTest.php | 12 +++---- .../View/Helper/PaginatorHelperTest.php | 18 +++++------ .../View/Helper/PrototypeEngineHelperTest.php | 10 +++--- .../TestCase/View/Helper/RssHelperTest.php | 12 +++---- .../View/Helper/SessionHelperTest.php | 14 ++++---- .../TestCase/View/Helper/TextHelperTest.php | 12 +++---- .../TestCase/View/Helper/TimeHelperTest.php | 12 +++---- .../TestCase/View/HelperCollectionTest.php | 12 +++---- lib/Cake/Test/TestCase/View/HelperTest.php | 20 ++++++------ lib/Cake/Test/TestCase/View/JsonViewTest.php | 12 +++---- lib/Cake/Test/TestCase/View/MediaViewTest.php | 6 ++-- .../Test/TestCase/View/ScaffoldViewTest.php | 18 +++++------ lib/Cake/Test/TestCase/View/ThemeViewTest.php | 12 +++---- lib/Cake/Test/TestCase/View/ViewTest.php | 20 ++++++------ lib/Cake/Test/TestCase/View/XmlViewTest.php | 14 ++++---- lib/Cake/TestSuite/ControllerTestCase.php | 16 +++++----- .../TestSuite/Coverage/BaseCoverageReport.php | 6 ++-- lib/Cake/TestSuite/Fixture/FixtureManager.php | 14 ++++---- lib/Cake/TestSuite/Fixture/TestFixture.php | 16 +++++----- lib/Cake/TestSuite/Reporter/HtmlReporter.php | 6 ++-- lib/Cake/TestSuite/Reporter/TextReporter.php | 4 +-- lib/Cake/TestSuite/TestCase.php | 8 ++--- lib/Cake/TestSuite/TestLoader.php | 4 +-- lib/Cake/TestSuite/TestRunner.php | 4 +-- lib/Cake/TestSuite/TestSuiteCommand.php | 4 +-- lib/Cake/TestSuite/TestSuiteDispatcher.php | 4 +-- lib/Cake/Utility/ClassRegistry.php | 8 ++--- lib/Cake/Utility/Debugger.php | 6 ++-- lib/Cake/Utility/ObjectCollection.php | 4 +-- lib/Cake/Utility/Sanitize.php | 4 +-- lib/Cake/Utility/Set.php | 4 +-- lib/Cake/Utility/Time.php | 4 +-- lib/Cake/Utility/Xml.php | 4 +-- lib/Cake/View/Helper.php | 18 +++++------ lib/Cake/View/Helper/CacheHelper.php | 6 ++-- lib/Cake/View/Helper/FormHelper.php | 16 +++++----- lib/Cake/View/Helper/HtmlHelper.php | 14 ++++---- lib/Cake/View/Helper/JsBaseEngineHelper.php | 4 +-- lib/Cake/View/Helper/JsHelper.php | 4 +-- lib/Cake/View/Helper/NumberHelper.php | 10 +++--- lib/Cake/View/Helper/PaginatorHelper.php | 10 +++--- lib/Cake/View/Helper/RssHelper.php | 4 +-- lib/Cake/View/Helper/SessionHelper.php | 4 +-- lib/Cake/View/Helper/TextHelper.php | 10 +++--- lib/Cake/View/Helper/TimeHelper.php | 14 ++++---- lib/Cake/View/HelperCollection.php | 12 +++---- lib/Cake/View/JsonView.php | 4 +-- lib/Cake/View/MediaView.php | 6 ++-- lib/Cake/View/ScaffoldView.php | 6 ++-- lib/Cake/View/View.php | 26 +++++++-------- lib/Cake/View/XmlView.php | 6 ++-- lib/Cake/basics.php | 8 ++--- lib/Cake/bootstrap.php | 4 +-- 259 files changed, 1267 insertions(+), 1267 deletions(-) diff --git a/App/Config/bootstrap.php b/App/Config/bootstrap.php index c89eaa4bf23..af522ebb926 100644 --- a/App/Config/bootstrap.php +++ b/App/Config/bootstrap.php @@ -23,12 +23,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace App\Config; -use Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Cache\Cache, - Cake\Log\Log, - Cake\Utility\Inflector; +use Cake\Cache\Cache; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Log\Log; +use Cake\Utility\Inflector; /** * Cache Engine Configuration diff --git a/App/Config/core.php b/App/Config/core.php index a1a6fab7778..e05b80a4c6d 100644 --- a/App/Config/core.php +++ b/App/Config/core.php @@ -19,8 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace App\Config; -use Cake\Core\Configure, - Cake\Cache\Cache; +use Cake\Cache\Cache; +use Cake\Core\Configure; /** * CakePHP Debug Level: diff --git a/App/Config/routes.php b/App/Config/routes.php index 9268b9a75f1..c25ca16a3ba 100644 --- a/App/Config/routes.php +++ b/App/Config/routes.php @@ -21,8 +21,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace App\Config; -use Cake\Routing\Router, - Cake\Core\Plugin; +use Cake\Core\Plugin; +use Cake\Routing\Router; /** * Here, we are connecting '/' (base path) to controller called 'Pages', diff --git a/App/webroot/index.php b/App/webroot/index.php index 77eb6e63210..c0a1c5fc133 100644 --- a/App/webroot/index.php +++ b/App/webroot/index.php @@ -86,10 +86,10 @@ trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } -use Cake\Network\Request, - Cake\Network\Response, - Cake\Routing\Dispatcher, - Cake\Core\Configure; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Dispatcher; $Dispatcher = new Dispatcher(); $Dispatcher->dispatch(new Request(), new Response(array('charset' => Configure::read('App.encoding')))); diff --git a/App/webroot/test.php b/App/webroot/test.php index ec88fb1e6b1..2977c1bb732 100644 --- a/App/webroot/test.php +++ b/App/webroot/test.php @@ -83,8 +83,8 @@ trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } -use Cake\Core\Configure, - Cake\TestSuite\TestSuiteDispatcher; +use Cake\Core\Configure; +use Cake\TestSuite\TestSuiteDispatcher; if (Configure::read('debug') < 1) { die(__d('cake_dev', 'Debug setting does not allow access to this url.')); diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php index e2d286d1fc5..416ef223d05 100644 --- a/lib/Cake/Cache/Cache.php +++ b/lib/Cake/Cache/Cache.php @@ -13,10 +13,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Cache; -use Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Utility\Inflector; /** * Cache provides a consistent interface to Caching in your application. It allows you diff --git a/lib/Cake/Cache/Engine/ApcEngine.php b/lib/Cake/Cache/Engine/ApcEngine.php index 31d4538802a..3ac99c22d46 100644 --- a/lib/Cake/Cache/Engine/ApcEngine.php +++ b/lib/Cake/Cache/Engine/ApcEngine.php @@ -18,8 +18,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Cache\Engine; -use Cake\Cache\CacheEngine, - Cake\Utility\Inflector; +use Cake\Cache\CacheEngine; +use Cake\Utility\Inflector; /** * APC storage engine for cache diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php index a57ff9d1c27..7951e3ad025 100644 --- a/lib/Cake/Cache/Engine/MemcacheEngine.php +++ b/lib/Cake/Cache/Engine/MemcacheEngine.php @@ -18,9 +18,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Cache\Engine; -use Cake\Cache\CacheEngine, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Cache\CacheEngine; +use Cake\Error; +use Cake\Utility\Inflector; /** * Memcache storage engine for cache. Memcache has some limitations in the amount of diff --git a/lib/Cake/Config/routes.php b/lib/Cake/Config/routes.php index fe855978c17..b886a01d6a5 100644 --- a/lib/Cake/Config/routes.php +++ b/lib/Cake/Config/routes.php @@ -16,9 +16,9 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -use Cake\Routing\Router, - Cake\Core\Plugin, - Cake\Utility\Inflector; +use Cake\Core\Plugin; +use Cake\Routing\Router; +use Cake\Utility\Inflector; /** * Connects the default, built-in routes, including prefix and plugin routes. The following routes are created diff --git a/lib/Cake/Configure/IniReader.php b/lib/Cake/Configure/IniReader.php index d663066ba7a..663754ebc27 100644 --- a/lib/Cake/Configure/IniReader.php +++ b/lib/Cake/Configure/IniReader.php @@ -18,8 +18,8 @@ */ namespace Cake\Configure; -use Cake\Utility\Hash, - Cake\Error; +use Cake\Error; +use Cake\Utility\Hash; /** * Ini file configuration engine. diff --git a/lib/Cake/Configure/PhpReader.php b/lib/Cake/Configure/PhpReader.php index f7b037ebc08..7dd8727988c 100644 --- a/lib/Cake/Configure/PhpReader.php +++ b/lib/Cake/Configure/PhpReader.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Configure; -use Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; /** * PHP Reader allows Configure to load configuration values from diff --git a/lib/Cake/Console/Command/AclShell.php b/lib/Cake/Console/Command/AclShell.php index 9edc9c44682..c5baf5d4138 100644 --- a/lib/Cake/Console/Command/AclShell.php +++ b/lib/Cake/Console/Command/AclShell.php @@ -17,12 +17,12 @@ */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Core\Configure, - Cake\Controller\ComponentCollection, - Cake\Controller\Component\AclComponent, - Cake\Utility\Hash, - Cake\Utility\Set; +use Cake\Console\Shell; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\AclComponent; +use Cake\Core\Configure; +use Cake\Utility\Hash; +use Cake\Utility\Set; /** * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode diff --git a/lib/Cake/Console/Command/ApiShell.php b/lib/Cake/Console/Command/ApiShell.php index 554dcd7d3f1..d04534bf4d8 100644 --- a/lib/Cake/Console/Command/ApiShell.php +++ b/lib/Cake/Console/Command/ApiShell.php @@ -18,9 +18,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Core\App, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Utility\Inflector; /** * API shell to show method signatures of CakePHP core classes. diff --git a/lib/Cake/Console/Command/BakeShell.php b/lib/Cake/Console/Command/BakeShell.php index 1ce0dc13546..0b91108d014 100644 --- a/lib/Cake/Console/Command/BakeShell.php +++ b/lib/Cake/Console/Command/BakeShell.php @@ -20,10 +20,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Model\Model, - Cake\Core\App, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Model\Model; +use Cake\Utility\Inflector; /** * Command-line code generation utility to automate programmer chores. diff --git a/lib/Cake/Console/Command/CommandListShell.php b/lib/Cake/Console/Command/CommandListShell.php index ad4ca2adefc..c11db683438 100644 --- a/lib/Cake/Console/Command/CommandListShell.php +++ b/lib/Cake/Console/Command/CommandListShell.php @@ -13,11 +13,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Console\ConsoleOutput, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Utility\Inflector; +use Cake\Console\ConsoleOutput; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Utility\Inflector; /** * Shows a list of commands available from the console. diff --git a/lib/Cake/Console/Command/ConsoleShell.php b/lib/Cake/Console/Command/ConsoleShell.php index 0db28231004..3fd723eb266 100644 --- a/lib/Cake/Console/Command/ConsoleShell.php +++ b/lib/Cake/Console/Command/ConsoleShell.php @@ -12,10 +12,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Core\Plugin, - Cake\Routing\Dispatcher, - Cake\Routing\Router; +use Cake\Console\Shell; +use Cake\Core\Plugin; +use Cake\Routing\Dispatcher; +use Cake\Routing\Router; /** * Provides a very basic 'interactive' console for CakePHP apps. diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php index d2cdbb57028..0703a3e5093 100644 --- a/lib/Cake/Console/Command/SchemaShell.php +++ b/lib/Cake/Console/Command/SchemaShell.php @@ -19,13 +19,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Core\Configure, - Cake\Model\Schema, - Cake\Model\ConnectionManager, - Cake\Utility\File, - Cake\Utility\Folder, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\Configure; +use Cake\Model\ConnectionManager; +use Cake\Model\Schema; +use Cake\Utility\File; +use Cake\Utility\Folder; +use Cake\Utility\Inflector; /** * Schema is a command-line database management utility for automating programmer chores. diff --git a/lib/Cake/Console/Command/Task/BakeTask.php b/lib/Cake/Console/Command/Task/BakeTask.php index cfd7afe2fa2..f2677241885 100644 --- a/lib/Cake/Console/Command/Task/BakeTask.php +++ b/lib/Cake/Console/Command/Task/BakeTask.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Console\Shell, - Cake\Core\Configure; +use Cake\Console\Shell; +use Cake\Core\Configure; /** * Base class for Bake Tasks. diff --git a/lib/Cake/Console/Command/Task/ControllerTask.php b/lib/Cake/Console/Command/Task/ControllerTask.php index a9610a046f1..176fdb2e129 100644 --- a/lib/Cake/Console/Command/Task/ControllerTask.php +++ b/lib/Cake/Console/Command/Task/ControllerTask.php @@ -16,10 +16,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Core\App, - Cake\Console\Shell, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; /** * Task class for creating and updating controller files. diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php index 5a5db1b9820..e99e6a5ed20 100644 --- a/lib/Cake/Console/Command/Task/DbConfigTask.php +++ b/lib/Cake/Console/Command/Task/DbConfigTask.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Console\Shell, - Cake\Model\ConnectionManager; +use Cake\Console\Shell; +use Cake\Model\ConnectionManager; /** * Task class for creating and updating the database configuration file. diff --git a/lib/Cake/Console/Command/Task/ExtractTask.php b/lib/Cake/Console/Command/Task/ExtractTask.php index 40bdc5f21fc..28fb3a4c017 100644 --- a/lib/Cake/Console/Command/Task/ExtractTask.php +++ b/lib/Cake/Console/Command/Task/ExtractTask.php @@ -17,14 +17,14 @@ */ namespace Cake\Console\Command\Task; -use Cake\Console\Shell, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Utility\Set, - Cake\Utility\Hash, - Cake\Utility\Inflector, - Cake\Utility\Folder, - Cake\Utility\File; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Utility\File; +use Cake\Utility\Folder; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\Set; /** * Language string extractor diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php index 49f67e849b0..dd9f894ed63 100644 --- a/lib/Cake/Console/Command/Task/FixtureTask.php +++ b/lib/Cake/Console/Command/Task/FixtureTask.php @@ -16,10 +16,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Model\Schema, - Cake\Model\Model, - Cake\Console\Shell, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Model\Model; +use Cake\Model\Schema; +use Cake\Utility\Inflector; /** * Task class for creating and updating fixtures files. diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php index 611a63bc165..8086ae4c49f 100644 --- a/lib/Cake/Console/Command/Task/ModelTask.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -16,12 +16,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Core\App, - Cake\Console\Shell, - Cake\Model\Model, - Cake\Model\ConnectionManager, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; /** * Task class for creating and updating model files. diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php index fde578fc412..d320baffc9e 100644 --- a/lib/Cake/Console/Command/Task/PluginTask.php +++ b/lib/Cake/Console/Command/Task/PluginTask.php @@ -16,11 +16,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Console\Shell, - Cake\Core\App, - Cake\Utility\Inflector, - Cake\Utility\Folder, - Cake\Utility\File; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Utility\File; +use Cake\Utility\Folder; +use Cake\Utility\Inflector; /** * The Plugin Task handles creating an empty plugin, ready to be used diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php index d84926180bb..c6702b0e562 100644 --- a/lib/Cake/Console/Command/Task/ProjectTask.php +++ b/lib/Cake/Console/Command/Task/ProjectTask.php @@ -17,13 +17,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Console\Shell, - Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\String, - Cake\Utility\Security, - Cake\Utility\File, - Cake\Utility\Folder; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Utility\File; +use Cake\Utility\Folder; +use Cake\Utility\Security; +use Cake\Utility\String; /** * Task class for creating new project apps and plugins diff --git a/lib/Cake/Console/Command/Task/TemplateTask.php b/lib/Cake/Console/Command/Task/TemplateTask.php index 5226df66f68..5e631ee5373 100644 --- a/lib/Cake/Console/Command/Task/TemplateTask.php +++ b/lib/Cake/Console/Command/Task/TemplateTask.php @@ -16,9 +16,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command\Task; -use Cake\Console\Shell, - Cake\Core\App, - Cake\Utility\Folder; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Utility\Folder; /** * Template Task can generate templated output Used in other Tasks. diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php index 26732d51d04..691df7c1e57 100644 --- a/lib/Cake/Console/Command/Task/TestTask.php +++ b/lib/Cake/Console/Command/Task/TestTask.php @@ -17,11 +17,11 @@ */ namespace Cake\Console\Command\Task; -use Cake\Core\App, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Console\Shell, - Cake\Error; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Error; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; /** * Task class for creating and updating test files. diff --git a/lib/Cake/Console/Command/Task/ViewTask.php b/lib/Cake/Console/Command/Task/ViewTask.php index b4f51d40560..1407e0d11dc 100644 --- a/lib/Cake/Console/Command/Task/ViewTask.php +++ b/lib/Cake/Console/Command/Task/ViewTask.php @@ -17,10 +17,10 @@ */ namespace Cake\Console\Command\Task; -use Cake\Core\App, - Cake\Core\Configure, - Cake\Console\Shell, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Utility\Inflector; /** * Task class for creating and updating view files. diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php index c19445c4c3d..6885736980b 100644 --- a/lib/Cake/Console/Command/TestShell.php +++ b/lib/Cake/Console/Command/TestShell.php @@ -18,12 +18,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\TestSuite\TestLoader, - Cake\TestSuite\TestSuiteCommand, - Cake\TestSuite\TestSuiteDispatcher, - Cake\Console\ConsoleOptionParser, - Cake\Utility\Inflector; +use Cake\Console\ConsoleOptionParser; +use Cake\Console\Shell; +use Cake\TestSuite\TestLoader; +use Cake\TestSuite\TestSuiteCommand; +use Cake\TestSuite\TestSuiteDispatcher; +use Cake\Utility\Inflector; /** * Provides a CakePHP wrapper around PHPUnit. diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php index 32837b451bb..e857e817ebf 100644 --- a/lib/Cake/Console/Command/UpgradeShell.php +++ b/lib/Cake/Console/Command/UpgradeShell.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console\Command; -use Cake\Console\Shell, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Utility\Folder, - Cake\Utility\Inflector; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Utility\Folder; +use Cake\Utility\Inflector; /** * A shell class to help developers upgrade applications to CakePHP 2.0 diff --git a/lib/Cake/Console/ConsoleErrorHandler.php b/lib/Cake/Console/ConsoleErrorHandler.php index a71688dd32d..f979115ad0c 100644 --- a/lib/Cake/Console/ConsoleErrorHandler.php +++ b/lib/Cake/Console/ConsoleErrorHandler.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console; -use Cake\Error\ErrorHandler, - Cake\Core\Configure; +use Cake\Core\Configure; +use Cake\Error\ErrorHandler; /** * Error Handler for Cake console. Does simple printing of the diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php index 829e970fd03..a87d5f45863 100644 --- a/lib/Cake/Console/ConsoleOptionParser.php +++ b/lib/Cake/Console/ConsoleOptionParser.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console; -use Cake\Utility\Inflector, - Cake\Error; +use Cake\Error; +use Cake\Utility\Inflector; /** * Handles parsing the ARGV in the command line and provides support diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php index a37b1bc6470..9fbc26501df 100644 --- a/lib/Cake/Console/Shell.php +++ b/lib/Cake/Console/Shell.php @@ -16,16 +16,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console; -use Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Core\Object, - Cake\Log\Log, - Cake\Utility\Inflector, - Cake\Utility\ClassRegistry, - Cake\Utility\File, - Cake\Utility\String, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Error; +use Cake\Log\Log; +use Cake\Utility\ClassRegistry; +use Cake\Utility\File; +use Cake\Utility\Inflector; +use Cake\Utility\String; /** * Base class for command-line utilities for automating programmer chores. diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php index 8b7d5f06d12..88947a3b4ca 100644 --- a/lib/Cake/Console/ShellDispatcher.php +++ b/lib/Cake/Console/ShellDispatcher.php @@ -16,10 +16,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console; -use Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Utility\Inflector; /** * Shell dispatcher handles dispatching cli commands. diff --git a/lib/Cake/Console/TaskCollection.php b/lib/Cake/Console/TaskCollection.php index d7261f863d9..53eac1ad601 100644 --- a/lib/Cake/Console/TaskCollection.php +++ b/lib/Cake/Console/TaskCollection.php @@ -15,9 +15,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Console; -use Cake\Utility\ObjectCollection, - Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Utility\ObjectCollection; /** * Collection object for Tasks. Provides features diff --git a/lib/Cake/Console/Templates/skel/Config/bootstrap.php b/lib/Cake/Console/Templates/skel/Config/bootstrap.php index 8a62404e609..01446b7ac2c 100644 --- a/lib/Cake/Console/Templates/skel/Config/bootstrap.php +++ b/lib/Cake/Console/Templates/skel/Config/bootstrap.php @@ -23,12 +23,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -use Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Cache\Cache, - Cake\Log\Log, - Cake\Utility\Inflector; +use Cake\Cache\Cache; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Log\Log; +use Cake\Utility\Inflector; // Setup a 'default' cache configuration for use in the application. Cache::config('default', array('engine' => 'File')); diff --git a/lib/Cake/Console/Templates/skel/webroot/test.php b/lib/Cake/Console/Templates/skel/webroot/test.php index fb0301dcd7f..68d7b089b12 100644 --- a/lib/Cake/Console/Templates/skel/webroot/test.php +++ b/lib/Cake/Console/Templates/skel/webroot/test.php @@ -85,8 +85,8 @@ trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } -use Cake\Core\Configure, - Cake\TestSuite\TestSuiteDispatcher; +use Cake\Core\Configure; +use Cake\TestSuite\TestSuiteDispatcher; if (Configure::read('debug') < 1) { die(__d('cake_dev', 'Debug setting does not allow access to this url.')); diff --git a/lib/Cake/Controller/Component/Acl/DbAcl.php b/lib/Cake/Controller/Component/Acl/DbAcl.php index 8465f29b9a7..29dc7753fda 100644 --- a/lib/Cake/Controller/Component/Acl/DbAcl.php +++ b/lib/Cake/Controller/Component/Acl/DbAcl.php @@ -14,12 +14,12 @@ */ namespace Cake\Controller\Component\Acl; -use Cake\Core\Object, - Cake\Controller\Component, - Cake\Utility\ClassRegistry, - Cake\Controller\Component\Acl\AclInterface, - Cake\Utility\Hash, - Cake\Utility\Set; +use Cake\Controller\Component; +use Cake\Controller\Component\Acl\AclInterface; +use Cake\Core\Object; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Set; /** * DbAcl implements an ACL control system in the database. ARO's and ACO's are diff --git a/lib/Cake/Controller/Component/Acl/IniAcl.php b/lib/Cake/Controller/Component/Acl/IniAcl.php index 8902b979cb6..573d8a8c7d6 100644 --- a/lib/Cake/Controller/Component/Acl/IniAcl.php +++ b/lib/Cake/Controller/Component/Acl/IniAcl.php @@ -14,10 +14,10 @@ */ namespace Cake\Controller\Component\Acl; -use Cake\Core\Object, - Cake\Controller\Component, - Cake\Utility\Set, - Cake\Configure\IniReader; +use Cake\Configure\IniReader; +use Cake\Controller\Component; +use Cake\Core\Object; +use Cake\Utility\Set; /** * IniAcl implements an access control system using an INI file. An example diff --git a/lib/Cake/Controller/Component/Acl/PhpAcl.php b/lib/Cake/Controller/Component/Acl/PhpAcl.php index 7c8de6e51ad..c09a63cfc9d 100644 --- a/lib/Cake/Controller/Component/Acl/PhpAcl.php +++ b/lib/Cake/Controller/Component/Acl/PhpAcl.php @@ -18,11 +18,11 @@ */ namespace Cake\Controller\Component\Acl; -use Cake\Core\Object, - Cake\Controller\Component, - Cake\Configure\PhpReader, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Configure\PhpReader; +use Cake\Controller\Component; +use Cake\Core\Object; +use Cake\Error; +use Cake\Utility\Inflector; /** * PhpAcl implements an access control system using a plain PHP configuration file. diff --git a/lib/Cake/Controller/Component/AclComponent.php b/lib/Cake/Controller/Component/AclComponent.php index 6b86d256844..d0f8fecbd7d 100644 --- a/lib/Cake/Controller/Component/AclComponent.php +++ b/lib/Cake/Controller/Component/AclComponent.php @@ -13,17 +13,17 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Controller\Component\Acl\AclInterface, - Cake\Core\Object, - Cake\Core\Configure, - Cake\Core\App, - Cake\Configure\IniReader, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Utility\Set, - Cake\Error; +use Cake\Configure\IniReader; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\Acl\AclInterface; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Error; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; +use Cake\Utility\Set; /** * Access Control List factory class. diff --git a/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php b/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php index 7301e6c5754..8e375133654 100644 --- a/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php @@ -14,13 +14,13 @@ */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Utility\ClassRegistry, - Cake\Utility\Set, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\Hash, - Cake\Utility\Security; +use Cake\Controller\ComponentCollection; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Security; +use Cake\Utility\Set; /** * Base Authentication class with common methods and properties. diff --git a/lib/Cake/Controller/Component/Auth/BaseAuthorize.php b/lib/Cake/Controller/Component/Auth/BaseAuthorize.php index de04e5cb401..104d3588aa3 100644 --- a/lib/Cake/Controller/Component/Auth/BaseAuthorize.php +++ b/lib/Cake/Controller/Component/Auth/BaseAuthorize.php @@ -14,14 +14,14 @@ */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Controller\Controller, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\Set, - Cake\Utility\Inflector, - Cake\Utility\Hash, - Cake\Error; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Controller; +use Cake\Error; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\Set; /** * Abstract base authorization adapter for AuthComponent. diff --git a/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php b/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php index cb64d247f1e..c888e16d1c5 100644 --- a/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php @@ -13,9 +13,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Network\Request, - Cake\Network\Response; +use Cake\Controller\ComponentCollection; +use Cake\Network\Request; +use Cake\Network\Response; /** * Basic Authentication adapter for AuthComponent. diff --git a/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php b/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php index 6ade0457eeb..89d54598ded 100644 --- a/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php +++ b/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php @@ -13,10 +13,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Controller\Controller, - Cake\Network\Request, - Cake\Error; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Controller; +use Cake\Error; +use Cake\Network\Request; /** * An authorization adapter for AuthComponent. Provides the ability to authorize using a controller callback. diff --git a/lib/Cake/Controller/Component/Auth/CrudAuthorize.php b/lib/Cake/Controller/Component/Auth/CrudAuthorize.php index 36699813385..fea3c938df8 100644 --- a/lib/Cake/Controller/Component/Auth/CrudAuthorize.php +++ b/lib/Cake/Controller/Component/Auth/CrudAuthorize.php @@ -13,9 +13,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Routing\Router, - Cake\Network\Request; +use Cake\Controller\ComponentCollection; +use Cake\Network\Request; +use Cake\Routing\Router; /** * An authorization adapter for AuthComponent. Provides the ability to authorize using CRUD mappings. diff --git a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php index 3541705a2fc..265131f516c 100644 --- a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php @@ -13,10 +13,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\ClassRegistry; +use Cake\Controller\ComponentCollection; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Utility\ClassRegistry; /** * Digest Authentication adapter for AuthComponent. diff --git a/lib/Cake/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/Controller/Component/Auth/FormAuthenticate.php index 4087f7b762f..209cbfdb392 100644 --- a/lib/Cake/Controller/Component/Auth/FormAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/FormAuthenticate.php @@ -13,9 +13,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component\Auth; -use Cake\Controller\ComponentCollection, - Cake\Network\Request, - Cake\Network\Response; +use Cake\Controller\ComponentCollection; +use Cake\Network\Request; +use Cake\Network\Response; /** * An authentication adapter for AuthComponent. Provides the ability to authenticate using POST diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php index a9ccb082017..8dee00eef6d 100644 --- a/lib/Cake/Controller/Component/AuthComponent.php +++ b/lib/Cake/Controller/Component/AuthComponent.php @@ -20,20 +20,20 @@ */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Controller\Controller, - Cake\Model\Datasource\Session, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\Debugger, - Cake\Utility\Set, - Cake\Utility\Security, - Cake\Utility\Hash, - Cake\Core\App, - Cake\Core\Configure, - Cake\Error; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Model\Datasource\Session; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Router; +use Cake\Utility\Debugger; +use Cake\Utility\Hash; +use Cake\Utility\Security; +use Cake\Utility\Set; /** * Authentication control component class diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php index 2794d5c947c..53b0e419364 100644 --- a/lib/Cake/Controller/Component/CookieComponent.php +++ b/lib/Cake/Controller/Component/CookieComponent.php @@ -18,13 +18,13 @@ */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Core\Configure, - Cake\Network\Response, - Cake\Utility\Hash, - Cake\Utility\Set, - Cake\Utility\Security; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Core\Configure; +use Cake\Network\Response; +use Cake\Utility\Hash; +use Cake\Utility\Security; +use Cake\Utility\Set; /** * Cookie Component. diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php index 72de98f8bb0..7c8c891294c 100644 --- a/lib/Cake/Controller/Component/PaginatorComponent.php +++ b/lib/Cake/Controller/Component/PaginatorComponent.php @@ -18,11 +18,11 @@ */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Utility\Set, - Cake\Utility\Hash, - Cake\Error; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Error; +use Cake\Utility\Hash; +use Cake\Utility\Set; /** * This component is used to handle automatic model data pagination. The primary way to use this diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php index 3256c8d64f1..39ad39f7140 100644 --- a/lib/Cake/Controller/Component/RequestHandlerComponent.php +++ b/lib/Cake/Controller/Component/RequestHandlerComponent.php @@ -19,15 +19,15 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Controller\Controller, - Cake\Routing\Router, - Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\Inflector, - Cake\Utility\Xml, - Cake\Error; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Routing\Router; +use Cake\Utility\Inflector; +use Cake\Utility\Xml; /** * Request object for handling alternative HTTP requests diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php index d295a94b066..09df0956c03 100644 --- a/lib/Cake/Controller/Component/SecurityComponent.php +++ b/lib/Cake/Controller/Component/SecurityComponent.php @@ -17,15 +17,15 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Controller\Controller, - Cake\Network\Request, - Cake\Utility\Hash, - Cake\Utility\Security, - Cake\Utility\Set, - Cake\Core\Configure, - Cake\Error; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Controller; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Network\Request; +use Cake\Utility\Hash; +use Cake\Utility\Security; +use Cake\Utility\Set; /** * The Security Component creates an easy way to integrate tighter security in diff --git a/lib/Cake/Controller/Component/SessionComponent.php b/lib/Cake/Controller/Component/SessionComponent.php index 552f3d907e3..3528076eb0e 100644 --- a/lib/Cake/Controller/Component/SessionComponent.php +++ b/lib/Cake/Controller/Component/SessionComponent.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller\Component; -use Cake\Controller\Component, - Cake\Model\Datasource\Session; +use Cake\Controller\Component; +use Cake\Model\Datasource\Session; /** * The CakePHP SessionComponent provides a way to persist client data between diff --git a/lib/Cake/Controller/ComponentCollection.php b/lib/Cake/Controller/ComponentCollection.php index c05637669c7..112b19cd322 100644 --- a/lib/Cake/Controller/ComponentCollection.php +++ b/lib/Cake/Controller/ComponentCollection.php @@ -16,10 +16,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller; -use Cake\Utility\ObjectCollection, - Cake\Core\App, - Cake\Event\EventListener, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Event\EventListener; +use Cake\Utility\ObjectCollection; /** * Components collection is used as a registry for loaded components and handles loading diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index 7a4e12f4d9e..67ca2be62af 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -14,20 +14,20 @@ */ namespace Cake\Controller; -use Cake\Core\Object, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\Inflector, - Cake\Error, - Cake\Routing\Router, - Cake\Event\EventListener, - Cake\Event\Event, - Cake\Event\EventManager, - Cake\View\View, - Cake\Utility\ClassRegistry; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Error; +use Cake\Event\Event; +use Cake\Event\EventListener; +use Cake\Event\EventManager; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Router; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; +use Cake\View\View; /** * Application controller class for organization of business logic. diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php index d45d1f98473..4d19b3a7a98 100644 --- a/lib/Cake/Controller/Scaffold.php +++ b/lib/Cake/Controller/Scaffold.php @@ -19,11 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Controller; -use Cake\Network\Request, - Cake\Core\Configure, - Cake\Model\ConnectionManager, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Model\ConnectionManager; +use Cake\Network\Request; +use Cake\Utility\Inflector; /** * Scaffolding is a set of automatic actions for starting web development work faster. diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index c89f94bc425..054550ef60f 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Core; -use Cake\Cache\Cache, - Cake\Utility\Inflector, - Cake\Error\ErrorHandler; +use Cake\Cache\Cache; +use Cake\Error\ErrorHandler; +use Cake\Utility\Inflector; /** * App is responsible for path management, class location and class loading. diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php index 05155f41cd6..aea596fb4b4 100644 --- a/lib/Cake/Core/Configure.php +++ b/lib/Cake/Core/Configure.php @@ -14,12 +14,12 @@ */ namespace Cake\Core; -use Cake\Cache\Cache, - Cake\Utility\Set, - Cake\Utility\Hash, - Cake\Configure\ConfigReaderInterface, - Cake\Configure\PhpReader, - Cake\Error; +use Cake\Cache\Cache; +use Cake\Configure\ConfigReaderInterface; +use Cake\Configure\PhpReader; +use Cake\Error; +use Cake\Utility\Hash; +use Cake\Utility\Set; /** * Configuration class. Used for managing runtime configuration information. diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php index d524c4aaac1..366881f7956 100644 --- a/lib/Cake/Core/Object.php +++ b/lib/Cake/Core/Object.php @@ -13,13 +13,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Core; -use Cake\Network\Request, - Cake\Network\Response, - Cake\Routing\Dispatcher, - Cake\Routing\Router, - Cake\Log\Log, - Cake\Utility\Set, - Cake\Utility\Hash; +use Cake\Log\Log; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Dispatcher; +use Cake\Routing\Router; +use Cake\Utility\Hash; +use Cake\Utility\Set; /** * Object class provides a few generic methods used in several subclasses. diff --git a/lib/Cake/Core/Plugin.php b/lib/Cake/Core/Plugin.php index 986e47b6445..13dd9c36db7 100644 --- a/lib/Cake/Core/Plugin.php +++ b/lib/Cake/Core/Plugin.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Core; -use Cake\Utility\Inflector, - Cake\Error; +use Cake\Error; +use Cake\Utility\Inflector; /** * Plugin is responsible for loading and unloading plugins. It also can diff --git a/lib/Cake/Error/ErrorHandler.php b/lib/Cake/Error/ErrorHandler.php index 7250aa6a41c..46bd8e79c4a 100644 --- a/lib/Cake/Error/ErrorHandler.php +++ b/lib/Cake/Error/ErrorHandler.php @@ -19,10 +19,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Error; -use Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\Debugger, - Cake\Log\Log; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Log\Log; +use Cake\Utility\Debugger; /** * diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php index 54c22a69b85..771251d535f 100644 --- a/lib/Cake/Error/ExceptionRenderer.php +++ b/lib/Cake/Error/ExceptionRenderer.php @@ -20,13 +20,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Error; -use Cake\Routing\Router, - Cake\Network\Request, - Cake\Network\Response, - Cake\Core\Configure, - Cake\Utility\Inflector, - Cake\Controller\Controller, - Cake\Controller\ErrorController; +use Cake\Controller\Controller; +use Cake\Controller\ErrorController; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Router; +use Cake\Utility\Inflector; /** * Exception Renderer. diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php index e35c5df8877..9bc5779d6fe 100644 --- a/lib/Cake/I18n/I18n.php +++ b/lib/Cake/I18n/I18n.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\I18n; -use Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Cache\Cache, - Cake\Utility\Hash, - Cake\Utility\Inflector; +use Cake\Cache\Cache; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; if (function_exists('mb_internal_encoding')) { $encoding = Configure::read('App.encoding'); diff --git a/lib/Cake/I18n/L10n.php b/lib/Cake/I18n/L10n.php index ed711c093c8..60889076b6a 100644 --- a/lib/Cake/I18n/L10n.php +++ b/lib/Cake/I18n/L10n.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\I18n; -use Cake\Core\Configure, - Cake\Network\Request; +use Cake\Core\Configure; +use Cake\Network\Request; /** * Localization diff --git a/lib/Cake/I18n/Multibyte.php b/lib/Cake/I18n/Multibyte.php index 77a1a293692..67fda3b2cfe 100644 --- a/lib/Cake/I18n/Multibyte.php +++ b/lib/Cake/I18n/Multibyte.php @@ -278,8 +278,8 @@ function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B', } namespace Cake\I18n { -use Cake\Configure\PhpReader, - Cake\Core\Configure; +use Cake\Configure\PhpReader; +use Cake\Core\Configure; /** * Multibyte handling methods. diff --git a/lib/Cake/Log/Log.php b/lib/Cake/Log/Log.php index 9660cec357c..e4910180d46 100644 --- a/lib/Cake/Log/Log.php +++ b/lib/Cake/Log/Log.php @@ -20,9 +20,9 @@ */ namespace Cake\Log; -use Cake\Error, - Cake\Log\Engine\FileLog, - Cake\Core\App; +use Cake\Core\App; +use Cake\Error; +use Cake\Log\Engine\FileLog; /** * Logs messages to configured Log adapters. One or more adapters diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php index c4722fcb6ff..a4eeefe064f 100644 --- a/lib/Cake/Model/AclNode.php +++ b/lib/Cake/Model/AclNode.php @@ -17,9 +17,9 @@ */ namespace Cake\Model; -use Cake\Core\Configure, - Cake\Utility\Inflector, - Cake\Utility\ClassRegistry; +use Cake\Core\Configure; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; /** * ACL Node diff --git a/lib/Cake/Model/Behavior/AclBehavior.php b/lib/Cake/Model/Behavior/AclBehavior.php index 8f61afea2da..0ae1746ea35 100644 --- a/lib/Cake/Model/Behavior/AclBehavior.php +++ b/lib/Cake/Model/Behavior/AclBehavior.php @@ -20,10 +20,10 @@ */ namespace Cake\Model\Behavior; -use Cake\Model\ModelBehavior, - Cake\Model\Model, - Cake\Utility\ClassRegistry, - Cake\Utility\Hash; +use Cake\Model\Model; +use Cake\Model\ModelBehavior; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; /** * ACL behavior diff --git a/lib/Cake/Model/Behavior/ContainableBehavior.php b/lib/Cake/Model/Behavior/ContainableBehavior.php index be788dfcc71..7e6f4fecb4b 100644 --- a/lib/Cake/Model/Behavior/ContainableBehavior.php +++ b/lib/Cake/Model/Behavior/ContainableBehavior.php @@ -19,9 +19,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Behavior; -use Cake\Model\ModelBehavior, - Cake\Model\Model, - Cake\Utility\Set; +use Cake\Model\Model; +use Cake\Model\ModelBehavior; +use Cake\Utility\Set; /** * Behavior to allow for dynamic and atomic manipulation of a Model's associations diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php index 82396783328..a9147ab865d 100644 --- a/lib/Cake/Model/Behavior/TranslateBehavior.php +++ b/lib/Cake/Model/Behavior/TranslateBehavior.php @@ -13,12 +13,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Behavior; -use Cake\Model\ModelBehavior, - Cake\Model\Model, - Cake\Model\ConnectionManager, - Cake\I18n\I18n, - Cake\Core\Configure, - Cake\Utility\ClassRegistry; +use Cake\Core\Configure; +use Cake\I18n\I18n; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; +use Cake\Model\ModelBehavior; +use Cake\Utility\ClassRegistry; /** * Translate behavior diff --git a/lib/Cake/Model/Behavior/TreeBehavior.php b/lib/Cake/Model/Behavior/TreeBehavior.php index 3f727c2cdfd..72617ee5c1a 100644 --- a/lib/Cake/Model/Behavior/TreeBehavior.php +++ b/lib/Cake/Model/Behavior/TreeBehavior.php @@ -19,9 +19,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Behavior; -use Cake\Model\ModelBehavior, - Cake\Model\Model, - Cake\Model\ConnectionManager; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; +use Cake\Model\ModelBehavior; /** * Tree Behavior. diff --git a/lib/Cake/Model/BehaviorCollection.php b/lib/Cake/Model/BehaviorCollection.php index e9369ac7681..d6a7c217df7 100644 --- a/lib/Cake/Model/BehaviorCollection.php +++ b/lib/Cake/Model/BehaviorCollection.php @@ -19,11 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model; -use Cake\Utility\ObjectCollection, - Cake\Utility\ClassRegistry, - Cake\Core\App, - Cake\Event\EventListener, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Event\EventListener; +use Cake\Utility\ClassRegistry; +use Cake\Utility\ObjectCollection; /** * Model behavior collection class. diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php index 83206c01c74..6ebf94b44ef 100644 --- a/lib/Cake/Model/ConnectionManager.php +++ b/lib/Cake/Model/ConnectionManager.php @@ -19,9 +19,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model; -use Cake\Core\App, - Cake\Core\Configure, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; /** * Manages loaded instances of DataSource objects diff --git a/lib/Cake/Model/Datasource/DataSource.php b/lib/Cake/Model/Datasource/DataSource.php index 4d1b22e0ba7..96dd513faf0 100644 --- a/lib/Cake/Model/Datasource/DataSource.php +++ b/lib/Cake/Model/Datasource/DataSource.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource; -use Cake\Core\Object, - Cake\Cache\Cache, - Cake\Model\ConnectionManager, - Cake\Model\Model; +use Cake\Cache\Cache; +use Cake\Core\Object; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; /** * DataSource base class diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php index cd9ccf291f5..dbd2df46068 100644 --- a/lib/Cake/Model/Datasource/Database/Mysql.php +++ b/lib/Cake/Model/Datasource/Database/Mysql.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource\Database; -use Cake\Model\Datasource\DboSource, - Cake\Model\Model, - Cake\Model\Schema, - Cake\Error, - \PDO; +use Cake\Error; +use Cake\Model\Datasource\DboSource; +use Cake\Model\Model; +use Cake\Model\Schema; +use \PDO; /** * MySQL DBO driver object diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php index 6f92f7fb357..e6b4bd89cf4 100644 --- a/lib/Cake/Model/Datasource/Database/Postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource\Database; -use Cake\Model\Datasource\DboSource, - Cake\Error, - \PDO; +use Cake\Error; +use Cake\Model\Datasource\DboSource; +use \PDO; /** * PostgreSQL layer for DBO. diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php index 0ff010c4f82..41d7f5d557c 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlite.php +++ b/lib/Cake/Model/Datasource/Database/Sqlite.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource\Database; -use Cake\Model\Datasource\DboSource, - Cake\Error, - \PDO; +use Cake\Error; +use Cake\Model\Datasource\DboSource; +use \PDO; /** * DBO implementation for the SQLite3 DBMS. diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php index 588d71beceb..276b5bc3e0a 100644 --- a/lib/Cake/Model/Datasource/Database/Sqlserver.php +++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource\Database; -use Cake\Model\Datasource\DboSource, - Cake\Error, - \PDO; +use Cake\Error; +use Cake\Model\Datasource\DboSource; +use \PDO; /** * Dbo driver for SQLServer diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index b4a8f7772d6..d62203e2ab4 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -17,17 +17,17 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource; -use Cake\Core\Configure, - Cake\Model\ConnectionManager, - Cake\Model\Schema, - Cake\Model\Model, - Cake\Utility\Inflector, - Cake\Utility\ClassRegistry, - Cake\Utility\Hash, - Cake\Utility\String, - Cake\Cache\Cache, - \PDO, - Cake\Error; +use Cake\Cache\Cache; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; +use Cake\Model\Schema; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\String; +use \PDO; /** * DboSource diff --git a/lib/Cake/Model/Datasource/Session.php b/lib/Cake/Model/Datasource/Session.php index 457bc3a5c55..850d3180a54 100644 --- a/lib/Cake/Model/Datasource/Session.php +++ b/lib/Cake/Model/Datasource/Session.php @@ -23,8 +23,8 @@ */ namespace Cake\Model\Datasource; -use Cake\Core\Configure, - Cake\Utility\Hash; +use Cake\Core\Configure; +use Cake\Utility\Hash; /** * Session class for Cake. diff --git a/lib/Cake/Model/Datasource/Session/CacheSession.php b/lib/Cake/Model/Datasource/Session/CacheSession.php index 45c04f54f9f..32813c6feed 100644 --- a/lib/Cake/Model/Datasource/Session/CacheSession.php +++ b/lib/Cake/Model/Datasource/Session/CacheSession.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Model\Datasource\Session; -use Cake\Cache\Cache, - Cake\Core\Configure; +use Cake\Cache\Cache; +use Cake\Core\Configure; /** * CacheSession provides method for saving sessions into a Cache engine. Used with Session diff --git a/lib/Cake/Model/Datasource/Session/DatabaseSession.php b/lib/Cake/Model/Datasource/Session/DatabaseSession.php index ba821409513..5f4758266a6 100644 --- a/lib/Cake/Model/Datasource/Session/DatabaseSession.php +++ b/lib/Cake/Model/Datasource/Session/DatabaseSession.php @@ -18,8 +18,8 @@ */ namespace Cake\Model\Datasource\Session; -use Cake\Core\Configure, - Cake\Utility\ClassRegistry; +use Cake\Core\Configure; +use Cake\Utility\ClassRegistry; /** * DatabaseSession provides methods to be used with Session. diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index e63a8dc5a79..7bc84794034 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -20,18 +20,18 @@ */ namespace Cake\Model; -use Cake\Core\Object, - Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Utility\Xml, - Cake\Utility\Set, - Cake\Utility\Hash, - Cake\Event\EventListener, - Cake\Event\EventManager, - Cake\Event\Event, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Error; +use Cake\Event\Event; +use Cake\Event\EventListener; +use Cake\Event\EventManager; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\Set; +use Cake\Utility\Xml; /** * Object-relational mapper. diff --git a/lib/Cake/Model/Schema.php b/lib/Cake/Model/Schema.php index 66dc7f03706..aa039160f2e 100644 --- a/lib/Cake/Model/Schema.php +++ b/lib/Cake/Model/Schema.php @@ -18,14 +18,14 @@ */ namespace Cake\Model; -use Cake\Core\Object, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Utility\File, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Error; +use Cake\Utility\ClassRegistry; +use Cake\Utility\File; +use Cake\Utility\Inflector; /** * Base Class for Schema management diff --git a/lib/Cake/Network/Email/Email.php b/lib/Cake/Network/Email/Email.php index 2edffbe10d2..769a5e06e28 100644 --- a/lib/Cake/Network/Email/Email.php +++ b/lib/Cake/Network/Email/Email.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Network\Email; -use Cake\Log\Log, - Cake\Utility\Validation, - Cake\Utility\String, - Cake\Core\Configure, - Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Log\Log; +use Cake\Utility\String; +use Cake\Utility\Validation; /** * Cake e-mail class. diff --git a/lib/Cake/Network/Email/SmtpTransport.php b/lib/Cake/Network/Email/SmtpTransport.php index 2ce030c7ee2..ec4cd2b53e0 100644 --- a/lib/Cake/Network/Email/SmtpTransport.php +++ b/lib/Cake/Network/Email/SmtpTransport.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Network\Email; -use Cake\Network\Socket, - Cake\Error; +use Cake\Error; +use Cake\Network\Socket; /** * Send mail using SMTP protocol diff --git a/lib/Cake/Network/Http/HttpResponse.php b/lib/Cake/Network/Http/HttpResponse.php index 1af7c9cf3cf..2c6c5698584 100644 --- a/lib/Cake/Network/Http/HttpResponse.php +++ b/lib/Cake/Network/Http/HttpResponse.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Network\Http; -use Cake\Utility\Inflector, - Cake\Error; +use Cake\Error; +use Cake\Utility\Inflector; /** * HTTP Response from HttpSocket. diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php index 8d3be0ae3ac..021b08ad738 100644 --- a/lib/Cake/Network/Http/HttpSocket.php +++ b/lib/Cake/Network/Http/HttpSocket.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Network\Http; -use Cake\Network\Socket, - Cake\Utility\Set, - Cake\Utility\Inflector, - Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Network\Socket; +use Cake\Utility\Inflector; +use Cake\Utility\Set; /** * Cake network socket connection class. diff --git a/lib/Cake/Network/Request.php b/lib/Cake/Network/Request.php index 3a4f055e3e1..1fb142553b1 100644 --- a/lib/Cake/Network/Request.php +++ b/lib/Cake/Network/Request.php @@ -16,9 +16,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Network; -use Cake\Core\Configure, - Cake\Utility\Hash, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Utility\Hash; /** * A class that helps wrap Request information and particulars about a single request. diff --git a/lib/Cake/Network/Socket.php b/lib/Cake/Network/Socket.php index 2eb386bc54f..81704809191 100644 --- a/lib/Cake/Network/Socket.php +++ b/lib/Cake/Network/Socket.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Network; -use Cake\Utility\Validation, - Cake\Error; +use Cake\Error; +use Cake\Utility\Validation; /** * Cake network socket connection class. diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php index ce687ac49bc..bb3802d7a0a 100644 --- a/lib/Cake/Routing/Dispatcher.php +++ b/lib/Cake/Routing/Dispatcher.php @@ -21,18 +21,18 @@ */ namespace Cake\Routing; -use Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Controller\Controller, - Cake\Event\Event, - Cake\Event\EventListener, - Cake\Event\EventManager, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\Inflector, - Cake\View\View, - Cake\Error; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Error; +use Cake\Event\Event; +use Cake\Event\EventListener; +use Cake\Event\EventManager; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Utility\Inflector; +use Cake\View\View; /** * Dispatcher converts Requests into controller actions. It uses the dispatched Request diff --git a/lib/Cake/Routing/Route/RedirectRoute.php b/lib/Cake/Routing/Route/RedirectRoute.php index e8fb0866116..488eb9986ec 100644 --- a/lib/Cake/Routing/Route/RedirectRoute.php +++ b/lib/Cake/Routing/Route/RedirectRoute.php @@ -14,9 +14,9 @@ */ namespace Cake\Routing\Route; -use Cake\Routing\Router, - Cake\Routing\Route\Route, - Cake\Network\Response; +use Cake\Network\Response; +use Cake\Routing\Route\Route; +use Cake\Routing\Router; /** * Redirect route will perform an immediate redirect. Redirect routes diff --git a/lib/Cake/Routing/Route/Route.php b/lib/Cake/Routing/Route/Route.php index f9c69a60ebd..4efa8835377 100644 --- a/lib/Cake/Routing/Route/Route.php +++ b/lib/Cake/Routing/Route/Route.php @@ -13,8 +13,8 @@ */ namespace Cake\Routing\Route; -use Cake\Routing\Router, - Cake\Utility\Hash; +use Cake\Routing\Router; +use Cake\Utility\Hash; /** * A single Route used by the Router to connect requests to diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php index 8f038ac103b..27067bbbbea 100644 --- a/lib/Cake/Routing/Router.php +++ b/lib/Cake/Routing/Router.php @@ -18,14 +18,14 @@ */ namespace Cake\Routing; -use Cake\Core\Configure, - Cake\Network\Request, - Cake\Network\Response, - Cake\Routing\Route\Route, - Cake\Utility\Set, - Cake\Utility\Hash, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Route\Route; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\Set; /** * Parses the request URL into controller, action, and parameters. Uses the connected routes diff --git a/lib/Cake/Test/TestApp/Controller/AuthTestController.php b/lib/Cake/Test/TestApp/Controller/AuthTestController.php index 4749e1d11bb..93d7371b00e 100644 --- a/lib/Cake/Test/TestApp/Controller/AuthTestController.php +++ b/lib/Cake/Test/TestApp/Controller/AuthTestController.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace TestApp\Controller; -use Cake\Controller\Controller, - Cake\Routing\Router; +use Cake\Controller\Controller; +use Cake\Routing\Router; /** * AuthTestController class diff --git a/lib/Cake/Test/TestApp/Model/PaginatorControllerPost.php b/lib/Cake/Test/TestApp/Model/PaginatorControllerPost.php index d119cd8d4a3..d0d00734478 100644 --- a/lib/Cake/Test/TestApp/Model/PaginatorControllerPost.php +++ b/lib/Cake/Test/TestApp/Model/PaginatorControllerPost.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace TestApp\Model; -use Cake\TestSuite\Fixture\TestModel, - Cake\Utility\Set; +use Cake\TestSuite\Fixture\TestModel; +use Cake\Utility\Set; /** * PaginatorControllerPost class diff --git a/lib/Cake/Test/TestCase/BasicsTest.php b/lib/Cake/Test/TestCase/BasicsTest.php index 8eebd5e6e48..e27299b0657 100644 --- a/lib/Cake/Test/TestCase/BasicsTest.php +++ b/lib/Cake/Test/TestCase/BasicsTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase; -use Cake\TestSuite\TestCase, - Cake\Core\App, - Cake\Core\Configure, - Cake\Log\Log, - Cake\Network\Response, - Cake\Utility\Folder; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Log\Log; +use Cake\Network\Response; +use Cake\TestSuite\TestCase; +use Cake\Utility\Folder; require_once CAKE . 'basics.php'; diff --git a/lib/Cake/Test/TestCase/Cache/CacheTest.php b/lib/Cake/Test/TestCase/Cache/CacheTest.php index 9b75e1f861a..6a5f4ed74ef 100644 --- a/lib/Cake/Test/TestCase/Cache/CacheTest.php +++ b/lib/Cake/Test/TestCase/Cache/CacheTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Cache; -use Cake\TestSuite\TestCase, - Cake\Core\Configure, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Cache\Cache; +use Cake\Cache\Cache; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; /** * CacheTest class diff --git a/lib/Cake/Test/TestCase/Cache/Engine/ApcEngineTest.php b/lib/Cake/Test/TestCase/Cache/Engine/ApcEngineTest.php index 8daecdd7cfd..116f645b40b 100644 --- a/lib/Cake/Test/TestCase/Cache/Engine/ApcEngineTest.php +++ b/lib/Cake/Test/TestCase/Cache/Engine/ApcEngineTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Cache\Engine; -use Cake\TestSuite\TestCase, - Cake\Cache\Cache, - Cake\Core\Configure; +use Cake\Cache\Cache; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; /** * ApcEngineTest class diff --git a/lib/Cake/Test/TestCase/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/TestCase/Cache/Engine/FileEngineTest.php index 7abec65be0d..c5fee2a2842 100644 --- a/lib/Cake/Test/TestCase/Cache/Engine/FileEngineTest.php +++ b/lib/Cake/Test/TestCase/Cache/Engine/FileEngineTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Cache\Engine; -use Cake\TestSuite\TestCase, - Cake\Cache\Cache, - Cake\Cache\Engine\FileEngine, - Cake\Core\Configure; +use Cake\Cache\Cache; +use Cake\Cache\Engine\FileEngine; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; /** * FileEngineTest class diff --git a/lib/Cake/Test/TestCase/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/TestCase/Cache/Engine/MemcacheEngineTest.php index dde25eb6eaa..3908acd1974 100644 --- a/lib/Cake/Test/TestCase/Cache/Engine/MemcacheEngineTest.php +++ b/lib/Cake/Test/TestCase/Cache/Engine/MemcacheEngineTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Cache\Engine; -use Cake\TestSuite\TestCase, - Cake\Cache\Cache, - Cake\Cache\Engine\MemcacheEngine, - Cake\Core\Configure; +use Cake\Cache\Cache; +use Cake\Cache\Engine\MemcacheEngine; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; class TestMemcacheEngine extends MemcacheEngine { diff --git a/lib/Cake/Test/TestCase/Cache/Engine/WincacheEngineTest.php b/lib/Cake/Test/TestCase/Cache/Engine/WincacheEngineTest.php index e97dbc10434..c42b3671223 100644 --- a/lib/Cake/Test/TestCase/Cache/Engine/WincacheEngineTest.php +++ b/lib/Cake/Test/TestCase/Cache/Engine/WincacheEngineTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Cache\Engine; -use Cake\TestSuite\TestCase, - Cake\Cache\Cache, - Cake\Core\Configure; +use Cake\Cache\Cache; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; /** * WincacheEngineTest class diff --git a/lib/Cake/Test/TestCase/Cache/Engine/XcacheEngineTest.php b/lib/Cake/Test/TestCase/Cache/Engine/XcacheEngineTest.php index 9de05e1538c..e8637fe589a 100644 --- a/lib/Cake/Test/TestCase/Cache/Engine/XcacheEngineTest.php +++ b/lib/Cake/Test/TestCase/Cache/Engine/XcacheEngineTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Cache\Engine; -use Cake\TestSuite\TestCase, - Cake\Cache\Cache, - Cake\Core\Configure; +use Cake\Cache\Cache; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; /** * XcacheEngineTest class diff --git a/lib/Cake/Test/TestCase/Configure/IniReaderTest.php b/lib/Cake/Test/TestCase/Configure/IniReaderTest.php index 69b03c635d8..e71f9df1217 100644 --- a/lib/Cake/Test/TestCase/Configure/IniReaderTest.php +++ b/lib/Cake/Test/TestCase/Configure/IniReaderTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Configure; -use Cake\TestSuite\TestCase, - Cake\Configure\IniReader; +use Cake\Configure\IniReader; +use Cake\TestSuite\TestCase; class IniReaderTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Configure/PhpReaderTest.php b/lib/Cake/Test/TestCase/Configure/PhpReaderTest.php index d8278abacd0..6469b17968e 100644 --- a/lib/Cake/Test/TestCase/Configure/PhpReaderTest.php +++ b/lib/Cake/Test/TestCase/Configure/PhpReaderTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Configure; -use Cake\TestSuite\TestCase, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Configure\PhpReader; +use Cake\Configure\PhpReader; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; class PhpReaderTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Console/Command/AclShellTest.php b/lib/Cake/Test/TestCase/Console/Command/AclShellTest.php index 06d65ee303f..ac3f9dc53f9 100644 --- a/lib/Cake/Test/TestCase/Console/Command/AclShellTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/AclShellTest.php @@ -18,12 +18,12 @@ */ namespace Cake\Test\TestCase\Console\Command; -use Cake\TestSuite\TestCase, - Cake\Console\Command\AclShell, - Cake\Controller\Component\AclComponent, - Cake\Controller\ComponentCollection, - Cake\Core\Configure, - Cake\Utility\ClassRegistry; +use Cake\Console\Command\AclShell; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\AclComponent; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; /** * AclShellTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/ApiShellTest.php b/lib/Cake/Test/TestCase/Console/Command/ApiShellTest.php index 29731b63f76..2c6b99c3968 100644 --- a/lib/Cake/Test/TestCase/Console/Command/ApiShellTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/ApiShellTest.php @@ -18,8 +18,8 @@ */ namespace Cake\Test\TestCase\Console\Command; -use Cake\TestSuite\TestCase, - Cake\Console\Command\ApiShellShell; +use Cake\Console\Command\ApiShellShell; +use Cake\TestSuite\TestCase; /** * ApiShellTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php b/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php index 177e6df7d1b..7fa12966331 100644 --- a/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/BakeShellTest.php @@ -18,10 +18,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command; -use Cake\TestSuite\TestCase, - Cake\Console\Command\BakeShellShell, - Cake\Controller\Controller, - Cake\Core\App; +use Cake\Console\Command\BakeShellShell; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\TestSuite\TestCase; class BakeShellTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Console/Command/CommandListShellTest.php b/lib/Cake/Test/TestCase/Console/Command/CommandListShellTest.php index ebce05384c3..aee212c8ef0 100644 --- a/lib/Cake/Test/TestCase/Console/Command/CommandListShellTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/CommandListShellTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command; -use Cake\TestSuite\TestCase, - Cake\Console\Command\CommandListShell, - Cake\Console\ConsoleOutput, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Console\Command\CommandListShell; +use Cake\Console\ConsoleOutput; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; class TestStringOutput extends ConsoleOutput { diff --git a/lib/Cake/Test/TestCase/Console/Command/SchemaShellTest.php b/lib/Cake/Test/TestCase/Console/Command/SchemaShellTest.php index b1b9e1a9828..4259c727c7c 100644 --- a/lib/Cake/Test/TestCase/Console/Command/SchemaShellTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/SchemaShellTest.php @@ -17,13 +17,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command; -use Cake\TestSuite\TestCase, - Cake\Console\Command\SchemaShell, - Cake\Model\Schema, - Cake\Model\ConnectionManager, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Utility\File; +use Cake\Console\Command\SchemaShell; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Model\ConnectionManager; +use Cake\Model\Schema; +use Cake\TestSuite\TestCase; +use Cake\Utility\File; /** * Test for Schema database management diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ControllerTaskTest.php index b57ddb4d456..f3cafd23947 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/ControllerTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/ControllerTaskTest.php @@ -18,16 +18,16 @@ */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\ControllerTask, - Cake\Console\Command\Task\TemplateTask, - Cake\Console\Shell, - Cake\Model\Model, - Cake\Model\Schema, - Cake\View\Helper, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Utility\ClassRegistry; +use Cake\Console\Command\Task\ControllerTask; +use Cake\Console\Command\Task\TemplateTask; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\Model\Schema; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\View\Helper; class BakeArticle extends Model { diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/DbConfigTaskTest.php index b3bb0c69b44..ea57f83de02 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/DbConfigTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/DbConfigTaskTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\DbConfigTask; +use Cake\Console\Command\Task\DbConfigTask; +use Cake\TestSuite\TestCase; /** * DbConfigTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php index 92c3e47f3a3..f8b67630e6c 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php @@ -20,11 +20,11 @@ */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\ExtractTask, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Utility\Folder; +use Cake\Console\Command\Task\ExtractTask; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\Utility\Folder; /** * ExtractTaskTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/FixtureTaskTest.php index 05bb8d83ad0..51ec57b967c 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/FixtureTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/FixtureTaskTest.php @@ -18,12 +18,12 @@ */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Core\Plugin, - Cake\Model\ConnectionManager, - Cake\Console\Command\Task\FixtureTask, - Cake\Console\Command\Task\TemplateTask, - Cake\Utility\ClassRegistry; +use Cake\Console\Command\Task\FixtureTask; +use Cake\Console\Command\Task\TemplateTask; +use Cake\Core\Plugin; +use Cake\Model\ConnectionManager; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; /** * FixtureTaskTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ModelTaskTest.php index 0d251eb6017..233f98e3f0b 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/ModelTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/ModelTaskTest.php @@ -19,13 +19,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\ModelTask, - Cake\Console\Command\Task\TemplateTask, - Cake\Model\Model, - Cake\Core\Plugin, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector; +use Cake\Console\Command\Task\ModelTask; +use Cake\Console\Command\Task\TemplateTask; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; /** * ModelTaskTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/PluginTaskTest.php index c2463353abe..efb5caa3505 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/PluginTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/PluginTaskTest.php @@ -19,11 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\DbConfigTask, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Utility\Folder; +use Cake\Console\Command\Task\DbConfigTask; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\Utility\Folder; /** * PluginTaskPlugin class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ProjectTaskTest.php index d8315c15a94..ad8f24b260e 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/ProjectTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/ProjectTaskTest.php @@ -19,11 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\ProjectTask, - Cake\Core\Configure, - Cake\Utility\File, - Cake\Utility\Folder; +use Cake\Console\Command\Task\ProjectTask; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; +use Cake\Utility\File; +use Cake\Utility\Folder; /** * ProjectTask Test class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php index 4b180a2ed41..2bb1072d66c 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php @@ -20,9 +20,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\TemplateTask, - Cake\Core\App; +use Cake\Console\Command\Task\TemplateTask; +use Cake\Core\App; +use Cake\TestSuite\TestCase; /** * TemplateTaskTest class diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php index de9648009f7..e70577454ba 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/TestTaskTest.php @@ -20,14 +20,14 @@ */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\TestTask, - Cake\Console\Command\Task\TemplateTask, - Cake\Model\Model, - Cake\Controller\Controller, - Cake\Core\Plugin, - Cake\Core\App, - Cake\Utility\ClassRegistry; +use Cake\Console\Command\Task\TemplateTask; +use Cake\Console\Command\Task\TestTask; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; /** * Test Article model diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/ViewTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/ViewTaskTest.php index 9fc0b197f97..86dfdb5ac2b 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/ViewTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/ViewTaskTest.php @@ -20,13 +20,13 @@ */ namespace Cake\Test\TestCase\Console\Command\Task; -use Cake\TestSuite\TestCase, - Cake\Console\Command\Task\ViewTask, - Cake\Console\Command\Task\TemplateTask, - Cake\Model\Model, - Cake\Controller\Controller, - Cake\Core\Plugin, - Cake\Core\Configure; +use Cake\Console\Command\Task\TemplateTask; +use Cake\Console\Command\Task\ViewTask; +use Cake\Controller\Controller; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\TestSuite\TestCase; /** * Test View Task Comment Model diff --git a/lib/Cake/Test/TestCase/Console/Command/TestShellTest.php b/lib/Cake/Test/TestCase/Console/Command/TestShellTest.php index 7e8e05bdf44..f4820bd64b2 100644 --- a/lib/Cake/Test/TestCase/Console/Command/TestShellTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/TestShellTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console\Command; -use Cake\TestSuite\TestCase, - Cake\Console\Command\TestShell; +use Cake\Console\Command\TestShell; +use Cake\TestSuite\TestCase; class TestTestShell extends TestShell { diff --git a/lib/Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php b/lib/Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php index 04bf8dfdf6c..ed9ef1c01df 100644 --- a/lib/Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php +++ b/lib/Cake/Test/TestCase/Console/ConsoleErrorHandlerTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\ConsoleErrorHandler, - Cake\Error; +use Cake\Console\ConsoleErrorHandler; +use Cake\Error; +use Cake\TestSuite\TestCase; /** * ConsoleErrorHandler Test case. diff --git a/lib/Cake/Test/TestCase/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/TestCase/Console/ConsoleOptionParserTest.php index 4f4ec8fb9e5..6e18b377fa0 100644 --- a/lib/Cake/Test/TestCase/Console/ConsoleOptionParserTest.php +++ b/lib/Cake/Test/TestCase/Console/ConsoleOptionParserTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\ConsoleOptionParser, - Cake\Console\ConsoleInputOption, - Cake\Console\ConsoleInputArgument, - Cake\Console\ConsoleInputSubcommand; +use Cake\Console\ConsoleInputArgument; +use Cake\Console\ConsoleInputOption; +use Cake\Console\ConsoleInputSubcommand; +use Cake\Console\ConsoleOptionParser; +use Cake\TestSuite\TestCase; class ConsoleOptionParserTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Console/ConsoleOutputTest.php b/lib/Cake/Test/TestCase/Console/ConsoleOutputTest.php index 967bbb5205a..374d0520e09 100644 --- a/lib/Cake/Test/TestCase/Console/ConsoleOutputTest.php +++ b/lib/Cake/Test/TestCase/Console/ConsoleOutputTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\ConsoleOutput; +use Cake\Console\ConsoleOutput; +use Cake\TestSuite\TestCase; class ConsoleOutputTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Console/HelpFormatterTest.php b/lib/Cake/Test/TestCase/Console/HelpFormatterTest.php index 2115a2b2f53..28996ea1ad7 100644 --- a/lib/Cake/Test/TestCase/Console/HelpFormatterTest.php +++ b/lib/Cake/Test/TestCase/Console/HelpFormatterTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\ConsoleOptionParser, - Cake\Console\HelpFormatter, - \DOMDocument as DomDocument; +use Cake\Console\ConsoleOptionParser; +use Cake\Console\HelpFormatter; +use Cake\TestSuite\TestCase; +use \DOMDocument as DomDocument; class HelpFormatterTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Console/ShellDispatcherTest.php b/lib/Cake/Test/TestCase/Console/ShellDispatcherTest.php index 6c133f38475..d87b29e88ae 100644 --- a/lib/Cake/Test/TestCase/Console/ShellDispatcherTest.php +++ b/lib/Cake/Test/TestCase/Console/ShellDispatcherTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\ShellDispatcher, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Console\ShellDispatcher; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; /** * TestShellDispatcher class diff --git a/lib/Cake/Test/TestCase/Console/ShellTest.php b/lib/Cake/Test/TestCase/Console/ShellTest.php index a1c2601ceca..968ca7d7676 100644 --- a/lib/Cake/Test/TestCase/Console/ShellTest.php +++ b/lib/Cake/Test/TestCase/Console/ShellTest.php @@ -19,13 +19,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\Shell, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Utility\Folder, - Cake\Utility\Set, - Cake\Utility\Hash; +use Cake\Console\Shell; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\Utility\Folder; +use Cake\Utility\Hash; +use Cake\Utility\Set; /** * ShellTestShell class diff --git a/lib/Cake/Test/TestCase/Console/TaskCollectionTest.php b/lib/Cake/Test/TestCase/Console/TaskCollectionTest.php index 9237b1966a2..8c6ebca1bf8 100644 --- a/lib/Cake/Test/TestCase/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/TestCase/Console/TaskCollectionTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Console; -use Cake\TestSuite\TestCase, - Cake\Console\TaskCollection, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Console\TaskCollection; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; class TaskCollectionTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Controller/Component/Acl/DbAclTest.php b/lib/Cake/Test/TestCase/Controller/Component/Acl/DbAclTest.php index 6507942b56e..bfd8f161b42 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Acl/DbAclTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Acl/DbAclTest.php @@ -18,13 +18,13 @@ */ namespace Cake\Test\TestCase\Controller\Component\Acl; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Controller\Component\AclComponent, - Cake\Controller\Component\Acl\DbAcl, - Cake\Controller\ComponentCollection, - Cake\Model\AclNode, - Cake\Core\Configure; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\AclComponent; +use Cake\Controller\Component\Acl\DbAcl; +use Cake\Core\Configure; +use Cake\Model\AclNode; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; require_once dirname(dirname(dirname(dirname(__FILE__)))) . DS . 'Model' . DS . 'models.php'; diff --git a/lib/Cake/Test/TestCase/Controller/Component/Acl/IniAclTest.php b/lib/Cake/Test/TestCase/Controller/Component/Acl/IniAclTest.php index add87c1d975..4babe04394f 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Acl/IniAclTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Acl/IniAclTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\AclComponent, - Cake\Controller\Component\Acl\IniAcl; +use Cake\Controller\Component\AclComponent; +use Cake\Controller\Component\Acl\IniAcl; +use Cake\TestSuite\TestCase; /** * Test case for the IniAcl implementation diff --git a/lib/Cake/Test/TestCase/Controller/Component/AclComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/AclComponentTest.php index dd3fd31f819..9d3a9e22b42 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/AclComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/AclComponentTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\AclComponent, - Cake\Controller\ComponentCollection, - Cake\Core\Configure; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\AclComponent; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; /** * Test Case for AclComponent diff --git a/lib/Cake/Test/TestCase/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/TestCase/Controller/Component/Auth/ActionsAuthorizeTest.php index 79338b67ee8..d480195b68d 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Auth/ActionsAuthorizeTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Auth/ActionsAuthorizeTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component\Auth; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\Auth\ActionsAuthorize, - Cake\Network\Request; +use Cake\Controller\Component\Auth\ActionsAuthorize; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; class ActionsAuthorizeTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/TestCase/Controller/Component/Auth/BasicAuthenticateTest.php index 6c1dd81c698..d8f714bbb72 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Auth/BasicAuthenticateTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Auth/BasicAuthenticateTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component\Auth; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\Auth\BasicAuthenticate, - Cake\Network\Request, - Cake\Utility\ClassRegistry, - Cake\Utility\Security; +use Cake\Controller\Component\Auth\BasicAuthenticate; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Security; require_once CAKE . 'Test' . DS . 'TestCase' . DS . 'Model' . DS . 'models.php'; diff --git a/lib/Cake/Test/TestCase/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/TestCase/Controller/Component/Auth/ControllerAuthorizeTest.php index 56d16bc71bc..de370e1ddfd 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Auth/ControllerAuthorizeTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Auth/ControllerAuthorizeTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component\Auth; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\Auth\ControllerAuthorize, - Cake\Controller\Controller, - Cake\Network\Request; +use Cake\Controller\Component\Auth\ControllerAuthorize; +use Cake\Controller\Controller; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; class ControllerAuthorizeTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/TestCase/Controller/Component/Auth/CrudAuthorizeTest.php index fc1331beb49..7172114ff8b 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Auth/CrudAuthorizeTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Auth/CrudAuthorizeTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component\Auth; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\Auth\CrudAuthorize, - Cake\Core\Configure, - Cake\Network\Request, - Cake\Routing\Router; +use Cake\Controller\Component\Auth\CrudAuthorize; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; class CrudAuthorizeTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/Test/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php index 2da1d10d96d..ee71f70c8c5 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component\Auth; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\Auth\DigestAuthenticate, - Cake\Network\Request, - Cake\Utility\ClassRegistry; +use Cake\Controller\Component\Auth\DigestAuthenticate; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; require_once CAKE . 'Test' . DS . 'TestCase' . DS . 'Model' . DS . 'models.php'; diff --git a/lib/Cake/Test/TestCase/Controller/Component/Auth/FormAuthenticateTest.php b/lib/Cake/Test/TestCase/Controller/Component/Auth/FormAuthenticateTest.php index a9694473142..bd0fe6cf6cb 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/Auth/FormAuthenticateTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/Auth/FormAuthenticateTest.php @@ -18,15 +18,15 @@ */ namespace Cake\Test\TestCase\Controller\Component\Auth; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\Auth\FormAuthenticate, - Cake\Network\Request, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Cache\Cache, - Cake\Utility\ClassRegistry, - Cake\Utility\Security; +use Cake\Cache\Cache; +use Cake\Controller\Component\Auth\FormAuthenticate; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Security; require_once CAKE . 'Test' . DS . 'TestCase' . DS . 'Model' . DS . 'models.php'; diff --git a/lib/Cake/Test/TestCase/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/AuthComponentTest.php index 07b1bc577e7..561931143b3 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/AuthComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/AuthComponentTest.php @@ -18,22 +18,22 @@ */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Controller\Component\AuthComponent, - Cake\Controller\Controller, - Cake\Controller\ComponentCollection, - Cake\Core\App, - Cake\Core\Configure, - Cake\Network\Request, - Cake\Network\Response, - Cake\Routing\Router, - Cake\Routing\Dispatcher, - Cake\Utility\ClassRegistry, - Cake\Utility\Security, - TestApp\Controller\Component\TestAuthComponent, - TestApp\Controller\AuthTestController, - TestApp\Model\AuthUser; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\AuthComponent; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Dispatcher; +use Cake\Routing\Router; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Security; +use TestApp\Controller\AuthTestController; +use TestApp\Controller\Component\TestAuthComponent; +use TestApp\Model\AuthUser; /** * AuthComponentTest class diff --git a/lib/Cake/Test/TestCase/Controller/Component/CookieComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/CookieComponentTest.php index 7529451d129..cde90fc5598 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/CookieComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/CookieComponentTest.php @@ -17,13 +17,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\CookieComponent, - Cake\Controller\Controller, - Cake\Controller\ComponentCollection, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\Security; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\CookieComponent; +use Cake\Controller\Controller; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\TestSuite\TestCase; +use Cake\Utility\Security; /** diff --git a/lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php index f9ca2c6f2c5..3f210957fb0 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php @@ -19,12 +19,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\PaginatorComponent, - Cake\Controller\Controller, - Cake\Core\Configure, - Cake\Network\Request, - Cake\Utility\Set; +use Cake\Controller\Component\PaginatorComponent; +use Cake\Controller\Controller; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\Set; /** * PaginatorTestController class diff --git a/lib/Cake/Test/TestCase/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/RequestHandlerComponentTest.php index 67dcb1e76f8..67069301716 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/RequestHandlerComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/RequestHandlerComponentTest.php @@ -18,16 +18,16 @@ */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\RequestHandlerComponent, - Cake\Controller\Controller, - Cake\Controller\ComponentCollection, - Cake\Network\Request, - Cake\Network\Response, - Cake\Core\App, - Cake\Core\Configure, - Cake\Routing\Router, - TestApp\Controller\RequestHandlerTestController; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\RequestHandlerComponent; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use TestApp\Controller\RequestHandlerTestController; /** * RequestHandlerComponentTest class diff --git a/lib/Cake/Test/TestCase/Controller/Component/SecurityComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/SecurityComponentTest.php index c6abd804ee4..82191e3ff9f 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/SecurityComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/SecurityComponentTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\SecurityComponent, - Cake\Controller\Controller, - Cake\Core\Configure, - Cake\Utility\Security, - Cake\Network\Request; +use Cake\Controller\Component\SecurityComponent; +use Cake\Controller\Controller; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\Security; /** * TestSecurityComponent diff --git a/lib/Cake/Test/TestCase/Controller/Component/SessionComponentTest.php b/lib/Cake/Test/TestCase/Controller/Component/SessionComponentTest.php index 33bbce4a812..d8f2b8cdfc2 100644 --- a/lib/Cake/Test/TestCase/Controller/Component/SessionComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/Component/SessionComponentTest.php @@ -18,13 +18,13 @@ */ namespace Cake\Test\TestCase\Controller\Component; -use Cake\TestSuite\TestCase, - Cake\Controller\Component\SessionComponent, - Cake\Controller\Controller, - Cake\Controller\ComponentCollection, - Cake\Model\Datasource\Session, - Cake\Core\Configure, - Cake\Core\Object; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\SessionComponent; +use Cake\Controller\Controller; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Model\Datasource\Session; +use Cake\TestSuite\TestCase; /** * SessionComponentTest class diff --git a/lib/Cake/Test/TestCase/Controller/ComponentCollectionTest.php b/lib/Cake/Test/TestCase/Controller/ComponentCollectionTest.php index 72b6760b649..8d028862ae5 100644 --- a/lib/Cake/Test/TestCase/Controller/ComponentCollectionTest.php +++ b/lib/Cake/Test/TestCase/Controller/ComponentCollectionTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller; -use Cake\TestSuite\TestCase, - Cake\Controller\ComponentCollection, - Cake\Controller\Component\CookieComponent, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Component\CookieComponent; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; /** * Extended CookieComponent diff --git a/lib/Cake/Test/TestCase/Controller/ComponentTest.php b/lib/Cake/Test/TestCase/Controller/ComponentTest.php index 4caa2459ab8..2709fb0c9b7 100644 --- a/lib/Cake/Test/TestCase/Controller/ComponentTest.php +++ b/lib/Cake/Test/TestCase/Controller/ComponentTest.php @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller; -use Cake\TestSuite\TestCase, - Cake\Controller\Controller, - Cake\Controller\Component, - Cake\Controller\ComponentCollection, - Cake\Core\App, - Cake\Core\Configure, - Cake\Utility\ClassRegistry, - TestApp\Controller\Component\AppleComponent, - TestApp\Controller\Component\OrangeComponent, - TestApp\Controller\ComponentTestController; +use Cake\Controller\Component; +use Cake\Controller\ComponentCollection; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use TestApp\Controller\ComponentTestController; +use TestApp\Controller\Component\AppleComponent; +use TestApp\Controller\Component\OrangeComponent; /** * ComponentTest class diff --git a/lib/Cake/Test/TestCase/Controller/ControllerMergeVarsTest.php b/lib/Cake/Test/TestCase/Controller/ControllerMergeVarsTest.php index ef62322c7c0..2b82b966339 100644 --- a/lib/Cake/Test/TestCase/Controller/ControllerMergeVarsTest.php +++ b/lib/Cake/Test/TestCase/Controller/ControllerMergeVarsTest.php @@ -19,14 +19,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller; -use Cake\TestSuite\TestCase, - Cake\Controller\Controller, - Cake\Core\App, - Cake\Core\Object, - Cake\Core\Configure, - Cake\Core\Plugin, - TestApp\Controller\MergeVariablesController, - MergeVar\Controller\MergePostsController; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use MergeVar\Controller\MergePostsController; +use TestApp\Controller\MergeVariablesController; /** * Test Case for Controller Merging of Vars. diff --git a/lib/Cake/Test/TestCase/Controller/ControllerTest.php b/lib/Cake/Test/TestCase/Controller/ControllerTest.php index a441ea66561..33eb5314a96 100644 --- a/lib/Cake/Test/TestCase/Controller/ControllerTest.php +++ b/lib/Cake/Test/TestCase/Controller/ControllerTest.php @@ -13,19 +13,19 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Controller\Controller, - Cake\Core\App, - Cake\Core\Object, - Cake\Core\Plugin, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Network\Response, - Cake\Utility\ClassRegistry, - Cake\Utility\Set, - Cake\Utility\Hash, - TestPlugin\Controller\TestPluginController; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Router; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Set; +use TestPlugin\Controller\TestPluginController; /** * AppController class diff --git a/lib/Cake/Test/TestCase/Controller/PagesControllerTest.php b/lib/Cake/Test/TestCase/Controller/PagesControllerTest.php index 3d0549681ff..62b088ababd 100644 --- a/lib/Cake/Test/TestCase/Controller/PagesControllerTest.php +++ b/lib/Cake/Test/TestCase/Controller/PagesControllerTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller; -use Cake\TestSuite\TestCase, - Cake\Network\Request, - Cake\Network\Response, - Cake\Core\App, - \App\Controller\PagesController; +use Cake\Core\App; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\TestSuite\TestCase; +use \App\Controller\PagesController; /** * PagesControllerTest class diff --git a/lib/Cake/Test/TestCase/Controller/ScaffoldTest.php b/lib/Cake/Test/TestCase/Controller/ScaffoldTest.php index ce5d99d0952..b6b9fec443b 100644 --- a/lib/Cake/Test/TestCase/Controller/ScaffoldTest.php +++ b/lib/Cake/Test/TestCase/Controller/ScaffoldTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Controller; -use Cake\TestSuite\TestCase, - Cake\Controller\Scaffold, - Cake\Controller\Controller, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Core\Plugin; +use Cake\Controller\Controller; +use Cake\Controller\Scaffold; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; require_once dirname(dirname(__FILE__)) . DS . 'Model' . DS . 'models.php'; class_alias('Cake\Test\TestCase\Model\ScaffoldMock', 'Cake\Model\ScaffoldMock'); diff --git a/lib/Cake/Test/TestCase/Core/AppTest.php b/lib/Cake/Test/TestCase/Core/AppTest.php index ce5e4a0090b..3bb76a468f5 100644 --- a/lib/Cake/Test/TestCase/Core/AppTest.php +++ b/lib/Cake/Test/TestCase/Core/AppTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Core; -use Cake\TestSuite\TestCase, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; /** * AppTest class diff --git a/lib/Cake/Test/TestCase/Core/ConfigureTest.php b/lib/Cake/Test/TestCase/Core/ConfigureTest.php index aa1653e6150..bd3c269fbeb 100644 --- a/lib/Cake/Test/TestCase/Core/ConfigureTest.php +++ b/lib/Cake/Test/TestCase/Core/ConfigureTest.php @@ -19,12 +19,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Core; -use Cake\TestSuite\TestCase, - Cake\Core\Configure, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Cache\Cache, - Cake\Configure\PhpReader; +use Cake\Cache\Cache; +use Cake\Configure\PhpReader; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; /** * ConfigureTest diff --git a/lib/Cake/Test/TestCase/Core/ObjectTest.php b/lib/Cake/Test/TestCase/Core/ObjectTest.php index 2d7f5d3b1ba..97280f6aa3e 100644 --- a/lib/Cake/Test/TestCase/Core/ObjectTest.php +++ b/lib/Cake/Test/TestCase/Core/ObjectTest.php @@ -18,13 +18,13 @@ */ namespace Cake\Test\TestCase\Core; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Core\Object, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Routing\Router; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Routing\Router; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; /** * TestObject class diff --git a/lib/Cake/Test/TestCase/Core/PluginTest.php b/lib/Cake/Test/TestCase/Core/PluginTest.php index c479068ff4e..ea430a80e3c 100644 --- a/lib/Cake/Test/TestCase/Core/PluginTest.php +++ b/lib/Cake/Test/TestCase/Core/PluginTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Core; -use Cake\TestSuite\TestCase, - Cake\Core\Plugin, - Cake\Core\Configure, - Cake\Core\App; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; /** * PluginTest class diff --git a/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php b/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php index 96121f63f50..09c15fa0aed 100644 --- a/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php +++ b/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Error; -use Cake\TestSuite\TestCase, - Cake\Error\ErrorHandler, - Cake\Controller\Controller, - Cake\Routing\Router, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Log\Log, - Cake\Network\Request, - Cake\Error; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Error; +use Cake\Error\ErrorHandler; +use Cake\Log\Log; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; /** * ErrorHandlerTest class diff --git a/lib/Cake/Test/TestCase/Error/ExceptionRendererTest.php b/lib/Cake/Test/TestCase/Error/ExceptionRendererTest.php index 311aecb597c..f1c3b62e040 100644 --- a/lib/Cake/Test/TestCase/Error/ExceptionRendererTest.php +++ b/lib/Cake/Test/TestCase/Error/ExceptionRendererTest.php @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Error; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Error\ExceptionRenderer, - Cake\Controller\Controller, - Cake\Controller\Component, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Core\App, - Cake\Core\Configure, - Cake\Error; +use Cake\Controller\Component; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Error\ExceptionRenderer; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; /** * Short description for class. diff --git a/lib/Cake/Test/TestCase/Event/EventManagerTest.php b/lib/Cake/Test/TestCase/Event/EventManagerTest.php index 6b88da4a38b..0259bfb9a79 100644 --- a/lib/Cake/Test/TestCase/Event/EventManagerTest.php +++ b/lib/Cake/Test/TestCase/Event/EventManagerTest.php @@ -19,11 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Event; -use Cake\TestSuite\TestCase, - Cake\Event\Event, - Cake\Event\EventListener, - Cake\Event\EventManager, - Cake\Event\EventListiner; +use Cake\Event\Event; +use Cake\Event\EventListener; +use Cake\Event\EventListiner; +use Cake\Event\EventManager; +use Cake\TestSuite\TestCase; /** * Mock class used to test event dispatching diff --git a/lib/Cake/Test/TestCase/Event/EventTest.php b/lib/Cake/Test/TestCase/Event/EventTest.php index 2fda409a6b7..6766ddc3dc7 100644 --- a/lib/Cake/Test/TestCase/Event/EventTest.php +++ b/lib/Cake/Test/TestCase/Event/EventTest.php @@ -19,8 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Event; -use Cake\TestSuite\TestCase, - Cake\Event\Event; +use Cake\Event\Event; +use Cake\TestSuite\TestCase; /** * Tests the Cake\Event\Event class functionality diff --git a/lib/Cake/Test/TestCase/I18n/I18nTest.php b/lib/Cake/Test/TestCase/I18n/I18nTest.php index 891fec9f9f1..c3c652ef1e5 100644 --- a/lib/Cake/Test/TestCase/I18n/I18nTest.php +++ b/lib/Cake/Test/TestCase/I18n/I18nTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\I18n; -use Cake\TestSuite\TestCase, - Cake\I18n\I18n, - Cake\Cache\Cache, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Cache\Cache; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\I18n\I18n; +use Cake\TestSuite\TestCase; /** * I18nTest class diff --git a/lib/Cake/Test/TestCase/I18n/L10nTest.php b/lib/Cake/Test/TestCase/I18n/L10nTest.php index 9d7b600dc4d..4f8a6e219b7 100644 --- a/lib/Cake/Test/TestCase/I18n/L10nTest.php +++ b/lib/Cake/Test/TestCase/I18n/L10nTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\I18n; -use Cake\TestSuite\TestCase, - Cake\I18n\L10n; +use Cake\I18n\L10n; +use Cake\TestSuite\TestCase; /** * L10nTest class diff --git a/lib/Cake/Test/TestCase/I18n/MultibyteTest.php b/lib/Cake/Test/TestCase/I18n/MultibyteTest.php index 516075c73f5..99901b6d6da 100644 --- a/lib/Cake/Test/TestCase/I18n/MultibyteTest.php +++ b/lib/Cake/Test/TestCase/I18n/MultibyteTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\I18n; -use Cake\TestSuite\TestCase, - Cake\I18n\Multibyte; +use Cake\I18n\Multibyte; +use Cake\TestSuite\TestCase; /** * MultibyteTest class diff --git a/lib/Cake/Test/TestCase/Log/Engine/FileLogTest.php b/lib/Cake/Test/TestCase/Log/Engine/FileLogTest.php index c4a73329cd4..c70f4b11386 100644 --- a/lib/Cake/Test/TestCase/Log/Engine/FileLogTest.php +++ b/lib/Cake/Test/TestCase/Log/Engine/FileLogTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Log\Engine; -use Cake\TestSuite\TestCase, - Cake\Log\Engine\FileLog; +use Cake\Log\Engine\FileLog; +use Cake\TestSuite\TestCase; /** * CakeLogTest class diff --git a/lib/Cake/Test/TestCase/Log/LogTest.php b/lib/Cake/Test/TestCase/Log/LogTest.php index 56a8d06975d..fabcd1be4af 100644 --- a/lib/Cake/Test/TestCase/Log/LogTest.php +++ b/lib/Cake/Test/TestCase/Log/LogTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestSuite\Log; -use Cake\TestSuite\TestCase, - Cake\Log\Log, - Cake\Log\Engine\FileLog, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Log\Engine\FileLog; +use Cake\Log\Log; +use Cake\TestSuite\TestCase; /** * LogTest class diff --git a/lib/Cake/Test/TestCase/Model/Datasource/DataSourceTest.php b/lib/Cake/Test/TestCase/Model/Datasource/DataSourceTest.php index 2cd0fdfb0f8..89fb73319db 100644 --- a/lib/Cake/Test/TestCase/Model/Datasource/DataSourceTest.php +++ b/lib/Cake/Test/TestCase/Model/Datasource/DataSourceTest.php @@ -18,10 +18,10 @@ */ namespace Cake\Test\TestCase\Model\Datasource; -use Cake\TestSuite\TestCase, - Cake\Model\Model, - Cake\Model\ConnectionManager, - Cake\Model\Datasource\DataSource; +use Cake\Model\ConnectionManager; +use Cake\Model\Datasource\DataSource; +use Cake\Model\Model; +use Cake\TestSuite\TestCase; /** * TestSource diff --git a/lib/Cake/Test/TestCase/Model/models.php b/lib/Cake/Test/TestCase/Model/models.php index 418bc046fd6..0a83f26e5fd 100644 --- a/lib/Cake/Test/TestCase/Model/models.php +++ b/lib/Cake/Test/TestCase/Model/models.php @@ -19,8 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Model; -use Cake\TestSuite\Fixture\TestModel as CakeTestModel, - Cake\Model\Model; +use Cake\Model\Model; +use Cake\TestSuite\Fixture\TestModel as CakeTestModel; /** * AppModel class diff --git a/lib/Cake/Test/TestCase/Network/Email/DebugTransportTest.php b/lib/Cake/Test/TestCase/Network/Email/DebugTransportTest.php index c6967c3b0bf..678488f4a8e 100644 --- a/lib/Cake/Test/TestCase/Network/Email/DebugTransportTest.php +++ b/lib/Cake/Test/TestCase/Network/Email/DebugTransportTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Email; -use Cake\TestSuite\TestCase, - Cake\Network\Email\Email, - Cake\Network\Email\DebugTransport; +use Cake\Network\Email\DebugTransport; +use Cake\Network\Email\Email; +use Cake\TestSuite\TestCase; /** * Test case diff --git a/lib/Cake/Test/TestCase/Network/Email/EmailTest.php b/lib/Cake/Test/TestCase/Network/Email/EmailTest.php index af7c9ed8b21..682079d8ead 100644 --- a/lib/Cake/Test/TestCase/Network/Email/EmailTest.php +++ b/lib/Cake/Test/TestCase/Network/Email/EmailTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Email; -use Cake\TestSuite\TestCase, - Cake\Network\Email\Email, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Network\Email\Email; +use Cake\TestSuite\TestCase; /** * Help to test CakeEmail diff --git a/lib/Cake/Test/TestCase/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/TestCase/Network/Email/SmtpTransportTest.php index db34973a0c9..e1b9e66ce7d 100644 --- a/lib/Cake/Test/TestCase/Network/Email/SmtpTransportTest.php +++ b/lib/Cake/Test/TestCase/Network/Email/SmtpTransportTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Email; -use Cake\TestSuite\TestCase, - Cake\Network\Email\Email, - Cake\Network\Email\SmtpTransport, - Cake\Network\Socket; +use Cake\Network\Email\Email; +use Cake\Network\Email\SmtpTransport; +use Cake\Network\Socket; +use Cake\TestSuite\TestCase; /** * Help to test SmtpTransport diff --git a/lib/Cake/Test/TestCase/Network/Http/BasicAuthenticationTest.php b/lib/Cake/Test/TestCase/Network/Http/BasicAuthenticationTest.php index 63da967d444..295084d0999 100644 --- a/lib/Cake/Test/TestCase/Network/Http/BasicAuthenticationTest.php +++ b/lib/Cake/Test/TestCase/Network/Http/BasicAuthenticationTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Http; -use Cake\TestSuite\TestCase, - Cake\Network\Http\HttpSocket, - Cake\Network\Http\BasicAuthentication; +use Cake\Network\Http\BasicAuthentication; +use Cake\Network\Http\HttpSocket; +use Cake\TestSuite\TestCase; /** * BasicMethodTest class diff --git a/lib/Cake/Test/TestCase/Network/Http/DigestAuthenticationTest.php b/lib/Cake/Test/TestCase/Network/Http/DigestAuthenticationTest.php index 32a5c6634c7..8f1430ef9f4 100644 --- a/lib/Cake/Test/TestCase/Network/Http/DigestAuthenticationTest.php +++ b/lib/Cake/Test/TestCase/Network/Http/DigestAuthenticationTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Http; -use Cake\TestSuite\TestCase, - Cake\Network\Http\HttpSocket, - Cake\Network\Http\DigestAuthentication; +use Cake\Network\Http\DigestAuthentication; +use Cake\Network\Http\HttpSocket; +use Cake\TestSuite\TestCase; class DigestHttpSocket extends HttpSocket { diff --git a/lib/Cake/Test/TestCase/Network/Http/HttpResponseTest.php b/lib/Cake/Test/TestCase/Network/Http/HttpResponseTest.php index 07bce2b465e..c905848e4a3 100644 --- a/lib/Cake/Test/TestCase/Network/Http/HttpResponseTest.php +++ b/lib/Cake/Test/TestCase/Network/Http/HttpResponseTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Http; -use Cake\TestSuite\TestCase, - Cake\Network\Http\HttpSocket, - Cake\Network\Http\HttpResponse; +use Cake\Network\Http\HttpResponse; +use Cake\Network\Http\HttpSocket; +use Cake\TestSuite\TestCase; /** * TestHttpResponse class diff --git a/lib/Cake/Test/TestCase/Network/Http/HttpSocketTest.php b/lib/Cake/Test/TestCase/Network/Http/HttpSocketTest.php index 1737d8018c3..3189cc0dddb 100644 --- a/lib/Cake/Test/TestCase/Network/Http/HttpSocketTest.php +++ b/lib/Cake/Test/TestCase/Network/Http/HttpSocketTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network\Http; -use Cake\TestSuite\TestCase, - Cake\Network\Http\HttpSocket, - Cake\Network\Http\HttpResponse, - Cake\Utility\Set; +use Cake\Network\Http\HttpResponse; +use Cake\Network\Http\HttpSocket; +use Cake\TestSuite\TestCase; +use Cake\Utility\Set; /** * TestAuthentication class diff --git a/lib/Cake/Test/TestCase/Network/RequestTest.php b/lib/Cake/Test/TestCase/Network/RequestTest.php index 5fddb8ff763..11dc1ef2ddf 100644 --- a/lib/Cake/Test/TestCase/Network/RequestTest.php +++ b/lib/Cake/Test/TestCase/Network/RequestTest.php @@ -18,11 +18,11 @@ */ namespace Cake\Test\TestSuite\Network; -use Cake\TestSuite\TestCase, - Cake\Routing\Dispatcher, - Cake\Utility\Xml, - Cake\Network\Request, - Cake\Core\Configure; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Routing\Dispatcher; +use Cake\TestSuite\TestCase; +use Cake\Utility\Xml; class RequestTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Network/ResponseTest.php b/lib/Cake/Test/TestCase/Network/ResponseTest.php index a1946449095..58a3f87f546 100644 --- a/lib/Cake/Test/TestCase/Network/ResponseTest.php +++ b/lib/Cake/Test/TestCase/Network/ResponseTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network; -use Cake\TestSuite\TestCase, - Cake\Network\Request, - Cake\Network\Response; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\TestSuite\TestCase; class ResponseTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Network/SocketTest.php b/lib/Cake/Test/TestCase/Network/SocketTest.php index 559036bdcc3..66b031d2fc9 100644 --- a/lib/Cake/Test/TestCase/Network/SocketTest.php +++ b/lib/Cake/Test/TestCase/Network/SocketTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Network; -use Cake\TestSuite\TestCase, - Cake\Network\Socket; +use Cake\Network\Socket; +use Cake\TestSuite\TestCase; /** * SocketTest class diff --git a/lib/Cake/Test/TestCase/Routing/DispatcherTest.php b/lib/Cake/Test/TestCase/Routing/DispatcherTest.php index 56baa3d8d02..67992b716e7 100644 --- a/lib/Cake/Test/TestCase/Routing/DispatcherTest.php +++ b/lib/Cake/Test/TestCase/Routing/DispatcherTest.php @@ -18,17 +18,17 @@ */ namespace Cake\Test\TestCase\Routing; -use Cake\TestSuite\TestCase, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Routing\Dispatcher, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Network\Response, - Cake\Event\Event, - Cake\Controller\Controller, - Cake\Utility\Inflector; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Event\Event; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\Routing\Dispatcher; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use Cake\Utility\Inflector; /** * A testing stub that doesn't send headers. diff --git a/lib/Cake/Test/TestCase/Routing/Route/PluginShortRouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/PluginShortRouteTest.php index c500779d9d4..db2faaa0cb4 100644 --- a/lib/Cake/Test/TestCase/Routing/Route/PluginShortRouteTest.php +++ b/lib/Cake/Test/TestCase/Routing/Route/PluginShortRouteTest.php @@ -18,11 +18,11 @@ */ namespace Cake\Test\TestCase\Routing\Route; -use Cake\TestSuite\TestCase, - Cake\Routing\Route\PluginShortRoute, - Cake\Routing\Router, - Cake\Core\Configure, - Cake\Core\App; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Routing\Route\PluginShortRoute; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; /** * test case for PluginShortRoute diff --git a/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php index 988ee0a301f..ab3f20bb758 100644 --- a/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php +++ b/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php @@ -19,12 +19,12 @@ namespace Cake\Test\TestCase\Routing\Route; -use Cake\TestSuite\TestCase, - Cake\Routing\Route\RedirectRoute, - Cake\Routing\Router, - Cake\Network\Response, - Cake\Core\Configure, - Cake\Core\App; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Network\Response; +use Cake\Routing\Route\RedirectRoute; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; /** * test case for RedirectRoute diff --git a/lib/Cake/Test/TestCase/Routing/Route/RouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/RouteTest.php index 9dd00a1e901..1c1b7f7145b 100644 --- a/lib/Cake/Test/TestCase/Routing/Route/RouteTest.php +++ b/lib/Cake/Test/TestCase/Routing/Route/RouteTest.php @@ -18,11 +18,11 @@ */ namespace Cake\Test\TestCase\Routing\Route; -use Cake\TestSuite\TestCase, - Cake\Routing\Route\Route, - Cake\Routing\Router, - Cake\Core\Configure, - Cake\Core\App; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Routing\Route\Route; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; /** * Test case for Route diff --git a/lib/Cake/Test/TestCase/Routing/RouterTest.php b/lib/Cake/Test/TestCase/Routing/RouterTest.php index a5e86e269a6..352e1fd7f60 100644 --- a/lib/Cake/Test/TestCase/Routing/RouterTest.php +++ b/lib/Cake/Test/TestCase/Routing/RouterTest.php @@ -18,13 +18,13 @@ */ namespace Cake\Test\TestCase\Routing; -use Cake\TestSuite\TestCase, - Cake\Routing\Router, - Cake\Routing\Route\Route, - Cake\Network\Request, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\Routing\Route\Route; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; if (!defined('FULL_BASE_URL')) { define('FULL_BASE_URL', 'http://cakephp.org'); diff --git a/lib/Cake/Test/TestCase/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/TestCase/TestSuite/ControllerTestCaseTest.php index 293edbd117a..dfcf626c611 100644 --- a/lib/Cake/Test/TestCase/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/TestCase/TestSuite/ControllerTestCaseTest.php @@ -19,15 +19,15 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\TestSuite; -use Cake\TestSuite\TestCase, - Cake\Controller\Controller, - Cake\Model\Model, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Routing\Router, - Cake\Utility\ClassRegistry, - Cake\TestSuite\Reporter\HtmlReporter; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\Routing\Router; +use Cake\TestSuite\Reporter\HtmlReporter; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; require_once dirname(dirname(__FILE__)) . DS . 'Model' . DS . 'models.php'; diff --git a/lib/Cake/Test/TestCase/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/TestCase/TestSuite/HtmlCoverageReportTest.php index 3a055aafd62..d815e9210db 100644 --- a/lib/Cake/Test/TestCase/TestSuite/HtmlCoverageReportTest.php +++ b/lib/Cake/Test/TestCase/TestSuite/HtmlCoverageReportTest.php @@ -18,11 +18,11 @@ */ namespace Cake\Test\TestCase\TestSuite; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Coverage\HtmlCoverageReport, - Cake\TestSuite\Reporter\BaseReporter, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\Coverage\HtmlCoverageReport; +use Cake\TestSuite\Reporter\BaseReporter; +use Cake\TestSuite\TestCase; class HtmlCoverageReportTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/TestSuite/TestCaseTest.php b/lib/Cake/Test/TestCase/TestSuite/TestCaseTest.php index e97c6aecfaa..337f7b3cad2 100644 --- a/lib/Cake/Test/TestCase/TestSuite/TestCaseTest.php +++ b/lib/Cake/Test/TestCase/TestSuite/TestCaseTest.php @@ -19,10 +19,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\TestSuite; -use Cake\TestSuite\TestCase, - Cake\Controller\Controller, - Cake\Test\Fixture\AssertTagsTestCase, - Cake\Test\Fixture\FixturizedTestCase; +use Cake\Controller\Controller; +use Cake\TestSuite\TestCase; +use Cake\Test\Fixture\AssertTagsTestCase; +use Cake\Test\Fixture\FixturizedTestCase; /** * TestCaseTest diff --git a/lib/Cake/Test/TestCase/TestSuite/TestFixtureTest.php b/lib/Cake/Test/TestCase/TestSuite/TestFixtureTest.php index d4621212926..58d42dc8aeb 100644 --- a/lib/Cake/Test/TestCase/TestSuite/TestFixtureTest.php +++ b/lib/Cake/Test/TestCase/TestSuite/TestFixtureTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\TestSuite; -use Cake\TestSuite\Fixture\TestFixture, - Cake\TestSuite\TestCase, - Cake\Model\Model, - Cake\Model\ConnectionManager, - Cake\Utility\ClassRegistry; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; +use Cake\TestSuite\Fixture\TestFixture; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; /** * TestFixtureTestFixture class diff --git a/lib/Cake/Test/TestCase/TestSuite/TestSuiteTest.php b/lib/Cake/Test/TestCase/TestSuite/TestSuiteTest.php index 522cb27c9b1..55873720a01 100644 --- a/lib/Cake/Test/TestCase/TestSuite/TestSuiteTest.php +++ b/lib/Cake/Test/TestCase/TestSuite/TestSuiteTest.php @@ -13,8 +13,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\TestSuite; -use Cake\TestSuite\TestCase, - Cake\Utility\Folder; +use Cake\TestSuite\TestCase; +use Cake\Utility\Folder; /** * TestSuiteTest diff --git a/lib/Cake/Test/TestCase/Utility/ClassRegistryTest.php b/lib/Cake/Test/TestCase/Utility/ClassRegistryTest.php index 689b5b8c7e4..a0db84c33f4 100644 --- a/lib/Cake/Test/TestCase/Utility/ClassRegistryTest.php +++ b/lib/Cake/Test/TestCase/Utility/ClassRegistryTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\Fixture\TestModel, - Cake\TestSuite\TestCase, - Cake\Core\Plugin, - Cake\Model\ConnectionManager, - Cake\Utility\ClassRegistry; +use Cake\Core\Plugin; +use Cake\Model\ConnectionManager; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; /** * ClassRegisterModel class diff --git a/lib/Cake/Test/TestCase/Utility/DebuggerTest.php b/lib/Cake/Test/TestCase/Utility/DebuggerTest.php index 03f788e4660..660524a603b 100644 --- a/lib/Cake/Test/TestCase/Utility/DebuggerTest.php +++ b/lib/Cake/Test/TestCase/Utility/DebuggerTest.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\Utility\Debugger, - Cake\TestSuite\TestCase, - Cake\Core\Configure, - Cake\Controller\Controller, - Cake\View\View; +use Cake\Controller\Controller; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; +use Cake\Utility\Debugger; +use Cake\View\View; /** * DebugggerTestCaseDebuggger class diff --git a/lib/Cake/Test/TestCase/Utility/FileTest.php b/lib/Cake/Test/TestCase/Utility/FileTest.php index 0e93156c3b1..eb46d6c3261 100644 --- a/lib/Cake/Test/TestCase/Utility/FileTest.php +++ b/lib/Cake/Test/TestCase/Utility/FileTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\File, - Cake\Utility\Folder; +use Cake\TestSuite\TestCase; +use Cake\Utility\File; +use Cake\Utility\Folder; /** * FileTest class diff --git a/lib/Cake/Test/TestCase/Utility/FolderTest.php b/lib/Cake/Test/TestCase/Utility/FolderTest.php index 5440fa9b794..52a6e56cf95 100644 --- a/lib/Cake/Test/TestCase/Utility/FolderTest.php +++ b/lib/Cake/Test/TestCase/Utility/FolderTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\File, - Cake\Utility\Folder; +use Cake\TestSuite\TestCase; +use Cake\Utility\File; +use Cake\Utility\Folder; /** * FolderTest class diff --git a/lib/Cake/Test/TestCase/Utility/HashTest.php b/lib/Cake/Test/TestCase/Utility/HashTest.php index 428f69b9926..26c0f7f531b 100644 --- a/lib/Cake/Test/TestCase/Utility/HashTest.php +++ b/lib/Cake/Test/TestCase/Utility/HashTest.php @@ -13,8 +13,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\Hash; +use Cake\TestSuite\TestCase; +use Cake\Utility\Hash; class HashTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/Utility/InflectorTest.php b/lib/Cake/Test/TestCase/Utility/InflectorTest.php index 6431d6e304f..c6063f5680b 100644 --- a/lib/Cake/Test/TestCase/Utility/InflectorTest.php +++ b/lib/Cake/Test/TestCase/Utility/InflectorTest.php @@ -19,8 +19,8 @@ * @license Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\Inflector; +use Cake\TestSuite\TestCase; +use Cake\Utility\Inflector; /** * Short description for class. diff --git a/lib/Cake/Test/TestCase/Utility/NumberTest.php b/lib/Cake/Test/TestCase/Utility/NumberTest.php index b9b86930a03..215e1081057 100644 --- a/lib/Cake/Test/TestCase/Utility/NumberTest.php +++ b/lib/Cake/Test/TestCase/Utility/NumberTest.php @@ -18,8 +18,8 @@ */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\Number; +use Cake\TestSuite\TestCase; +use Cake\Utility\Number; /** * NumberTest class diff --git a/lib/Cake/Test/TestCase/Utility/ObjectCollectionTest.php b/lib/Cake/Test/TestCase/Utility/ObjectCollectionTest.php index e01916fa48a..96bd67cba49 100644 --- a/lib/Cake/Test/TestCase/Utility/ObjectCollectionTest.php +++ b/lib/Cake/Test/TestCase/Utility/ObjectCollectionTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Event\Event, - Cake\Utility\ObjectCollection, - Cake\Core\Object; +use Cake\Core\Object; +use Cake\Event\Event; +use Cake\TestSuite\TestCase; +use Cake\Utility\ObjectCollection; /** * A generic object class diff --git a/lib/Cake/Test/TestCase/Utility/SanitizeTest.php b/lib/Cake/Test/TestCase/Utility/SanitizeTest.php index ae2196424ef..a80700fa0a9 100644 --- a/lib/Cake/Test/TestCase/Utility/SanitizeTest.php +++ b/lib/Cake/Test/TestCase/Utility/SanitizeTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Utility\Sanitize; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; +use Cake\Utility\Sanitize; /** diff --git a/lib/Cake/Test/TestCase/Utility/SecurityTest.php b/lib/Cake/Test/TestCase/Utility/SecurityTest.php index d12616eae67..917c49f21ed 100644 --- a/lib/Cake/Test/TestCase/Utility/SecurityTest.php +++ b/lib/Cake/Test/TestCase/Utility/SecurityTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Core\Configure, - Cake\Utility\Security; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; +use Cake\Utility\Security; /** * SecurityTest class diff --git a/lib/Cake/Test/TestCase/Utility/SetTest.php b/lib/Cake/Test/TestCase/Utility/SetTest.php index 8bb33b7569a..017ad728673 100644 --- a/lib/Cake/Test/TestCase/Utility/SetTest.php +++ b/lib/Cake/Test/TestCase/Utility/SetTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\Set, - Cake\Utility\Xml, - Cake\Model\Model; +use Cake\Model\Model; +use Cake\TestSuite\TestCase; +use Cake\Utility\Set; +use Cake\Utility\Xml; /** * SetTest class diff --git a/lib/Cake/Test/TestCase/Utility/StringTest.php b/lib/Cake/Test/TestCase/Utility/StringTest.php index 363f09119b6..5a50e7f47f7 100644 --- a/lib/Cake/Test/TestCase/Utility/StringTest.php +++ b/lib/Cake/Test/TestCase/Utility/StringTest.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\String; +use Cake\TestSuite\TestCase; +use Cake\Utility\String; /** * StringTest class diff --git a/lib/Cake/Test/TestCase/Utility/TimeTest.php b/lib/Cake/Test/TestCase/Utility/TimeTest.php index 1161a1c765c..d7cd7fb27fb 100644 --- a/lib/Cake/Test/TestCase/Utility/TimeTest.php +++ b/lib/Cake/Test/TestCase/Utility/TimeTest.php @@ -18,11 +18,11 @@ */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Utility\Time, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Object; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\TestSuite\TestCase; +use Cake\Utility\Time; /** * TimeTest class diff --git a/lib/Cake/Test/TestCase/Utility/ValidationTest.php b/lib/Cake/Test/TestCase/Utility/ValidationTest.php index 326add5f7b5..0e4441f2da7 100644 --- a/lib/Cake/Test/TestCase/Utility/ValidationTest.php +++ b/lib/Cake/Test/TestCase/Utility/ValidationTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\Core\Configure, - Cake\Utility\Validation; +use Cake\Core\Configure; +use Cake\TestSuite\TestCase; +use Cake\Utility\Validation; /** * CustomValidator class diff --git a/lib/Cake/Test/TestCase/Utility/XmlTest.php b/lib/Cake/Test/TestCase/Utility/XmlTest.php index 515c79b804f..cd4074ed403 100644 --- a/lib/Cake/Test/TestCase/Utility/XmlTest.php +++ b/lib/Cake/Test/TestCase/Utility/XmlTest.php @@ -17,10 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\Utility; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Utility\Xml, - Cake\Core\Configure; +use Cake\Core\Configure; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; +use Cake\Utility\Xml; /** * Article class diff --git a/lib/Cake/Test/TestCase/View/Helper/CacheHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/CacheHelperTest.php index a3e43b9e7af..fa0f21c612c 100644 --- a/lib/Cake/Test/TestCase/View/Helper/CacheHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/CacheHelperTest.php @@ -18,15 +18,15 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\Controller\Controller, - Cake\Model\Model, - Cake\View\View, - Cake\View\Helper\CacheHelper, - Cake\Core\App, - Cake\Core\Configure, - Cake\Routing\Router, - Cake\Network\Request; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Model\Model; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\CacheHelper; +use Cake\View\View; /** * CacheTestController class diff --git a/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php index b6e4855d0a6..144c87575e9 100644 --- a/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php @@ -18,20 +18,20 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\TestSuite\Fixture\TestModel, - Cake\Controller\Controller, - Cake\Model\Model, - Cake\View\View, - Cake\View\Helper\FormHelper, - Cake\View\Helper\HtmlHelper, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Core\Configure, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Utility\ClassRegistry, - Cake\Utility\Security; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\Fixture\TestModel; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Security; +use Cake\View\Helper\FormHelper; +use Cake\View\Helper\HtmlHelper; +use Cake\View\View; /** * ContactTestController class diff --git a/lib/Cake/Test/TestCase/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/HtmlHelperTest.php index 9cd30f64837..39e99609105 100644 --- a/lib/Cake/Test/TestCase/View/Helper/HtmlHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/HtmlHelperTest.php @@ -18,20 +18,20 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\Model\Model, - Cake\Controller\Controller, - Cake\Routing\Router, - Cake\View\View, - Cake\View\Helper\FormHelper, - Cake\View\Helper\HtmlHelper, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Network\Request, - Cake\Utility\ClassRegistry, - Cake\Utility\File, - Cake\Utility\Folder; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\File; +use Cake\Utility\Folder; +use Cake\View\Helper\FormHelper; +use Cake\View\Helper\HtmlHelper; +use Cake\View\View; if (!defined('FULL_BASE_URL')) { define('FULL_BASE_URL', 'http://cakephp.org'); diff --git a/lib/Cake/Test/TestCase/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/JqueryEngineHelperTest.php index f34af5e27b8..c37be89ca40 100644 --- a/lib/Cake/Test/TestCase/View/Helper/JqueryEngineHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/JqueryEngineHelperTest.php @@ -17,11 +17,11 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\HtmlHelper, - Cake\View\Helper\JsHelper, - Cake\View\Helper\JqueryEngineHelper, - Cake\View\View; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\HtmlHelper; +use Cake\View\Helper\JqueryEngineHelper; +use Cake\View\Helper\JsHelper; +use Cake\View\View; class JqueryEngineHelperTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/View/Helper/JsHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/JsHelperTest.php index 28139880cb9..faccdbe206c 100644 --- a/lib/Cake/Test/TestCase/View/Helper/JsHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/JsHelperTest.php @@ -20,15 +20,15 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\HtmlHelper, - Cake\View\Helper\JsHelper, - Cake\View\Helper\JsBaseEngineHelper, - Cake\View\Helper\FormHelper, - Cake\View\View, - Cake\Utility\ClassRegistry, - Cake\Network\Request, - Cake\Core\Configure; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\View\Helper\FormHelper; +use Cake\View\Helper\HtmlHelper; +use Cake\View\Helper\JsBaseEngineHelper; +use Cake\View\Helper\JsHelper; +use Cake\View\View; class JsEncodingObject { diff --git a/lib/Cake/Test/TestCase/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/MootoolsEngineHelperTest.php index dc221674566..efaa37da4ee 100644 --- a/lib/Cake/Test/TestCase/View/Helper/MootoolsEngineHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/MootoolsEngineHelperTest.php @@ -18,11 +18,11 @@ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\View, - Cake\View\Helper\HtmlHelper, - Cake\View\Helper\JsHelper, - Cake\View\Helper\MootoolsEngineHelper; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\HtmlHelper; +use Cake\View\Helper\JsHelper; +use Cake\View\Helper\MootoolsEngineHelper; +use Cake\View\View; class MootoolsEngineHelperTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/View/Helper/NumberHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/NumberHelperTest.php index 8d2a190334a..3b4a5463043 100644 --- a/lib/Cake/Test/TestCase/View/Helper/NumberHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/NumberHelperTest.php @@ -18,12 +18,12 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\NumberHelper, - Cake\View\View, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\NumberHelper; +use Cake\View\View; /** * NumberHelperTestObject class diff --git a/lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php index fcf5fd5b12e..a53e1817d79 100644 --- a/lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php @@ -17,15 +17,15 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\PaginatorHelper, - Cake\View\Helper\HtmlHelper, - Cake\View\Helper\FormHelper, - Cake\View\Helper\JsHelper, - Cake\View\View, - Cake\Network\Request, - Cake\Core\Configure, - Cake\Routing\Router; +use Cake\Core\Configure; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\FormHelper; +use Cake\View\Helper\HtmlHelper; +use Cake\View\Helper\JsHelper; +use Cake\View\Helper\PaginatorHelper; +use Cake\View\View; if (!defined('FULL_BASE_URL')) { define('FULL_BASE_URL', 'http://cakephp.org'); diff --git a/lib/Cake/Test/TestCase/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/PrototypeEngineHelperTest.php index 85bf90c1182..d78c9f48749 100644 --- a/lib/Cake/Test/TestCase/View/Helper/PrototypeEngineHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/PrototypeEngineHelperTest.php @@ -17,11 +17,11 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\View, - Cake\View\Helper\HtmlHelper, - Cake\View\Helper\JsHelper, - Cake\View\Helper\PrototypeEngineHelper; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\HtmlHelper; +use Cake\View\Helper\JsHelper; +use Cake\View\Helper\PrototypeEngineHelper; +use Cake\View\View; class PrototypeEngineHelperTest extends TestCase { diff --git a/lib/Cake/Test/TestCase/View/Helper/RssHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/RssHelperTest.php index e7b022c13fb..0d24a627fa7 100644 --- a/lib/Cake/Test/TestCase/View/Helper/RssHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/RssHelperTest.php @@ -18,12 +18,12 @@ */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\RssHelper, - Cake\View\Helper\TimeHelper, - Cake\View\View, - Cake\Utility\Folder, - Cake\Utility\File; +use Cake\TestSuite\TestCase; +use Cake\Utility\File; +use Cake\Utility\Folder; +use Cake\View\Helper\RssHelper; +use Cake\View\Helper\TimeHelper; +use Cake\View\View; /** * RssHelperTest class diff --git a/lib/Cake/Test/TestCase/View/Helper/SessionHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/SessionHelperTest.php index da98da34a93..1a1af795abb 100644 --- a/lib/Cake/Test/TestCase/View/Helper/SessionHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/SessionHelperTest.php @@ -17,13 +17,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\SessionHelper, - Cake\View\View, - Cake\Controller\Controller, - Cake\Model\Datasource\Session, - Cake\Core\Plugin, - Cake\Core\App; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Model\Datasource\Session; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\SessionHelper; +use Cake\View\View; /** * SessionHelperTest class diff --git a/lib/Cake/Test/TestCase/View/Helper/TextHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/TextHelperTest.php index 6c0d935e67e..2505791fa9a 100644 --- a/lib/Cake/Test/TestCase/View/Helper/TextHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/TextHelperTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\TextHelper, - Cake\View\View, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\TextHelper; +use Cake\View\View; class TextHelperTestObject extends TextHelper { diff --git a/lib/Cake/Test/TestCase/View/Helper/TimeHelperTest.php b/lib/Cake/Test/TestCase/View/Helper/TimeHelperTest.php index e66959d12c6..5f9eb651eb0 100644 --- a/lib/Cake/Test/TestCase/View/Helper/TimeHelperTest.php +++ b/lib/Cake/Test/TestCase/View/Helper/TimeHelperTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View\Helper; -use Cake\TestSuite\TestCase, - Cake\View\Helper\TimeHelper, - Cake\View\View, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\View\Helper\TimeHelper; +use Cake\View\View; /** * TimeHelperTestObject class diff --git a/lib/Cake/Test/TestCase/View/HelperCollectionTest.php b/lib/Cake/Test/TestCase/View/HelperCollectionTest.php index 0797f00573f..43cc0d5080c 100644 --- a/lib/Cake/Test/TestCase/View/HelperCollectionTest.php +++ b/lib/Cake/Test/TestCase/View/HelperCollectionTest.php @@ -18,12 +18,12 @@ */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\HelperCollection, - Cake\View\View, - Cake\View\Helper\HtmlHelper, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\TestSuite\TestCase; +use Cake\View\HelperCollection; +use Cake\View\Helper\HtmlHelper; +use Cake\View\View; /** * Extended HtmlHelper diff --git a/lib/Cake/Test/TestCase/View/HelperTest.php b/lib/Cake/Test/TestCase/View/HelperTest.php index f8f7ad95c37..f3f38f076bd 100644 --- a/lib/Cake/Test/TestCase/View/HelperTest.php +++ b/lib/Cake/Test/TestCase/View/HelperTest.php @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\Helper, - Cake\View\View, - Cake\Model\Model, - Cake\Routing\Router, - Cake\Network\Request, - Cake\Core\Plugin, - Cake\Core\Configure, - Cake\Core\App, - Cake\Utility\ClassRegistry; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Model\Model; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\View\Helper; +use Cake\View\View; /** * HelperTestPost class diff --git a/lib/Cake/Test/TestCase/View/JsonViewTest.php b/lib/Cake/Test/TestCase/View/JsonViewTest.php index ec3d8d80719..b1361538297 100644 --- a/lib/Cake/Test/TestCase/View/JsonViewTest.php +++ b/lib/Cake/Test/TestCase/View/JsonViewTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\JsonView, - Cake\Controller\Controller, - Cake\Network\Request, - Cake\Network\Response, - Cake\Core\App; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\TestSuite\TestCase; +use Cake\View\JsonView; /** * JsonViewTest diff --git a/lib/Cake/Test/TestCase/View/MediaViewTest.php b/lib/Cake/Test/TestCase/View/MediaViewTest.php index 89fa6138415..6f2e1402910 100644 --- a/lib/Cake/Test/TestCase/View/MediaViewTest.php +++ b/lib/Cake/Test/TestCase/View/MediaViewTest.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\MediaView, - Cake\Controller\Controller; +use Cake\Controller\Controller; +use Cake\TestSuite\TestCase; +use Cake\View\MediaView; /** * MediaViewTest class diff --git a/lib/Cake/Test/TestCase/View/ScaffoldViewTest.php b/lib/Cake/Test/TestCase/View/ScaffoldViewTest.php index 0e0ec7e4dab..3f39a7bf877 100644 --- a/lib/Cake/Test/TestCase/View/ScaffoldViewTest.php +++ b/lib/Cake/Test/TestCase/View/ScaffoldViewTest.php @@ -17,15 +17,15 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\ScaffoldView, - Cake\Controller\Controller, - Cake\Controller\Scaffold, - Cake\Network\Request, - Cake\Routing\Router, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin; +use Cake\Controller\Controller; +use Cake\Controller\Scaffold; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\Routing\Router; +use Cake\TestSuite\TestCase; +use Cake\View\ScaffoldView; require_once dirname(dirname(__FILE__)) . DS . 'Model' . DS . 'models.php'; class_alias('Cake\Test\TestCase\Model\ScaffoldMock', 'Cake\Model\ScaffoldMock'); diff --git a/lib/Cake/Test/TestCase/View/ThemeViewTest.php b/lib/Cake/Test/TestCase/View/ThemeViewTest.php index c1b5c710f95..e12296776e2 100644 --- a/lib/Cake/Test/TestCase/View/ThemeViewTest.php +++ b/lib/Cake/Test/TestCase/View/ThemeViewTest.php @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\ThemeView, - Cake\Controller\Controller, - Cake\Network\Request, - Cake\Core\App, - Cake\Core\Plugin; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\View\ThemeView; /** * ThemePosts2Controller class diff --git a/lib/Cake/Test/TestCase/View/ViewTest.php b/lib/Cake/Test/TestCase/View/ViewTest.php index 6ca62865c90..13eb3cbe488 100644 --- a/lib/Cake/Test/TestCase/View/ViewTest.php +++ b/lib/Cake/Test/TestCase/View/ViewTest.php @@ -18,16 +18,16 @@ */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\View, - Cake\View\Helper, - Cake\Controller\Controller, - Cake\Cache\Cache, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Network\Request, - Cake\Utility\ClassRegistry; +use Cake\Cache\Cache; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Network\Request; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\View\Helper; +use Cake\View\View; /** * ViewPostsController class diff --git a/lib/Cake/Test/TestCase/View/XmlViewTest.php b/lib/Cake/Test/TestCase/View/XmlViewTest.php index 0e185f44661..40097b140e3 100644 --- a/lib/Cake/Test/TestCase/View/XmlViewTest.php +++ b/lib/Cake/Test/TestCase/View/XmlViewTest.php @@ -17,13 +17,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Test\TestCase\View; -use Cake\TestSuite\TestCase, - Cake\View\XmlView, - Cake\Network\Request, - Cake\Network\Response, - Cake\Controller\Controller, - Cake\Core\App, - Cake\Utility\Xml; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Network\Request; +use Cake\Network\Response; +use Cake\TestSuite\TestCase; +use Cake\Utility\Xml; +use Cake\View\XmlView; /** * XmlViewTest diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php index cb170f718cb..f71d74fd471 100644 --- a/lib/Cake/TestSuite/ControllerTestCase.php +++ b/lib/Cake/TestSuite/ControllerTestCase.php @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite; -use Cake\Routing\Dispatcher, - Cake\Routing\Router, - Cake\View\Helper, - Cake\Event\Event, - Cake\Utility\Inflector, - Cake\Utility\ClassRegistry, - Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Event\Event; +use Cake\Routing\Dispatcher; +use Cake\Routing\Router; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; +use Cake\View\Helper; /** * ControllerTestDispatcher class diff --git a/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php b/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php index 130a14f32ff..f3452e33579 100644 --- a/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php +++ b/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php @@ -18,9 +18,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite\Coverage; -use Cake\TestSuite\Reporter\BaseReporter, - Cake\Core\App, - Cake\Utility\Inflector; +use Cake\Core\App; +use Cake\TestSuite\Reporter\BaseReporter; +use Cake\Utility\Inflector; /** * Abstract class for common CoverageReport methods. diff --git a/lib/Cake/TestSuite/Fixture/FixtureManager.php b/lib/Cake/TestSuite/Fixture/FixtureManager.php index 7d51391fbdd..ca17856cc66 100644 --- a/lib/Cake/TestSuite/Fixture/FixtureManager.php +++ b/lib/Cake/TestSuite/Fixture/FixtureManager.php @@ -17,13 +17,13 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite\Fixture; -use Cake\Model\ConnectionManager, - Cake\Core\Plugin, - Cake\Core\Configure, - Cake\Core\App, - Cake\TestSuite\TestCase, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Plugin; +use Cake\Model\ConnectionManager; +use Cake\TestSuite\TestCase; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; /** * A factory class to manage the life cycle of test fixtures diff --git a/lib/Cake/TestSuite/Fixture/TestFixture.php b/lib/Cake/TestSuite/Fixture/TestFixture.php index 579c9b711b3..abea0b20768 100644 --- a/lib/Cake/TestSuite/Fixture/TestFixture.php +++ b/lib/Cake/TestSuite/Fixture/TestFixture.php @@ -13,14 +13,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite\Fixture; -use Cake\Model\Schema, - Cake\Model\Model, - Cake\Model\ConnectionManager, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Utility\Set, - Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; +use Cake\Model\Schema; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Inflector; +use Cake\Utility\Set; /** * TestFixture is responsible for building and destroying tables to be used diff --git a/lib/Cake/TestSuite/Reporter/HtmlReporter.php b/lib/Cake/TestSuite/Reporter/HtmlReporter.php index 6c4f75c45af..16ed7265ec9 100644 --- a/lib/Cake/TestSuite/Reporter/HtmlReporter.php +++ b/lib/Cake/TestSuite/Reporter/HtmlReporter.php @@ -16,9 +16,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite\Reporter; -use Cake\Core\App, - Cake\TestSuite\Coverage\HtmlCoverageReport, - Cake\Utility\Inflector; +use Cake\Core\App; +use Cake\TestSuite\Coverage\HtmlCoverageReport; +use Cake\Utility\Inflector; /** * HtmlReporter Reports Results of TestSuites and Test Cases diff --git a/lib/Cake/TestSuite/Reporter/TextReporter.php b/lib/Cake/TestSuite/Reporter/TextReporter.php index 8c28da2cf84..3cf115c8ecd 100644 --- a/lib/Cake/TestSuite/Reporter/TextReporter.php +++ b/lib/Cake/TestSuite/Reporter/TextReporter.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite\Reporter; -use Cake\TestSuite\Coverage\TextCoverageReport, - Cake\Utility\Inflector; +use Cake\TestSuite\Coverage\TextCoverageReport; +use Cake\Utility\Inflector; /** * TextReporter contains reporting features used for plain text based output diff --git a/lib/Cake/TestSuite/TestCase.php b/lib/Cake/TestSuite/TestCase.php index f45cba9f151..2e8c90786ff 100644 --- a/lib/Cake/TestSuite/TestCase.php +++ b/lib/Cake/TestSuite/TestCase.php @@ -18,10 +18,10 @@ */ namespace Cake\TestSuite; -use Cake\Core\App, - Cake\Core\Configure, - Cake\Routing\Router, - Cake\Utility\ClassRegistry; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Routing\Router; +use Cake\Utility\ClassRegistry; /** * Cake TestCase class diff --git a/lib/Cake/TestSuite/TestLoader.php b/lib/Cake/TestSuite/TestLoader.php index 3987cf36c67..e2301cf3abc 100644 --- a/lib/Cake/TestSuite/TestLoader.php +++ b/lib/Cake/TestSuite/TestLoader.php @@ -19,8 +19,8 @@ * @package Cake.TestSuite */ namespace Cake\TestSuite; -use Cake\Core\Plugin, - Cake\Error; +use Cake\Core\Plugin; +use Cake\Error; /** * TestLoader for CakePHP Test suite. diff --git a/lib/Cake/TestSuite/TestRunner.php b/lib/Cake/TestSuite/TestRunner.php index 641c06ffa4b..17b751bc765 100644 --- a/lib/Cake/TestSuite/TestRunner.php +++ b/lib/Cake/TestSuite/TestRunner.php @@ -16,8 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite; -use Cake\Core\App, - Cake\Core\ClassLoader; +use Cake\Core\App; +use Cake\Core\ClassLoader; require_once 'PHPUnit/TextUI/TestRunner.php'; diff --git a/lib/Cake/TestSuite/TestSuiteCommand.php b/lib/Cake/TestSuite/TestSuiteCommand.php index 96f5a2d6388..59d20c269b9 100644 --- a/lib/Cake/TestSuite/TestSuiteCommand.php +++ b/lib/Cake/TestSuite/TestSuiteCommand.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite; -use Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; require_once 'PHPUnit/TextUI/Command.php'; diff --git a/lib/Cake/TestSuite/TestSuiteDispatcher.php b/lib/Cake/TestSuite/TestSuiteDispatcher.php index 9aa117f42ce..ea40848e30a 100644 --- a/lib/Cake/TestSuite/TestSuiteDispatcher.php +++ b/lib/Cake/TestSuite/TestSuiteDispatcher.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\TestSuite; -use Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; define('CORE_TEST_CASES', CAKE . 'Test' . DS . 'TestCase'); define('APP_TEST_CASES', TESTS . 'TestCase'); diff --git a/lib/Cake/Utility/ClassRegistry.php b/lib/Cake/Utility/ClassRegistry.php index 88ecdabddc4..c678bf7f846 100644 --- a/lib/Cake/Utility/ClassRegistry.php +++ b/lib/Cake/Utility/ClassRegistry.php @@ -13,10 +13,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Utility; -use Cake\Model\ConnectionManager, - Cake\Core\App, - Cake\Model\Model, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Model\ConnectionManager; +use Cake\Model\Model; /** * Class Collections. diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php index 35f65f954a3..67827f08ea5 100644 --- a/lib/Cake/Utility/Debugger.php +++ b/lib/Cake/Utility/Debugger.php @@ -19,9 +19,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Utility; -use Cake\Core\Configure, - Cake\Log\Log, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Log\Log; /** * Provide custom logging and error handling. diff --git a/lib/Cake/Utility/ObjectCollection.php b/lib/Cake/Utility/ObjectCollection.php index 45a0033e7fb..7463f093134 100644 --- a/lib/Cake/Utility/ObjectCollection.php +++ b/lib/Cake/Utility/ObjectCollection.php @@ -11,8 +11,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Utility; -use Cake\Event\Event, - Cake\Error; +use Cake\Error; +use Cake\Event\Event; /** * Deals with Collections of objects. Keeping registries of those objects, diff --git a/lib/Cake/Utility/Sanitize.php b/lib/Cake/Utility/Sanitize.php index 648b93ad931..cbaedfb876d 100644 --- a/lib/Cake/Utility/Sanitize.php +++ b/lib/Cake/Utility/Sanitize.php @@ -19,8 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Utility; -use Cake\Model\ConnectionManager, - Cake\Core\Configure; +use Cake\Core\Configure; +use Cake\Model\ConnectionManager; /** * Data Sanitization. diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php index 8daf583bd3f..f6bae3ea0e8 100644 --- a/lib/Cake/Utility/Set.php +++ b/lib/Cake/Utility/Set.php @@ -18,8 +18,8 @@ */ namespace Cake\Utility; -use Cake\Utility\String, - Cake\Utility\Hash; +use Cake\Utility\Hash; +use Cake\Utility\String; /** * Class used for manipulation of arrays. diff --git a/lib/Cake/Utility/Time.php b/lib/Cake/Utility/Time.php index ac5f516ecb5..512e52227d8 100644 --- a/lib/Cake/Utility/Time.php +++ b/lib/Cake/Utility/Time.php @@ -19,8 +19,8 @@ namespace Cake\Utility; -use Cake\Core\Configure, - Cake\I18n\Multibyte; +use Cake\Core\Configure; +use Cake\I18n\Multibyte; /** * Time Helper class for easy use of time data. diff --git a/lib/Cake/Utility/Xml.php b/lib/Cake/Utility/Xml.php index f71ca14687b..33391e318b0 100644 --- a/lib/Cake/Utility/Xml.php +++ b/lib/Cake/Utility/Xml.php @@ -19,8 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\Utility; -use Cake\Core\Configure, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; /** * XML handling for Cake. diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php index 31870f03109..a8160a15e71 100644 --- a/lib/Cake/View/Helper.php +++ b/lib/Cake/View/Helper.php @@ -14,15 +14,15 @@ */ namespace Cake\View; -use Cake\Core\Object, - Cake\Core\App, - Cake\Core\Configure, - Cake\Core\Plugin, - Cake\Routing\Router, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Utility\Hash, - Cake\Utility\ObjectCollection; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Routing\Router; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\ObjectCollection; /** * Abstract base class for all other Helpers in CakePHP. diff --git a/lib/Cake/View/Helper/CacheHelper.php b/lib/Cake/View/Helper/CacheHelper.php index 3c920c9faa4..b7abf7df26d 100644 --- a/lib/Cake/View/Helper/CacheHelper.php +++ b/lib/Cake/View/Helper/CacheHelper.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\Core\Configure, - Cake\Utility\Inflector; +use Cake\Core\Configure; +use Cake\Utility\Inflector; +use Cake\View\Helper; /** * CacheHelper helps create full page view caching. diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index 49a62053177..a9550ee8ca7 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -14,14 +14,14 @@ */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View, - Cake\Utility\ClassRegistry, - Cake\Utility\Inflector, - Cake\Utility\Security, - Cake\Utility\Hash, - Cake\Core\Configure, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Utility\ClassRegistry; +use Cake\Utility\Hash; +use Cake\Utility\Inflector; +use Cake\Utility\Security; +use Cake\View\Helper; +use Cake\View\View; /** * Form helper library. diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index bac3fba90bf..e2f7b28e282 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -18,13 +18,13 @@ */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View, - Cake\Core\App, - Cake\Core\Configure, - Cake\Network\Response, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Network\Response; +use Cake\Utility\Inflector; +use Cake\View\Helper; +use Cake\View\View; /** * Html Helper class for easy use of HTML widgets. diff --git a/lib/Cake/View/Helper/JsBaseEngineHelper.php b/lib/Cake/View/Helper/JsBaseEngineHelper.php index c4dbc828153..1a5fae1cebf 100644 --- a/lib/Cake/View/Helper/JsBaseEngineHelper.php +++ b/lib/Cake/View/Helper/JsBaseEngineHelper.php @@ -13,8 +13,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\I18n\Multibyte; +use Cake\I18n\Multibyte; +use Cake\View\Helper; /** * JsEngineBaseClass diff --git a/lib/Cake/View/Helper/JsHelper.php b/lib/Cake/View/Helper/JsHelper.php index 62b72739354..c59b5e915b0 100644 --- a/lib/Cake/View/Helper/JsHelper.php +++ b/lib/Cake/View/Helper/JsHelper.php @@ -18,8 +18,8 @@ */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View; +use Cake\View\Helper; +use Cake\View\View; /** * Javascript Generator helper class for easy use of JavaScript. diff --git a/lib/Cake/View/Helper/NumberHelper.php b/lib/Cake/View/Helper/NumberHelper.php index 80bd5672e74..38b9d093fb3 100644 --- a/lib/Cake/View/Helper/NumberHelper.php +++ b/lib/Cake/View/Helper/NumberHelper.php @@ -20,11 +20,11 @@ */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View, - Cake\Core\App, - Cake\Utility\Hash, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Utility\Hash; +use Cake\View\Helper; +use Cake\View\View; /** * Number helper library. diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php index 7ccbdcc52fb..1f1006452e0 100644 --- a/lib/Cake/View/Helper/PaginatorHelper.php +++ b/lib/Cake/View/Helper/PaginatorHelper.php @@ -17,11 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View, - Cake\Utility\Inflector, - Cake\Core\App, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Utility\Inflector; +use Cake\View\Helper; +use Cake\View\View; /** * Pagination Helper class for easy generation of pagination links. diff --git a/lib/Cake/View/Helper/RssHelper.php b/lib/Cake/View/Helper/RssHelper.php index c3cdcecb2a3..2a3e8c3adfc 100644 --- a/lib/Cake/View/Helper/RssHelper.php +++ b/lib/Cake/View/Helper/RssHelper.php @@ -18,8 +18,8 @@ */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\Utility\Xml; +use Cake\Utility\Xml; +use Cake\View\Helper; /** * RSS Helper class for easy output RSS structures. diff --git a/lib/Cake/View/Helper/SessionHelper.php b/lib/Cake/View/Helper/SessionHelper.php index 937e7e5be30..59c37814d89 100644 --- a/lib/Cake/View/Helper/SessionHelper.php +++ b/lib/Cake/View/Helper/SessionHelper.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\Model\Datasource\Session; +use Cake\Model\Datasource\Session; +use Cake\View\Helper; /** * Session Helper. diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php index 8b9cc7f33d1..4aab75426cb 100644 --- a/lib/Cake/View/Helper/TextHelper.php +++ b/lib/Cake/View/Helper/TextHelper.php @@ -19,11 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View, - Cake\Core\App, - Cake\Utility\Hash, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Utility\Hash; +use Cake\View\Helper; +use Cake\View\View; /** * Text helper library. diff --git a/lib/Cake/View/Helper/TimeHelper.php b/lib/Cake/View/Helper/TimeHelper.php index 5c7d7771ddb..772432ae4cf 100644 --- a/lib/Cake/View/Helper/TimeHelper.php +++ b/lib/Cake/View/Helper/TimeHelper.php @@ -18,13 +18,13 @@ */ namespace Cake\View\Helper; -use Cake\View\Helper, - Cake\View\View, - Cake\I18n\Multibyte, - Cake\Core\App, - Cake\Core\Configure, - Cake\Utility\Hash, - Cake\Error; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Error; +use Cake\I18n\Multibyte; +use Cake\Utility\Hash; +use Cake\View\Helper; +use Cake\View\View; /** * Time Helper class for easy use of time data. diff --git a/lib/Cake/View/HelperCollection.php b/lib/Cake/View/HelperCollection.php index 00c7e56fcb2..f79d33585b0 100644 --- a/lib/Cake/View/HelperCollection.php +++ b/lib/Cake/View/HelperCollection.php @@ -17,12 +17,12 @@ */ namespace Cake\View; -use Cake\Utility\ObjectCollection, - Cake\Core\App, - Cake\View\View, - Cake\Event\Event, - Cake\Event\EventListener, - Cake\Error; +use Cake\Core\App; +use Cake\Error; +use Cake\Event\Event; +use Cake\Event\EventListener; +use Cake\Utility\ObjectCollection; +use Cake\View\View; /** * Helpers collection is used as a registry for loaded helpers and handles loading diff --git a/lib/Cake/View/JsonView.php b/lib/Cake/View/JsonView.php index 43a3285c316..44167577ca9 100644 --- a/lib/Cake/View/JsonView.php +++ b/lib/Cake/View/JsonView.php @@ -11,8 +11,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View; -use Cake\Controller\Controller, - Cake\Network\Response; +use Cake\Controller\Controller; +use Cake\Network\Response; /** * A view class that is used for JSON responses. diff --git a/lib/Cake/View/MediaView.php b/lib/Cake/View/MediaView.php index e9cd65c9f70..ae86b011a8f 100644 --- a/lib/Cake/View/MediaView.php +++ b/lib/Cake/View/MediaView.php @@ -17,9 +17,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View; -use Cake\Network\Response, - Cake\Core\Configure, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Network\Response; /** * Media View provides a custom view implementation for sending files to visitors. Its great diff --git a/lib/Cake/View/ScaffoldView.php b/lib/Cake/View/ScaffoldView.php index 6a4e86f933e..6ecd62e8e33 100644 --- a/lib/Cake/View/ScaffoldView.php +++ b/lib/Cake/View/ScaffoldView.php @@ -19,9 +19,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View; -use Cake\Core\Configure, - Cake\Utility\Inflector, - Cake\Error; +use Cake\Core\Configure; +use Cake\Error; +use Cake\Utility\Inflector; /** * ScaffoldView provides specific view file loading features for scaffolded views. diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index c199fa18255..4c6dbd0aa73 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -18,19 +18,19 @@ */ namespace Cake\View; -use Cake\Core\Object, - Cake\Core\App, - Cake\Core\Plugin, - Cake\Core\Configure, - Cake\Controller\Controller, - Cake\Utility\ObjectCollection, - Cake\Utility\Inflector, - Cake\Routing\Router, - Cake\Network\Response, - Cake\Cache\Cache, - Cake\Event\Event, - Cake\Event\EventManager, - Cake\Error; +use Cake\Cache\Cache; +use Cake\Controller\Controller; +use Cake\Core\App; +use Cake\Core\Configure; +use Cake\Core\Object; +use Cake\Core\Plugin; +use Cake\Error; +use Cake\Event\Event; +use Cake\Event\EventManager; +use Cake\Network\Response; +use Cake\Routing\Router; +use Cake\Utility\Inflector; +use Cake\Utility\ObjectCollection; /** * View, the V in the MVC triad. View interacts with Helpers and view variables passed diff --git a/lib/Cake/View/XmlView.php b/lib/Cake/View/XmlView.php index ebc7573be8d..9672d86d864 100644 --- a/lib/Cake/View/XmlView.php +++ b/lib/Cake/View/XmlView.php @@ -11,9 +11,9 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ namespace Cake\View; -use Cake\Controller\Controller, - Cake\Network\Response, - Cake\Utility\Xml; +use Cake\Controller\Controller; +use Cake\Network\Response; +use Cake\Utility\Xml; /** * A view class that is used for creating XML responses. diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php index 1f7b6b725c6..f2999f35a66 100644 --- a/lib/Cake/basics.php +++ b/lib/Cake/basics.php @@ -18,10 +18,10 @@ * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -use Cake\Core\Configure, - Cake\Utility\Debugger, - Cake\I18n\I18n, - Cake\Log\Log; +use Cake\Core\Configure; +use Cake\I18n\I18n; +use Cake\Log\Log; +use Cake\Utility\Debugger; /** * Basic defines for timing functions. diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index d80bd310b47..e3db25954a9 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -125,8 +125,8 @@ $loader->register(); require CAKE . 'Error' . DS . 'exceptions.php'; -use Cake\Core\App, - Cake\Core\Configure; +use Cake\Core\App; +use Cake\Core\Configure; App::$bootstrapping = true; Configure::bootstrap(isset($boot) ? $boot : true);