Using one "use" per class and ordered by name

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

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:

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',

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'))));

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.'));

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

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

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

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

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.

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

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

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.

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.

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.

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.

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.

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.

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.

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.

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

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.

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.

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

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

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.