Code Cleanup

Remove unused use statements from CakePHP core

src/Cache/Engine/FileEngine.php

@@ -15,7 +15,6 @@
 namespace Cake\Cache\Engine;
 
 use Cake\Cache\CacheEngine;
-use Cake\Core\Configure;
 use Cake\Utility\Inflector;
 use Exception;
 use LogicException;

src/Collection/Collection.php

@@ -19,7 +19,6 @@ use Cake\Collection\CollectionInterface;
 use Cake\Collection\CollectionTrait;
 use InvalidArgumentException;
 use IteratorIterator;
-use JsonSerializable;
 
 /**
  * A collection is an immutable list of elements with a handful of functions to

src/Controller/Controller.php

@@ -22,10 +22,8 @@ use Cake\Event\EventManagerTrait;
 use Cake\Log\LogTrait;
 use Cake\Network\Request;
 use Cake\Network\Response;
-use Cake\ORM\TableRegistry;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
-use Cake\Utility\Inflector;
 use Cake\Utility\MergeVariablesTrait;
 use Cake\View\ViewVarsTrait;
 use LogicException;
@@ -649,7 +647,7 @@ class Controller implements EventListenerInterface
     {
         try {
             $method = new ReflectionMethod($this, $action);
-        } catch (\ReflectionException $e) {
+        } catch (ReflectionException $e) {
             return false;
         }
         if (!$method->isPublic()) {

src/Core/Configure/Engine/IniConfig.php

@@ -16,8 +16,6 @@ namespace Cake\Core\Configure\Engine;
 
 use Cake\Core\Configure\ConfigEngineInterface;
 use Cake\Core\Configure\FileConfigTrait;
-use Cake\Core\Exception\Exception;
-use Cake\Core\Plugin;
 use Cake\Utility\Hash;
 
 /**

src/Core/Configure/Engine/JsonConfig.php

@@ -17,7 +17,6 @@ namespace Cake\Core\Configure\Engine;
 use Cake\Core\Configure\ConfigEngineInterface;
 use Cake\Core\Configure\FileConfigTrait;
 use Cake\Core\Exception\Exception;
-use Cake\Core\Plugin;
 
 /**
  * JSON engine allows Configure to load configuration values from

src/Core/Configure/Engine/PhpConfig.php

@@ -17,7 +17,6 @@ namespace Cake\Core\Configure\Engine;
 use Cake\Core\Configure\ConfigEngineInterface;
 use Cake\Core\Configure\FileConfigTrait;
 use Cake\Core\Exception\Exception;
-use Cake\Core\Plugin;
 
 /**
  * PHP engine allows Configure to load configuration values from

src/Core/Exception/Exception.php

@@ -12,11 +12,13 @@
  */
 namespace Cake\Core\Exception;
 
+use RuntimeException;
+
 /**
  * Base class that all CakePHP Exceptions extend.
  *
  */
-class Exception extends \RuntimeException
+class Exception extends RuntimeException
 {
 
     /**

src/Core/InstanceConfigTrait.php

@@ -16,7 +16,6 @@ namespace Cake\Core;
 
 use Cake\Core\Exception\Exception;
 use Cake\Utility\Hash;
-use InvalidArgumentException;
 
 /**
  * A trait for reading and writing instance config

src/Core/StaticConfigTrait.php

@@ -16,7 +16,6 @@ namespace Cake\Core;
 
 use BadMethodCallException;
 use InvalidArgumentException;
-use UnexpectedValueException;
 
 /**
  * A trait that provides a set of static methods to manage configuration

src/Database/Exception.php

@@ -14,10 +14,12 @@
  */
 namespace Cake\Database;
 
+use Cake\Core\Exception;
+
 /**
  * Exception for the database package.
  */
-class Exception extends \Cake\Core\Exception\Exception
+class Exception extends Exception
 {
 
 }

src/Database/Exception/MissingDriverException.php

@@ -16,7 +16,7 @@ namespace Cake\Database\Exception;
 
 use Cake\Core\Exception\Exception;
 
-class MissingDriverException extends \Cake\Core\Exception\Exception
+class MissingDriverException extends Exception
 {
 
     /**

src/Database/Exception/MissingExtensionException.php

@@ -16,7 +16,7 @@ namespace Cake\Database\Exception;
 
 use Cake\Core\Exception\Exception;
 
-class MissingExtensionException extends \Cake\Core\Exception\Exception
+class MissingExtensionException extends Exception
 {
 
     /**

src/Database/Expression/FieldTrait.php

@@ -14,9 +14,6 @@
  */
 namespace Cake\Database\Expression;
 
-use Cake\Database\ExpressionInterface;
-use Cake\Database\ValueBinder;
-
 /**
  * Contains the field property with a getter and a setter for it
  *

src/Database/Type/BinaryType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Core\Exception\Exception;
+use Cake\Database\Type;
 use Cake\Database\Driver;
 use PDO;
 
@@ -23,7 +24,7 @@ use PDO;
  *
  * Use to convert binary data between PHP and the database types.
  */
-class BinaryType extends \Cake\Database\Type
+class BinaryType extends Type
 {
 
     /**

src/Database/Type/DateTimeType.php

@@ -15,13 +15,14 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 
 /**
  * Datetime type converter.
  *
  * Use to convert datetime instances to strings & back.
  */
-class DateTimeType extends \Cake\Database\Type
+class DateTimeType extends Type
 {
 
     /**

src/Database/Type/DateType.php

@@ -15,8 +15,9 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type\DateTimeType;
 
-class DateType extends \Cake\Database\Type\DateTimeType
+class DateType extends DateTimeType
 {
 
     /**

src/Database/Type/FloatType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use PDO;
 
 /**
@@ -22,7 +23,7 @@ use PDO;
  *
  * Use to convert float/decimal data between PHP and the database types.
  */
-class FloatType extends \Cake\Database\Type
+class FloatType extends Type
 {
 
     /**

src/Database/Type/IntegerType.php

@@ -15,6 +15,7 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use PDO;
 
 /**
@@ -22,7 +23,7 @@ use PDO;
  *
  * Use to convert integer data between PHP and the database types.
  */
-class IntegerType extends \Cake\Database\Type
+class IntegerType extends Type
 {
 
     /**

src/Database/Type/TimeType.php

@@ -14,12 +14,14 @@
  */
 namespace Cake\Database\Type;
 
+use Cake\Database\Type\DateTimeType;
+
 /**
  * Time type converter.
  *
  * Use to convert time instances to strings & back.
  */
-class TimeType extends \Cake\Database\Type\DateTimeType
+class TimeType extends DateTimeType
 {
 
     /**

src/Database/Type/UuidType.php

@@ -15,13 +15,14 @@
 namespace Cake\Database\Type;
 
 use Cake\Database\Driver;
+use Cake\Database\Type;
 use Cake\Utility\Text;
 use PDO;
 
 /**
  * Provides behavior for the uuid type
  */
-class UuidType extends \Cake\Database\Type
+class UuidType extends Type
 {
 
     /**

src/Network/Http/FormData.php

@@ -13,6 +13,7 @@
  */
 namespace Cake\Network\Http;
 
+use Countable;
 use Cake\Network\Http\FormData\Part;
 
 /**
@@ -23,7 +24,7 @@ use Cake\Network\Http\FormData\Part;
  * and files.
  *
  */
-class FormData implements \Countable
+class FormData implements Countable
 {
 
     /**

src/Network/Request.php

@@ -14,6 +14,7 @@
  */
 namespace Cake\Network;
 
+use ArrayAccess;
 use BadMethodCallException;
 use Cake\Core\Configure;
 use Cake\Network\Exception\MethodNotAllowedException;
@@ -28,7 +29,7 @@ use Cake\Utility\Hash;
  *
  * `$request['controller']` or `$request->controller`.
  */
-class Request implements \ArrayAccess
+class Request implements ArrayAccess
 {
 
     /**

src/ORM/Association/SelectableAssociationTrait.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\ORM\Association;
 
-use Cake\Database\ExpressionInterface;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Database\Expression\TupleComparison;
 

src/ORM/Behavior/CounterCacheBehavior.php

@@ -18,7 +18,6 @@ use Cake\Event\Event;
 use Cake\ORM\Association;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
-use Cake\ORM\Table;
 
 /**
  * CounterCache behavior

src/ORM/Behavior/TimestampBehavior.php

@@ -18,7 +18,6 @@ use Cake\Event\Event;
 use Cake\I18n\Time;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
-use Cake\ORM\Table;
 
 class TimestampBehavior extends Behavior
 {

src/ORM/Behavior/TreeBehavior.php

@@ -20,7 +20,6 @@ use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
-use Cake\ORM\Table;
 
 /**
  * Makes the table to which this is attached to behave like a nested set and

src/ORM/ResultSet.php

@@ -19,7 +19,6 @@ use Cake\Collection\CollectionTrait;
 use Cake\Database\Exception;
 use Cake\Database\Type;
 use Cake\Datasource\ResultSetInterface;
-use JsonSerializable;
 use SplFixedArray;
 
 /**

src/ORM/Table.php

@@ -38,7 +38,6 @@ use Cake\ORM\RulesChecker;
 use Cake\ORM\Rule\IsUnique;
 use Cake\Utility\Inflector;
 use Cake\Validation\Validator;
-use RuntimeException;
 
 /**
  * Represents a single database table.

src/Routing/Filter/ControllerFactoryFilter.php

@@ -17,7 +17,6 @@ namespace Cake\Routing\Filter;
 use Cake\Core\App;
 use Cake\Event\Event;
 use Cake\Routing\DispatcherFilter;
-use Cake\Utility\Inflector;
 
 /**
  * A dispatcher filter that builds the controller to dispatch

src/TestSuite/TestSuite.php

@@ -17,7 +17,6 @@
 namespace Cake\TestSuite;
 
 use Cake\Filesystem\Folder;
-
 /**
  * A class to contain test cases and run them with shared fixtures
  *

src/Validation/ValidationSet.php

@@ -14,11 +14,15 @@
  */
 namespace Cake\Validation;
 
+use ArrayAccess;
+use IteratorAggregate;
+use Countable;
+
 /**
  * ValidationSet object. Holds all validation rules for a field and exposes
  * methods to dynamically add or remove validation rules
  */
-class ValidationSet implements \ArrayAccess, \IteratorAggregate, \Countable
+class ValidationSet implements ArrayAccess, IteratorAggregate, Countable
 {
 
     /**

src/Validation/Validator.php

@@ -14,6 +14,10 @@
  */
 namespace Cake\Validation;
 
+use ArrayAccess;
+use IteratorAggregate;
+use Countable;
+
 use Cake\Validation\RulesProvider;
 use Cake\Validation\ValidationSet;
 
@@ -25,7 +29,7 @@ use Cake\Validation\ValidationSet;
  *
  * @link http://book.cakephp.org/3.0/en/core-libraries/validation.html
  */
-class Validator implements \ArrayAccess, \IteratorAggregate, \Countable
+class Validator implements ArrayAccess, IteratorAggregate, Countable
 {
 
     /**

src/View/Form/FormContext.php

@@ -14,7 +14,6 @@
  */
 namespace Cake\View\Form;
 
-use Cake\Form\Form;
 use Cake\Network\Request;
 use Cake\View\Form\ContextInterface;
 

src/View/Helper/FormHelper.php

@@ -2231,7 +2231,7 @@ class FormHelper extends Helper
         unset($options['interval'], $options['round']);
 
         if (!isset($options['val'])) {
-            $val = new \DateTime();
+            $val = new DateTime();
             $currentYear = $val->format('Y');
             if (isset($options['year']['end']) && $options['year']['end'] < $currentYear) {
                 $val->setDate($options['year']['end'], $val->format('n'), $val->format('j'));