diff --git a/psalm.xml b/psalm.xml
index 59102475..a8a3ca7d 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/src/Phalcon/Acl/Adapter/AbstractAdapter.php b/src/Phalcon/Acl/Adapter/AbstractAdapter.php
index 72deaa2c..d7ea0d05 100644
--- a/src/Phalcon/Acl/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Acl/Adapter/AbstractAdapter.php
@@ -10,7 +10,6 @@
namespace Phalcon\Acl\Adapter;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Events\EventsAwareInterface;
/**
* Adapter for Phalcon\Acl adapters
diff --git a/src/Phalcon/Acl/Adapter/AdapterInterface.php b/src/Phalcon/Acl/Adapter/AdapterInterface.php
index 994dab75..4d7067e0 100644
--- a/src/Phalcon/Acl/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Acl/Adapter/AdapterInterface.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Acl\Adapter;
-use Phalcon\Acl\ComponentInterface;
-use Phalcon\Acl\RoleInterface;
-
/**
* Interface for Phalcon\Acl adapters
*/
diff --git a/src/Phalcon/Acl/Adapter/Memory.php b/src/Phalcon/Acl/Adapter/Memory.php
index ff209094..c29cd66b 100644
--- a/src/Phalcon/Acl/Adapter/Memory.php
+++ b/src/Phalcon/Acl/Adapter/Memory.php
@@ -10,15 +10,6 @@
namespace Phalcon\Acl\Adapter;
use Phalcon\Acl\Enum;
-use Phalcon\Acl\Role;
-use Phalcon\Acl\RoleInterface;
-use Phalcon\Acl\Component;
-use Phalcon\Acl\Exception;
-use Phalcon\Events\Manager as EventsManager;
-use Phalcon\Acl\RoleAware;
-use Phalcon\Acl\ComponentAware;
-use Phalcon\Acl\ComponentInterface;
-use ReflectionFunction;
/**
* Manages ACL lists in memory
diff --git a/src/Phalcon/Annotations/Adapter/AbstractAdapter.php b/src/Phalcon/Annotations/Adapter/AbstractAdapter.php
index 4c61654b..97373f18 100644
--- a/src/Phalcon/Annotations/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Annotations/Adapter/AbstractAdapter.php
@@ -9,11 +9,10 @@
*/
namespace Phalcon\Annotations\Adapter;
-use Phalcon\Annotations\Reader;
-use Phalcon\Annotations\Exception;
use Phalcon\Annotations\Collection;
-use Phalcon\Annotations\Reflection;
+use Phalcon\Annotations\Reader;
use Phalcon\Annotations\ReaderInterface;
+use Phalcon\Annotations\Reflection;
/**
* This is the base class for Phalcon\Annotations adapters
diff --git a/src/Phalcon/Annotations/Adapter/AdapterInterface.php b/src/Phalcon/Annotations/Adapter/AdapterInterface.php
index 60587208..6f851a21 100644
--- a/src/Phalcon/Annotations/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Annotations/Adapter/AdapterInterface.php
@@ -9,9 +9,9 @@
*/
namespace Phalcon\Annotations\Adapter;
-use Phalcon\Annotations\Reflection;
use Phalcon\Annotations\Collection;
use Phalcon\Annotations\ReaderInterface;
+use Phalcon\Annotations\Reflection;
/**
* This interface must be implemented by adapters in Phalcon\Annotations
diff --git a/src/Phalcon/Annotations/Adapter/Apcu.php b/src/Phalcon/Annotations/Adapter/Apcu.php
index 27d2c906..eba79b1b 100644
--- a/src/Phalcon/Annotations/Adapter/Apcu.php
+++ b/src/Phalcon/Annotations/Adapter/Apcu.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Annotations\Adapter;
-use Phalcon\Annotations\Reflection;
-
/**
* Stores the parsed annotations in APCu. This adapter is suitable for production
*
diff --git a/src/Phalcon/Annotations/Adapter/Memory.php b/src/Phalcon/Annotations/Adapter/Memory.php
index a31b012b..cce0444f 100644
--- a/src/Phalcon/Annotations/Adapter/Memory.php
+++ b/src/Phalcon/Annotations/Adapter/Memory.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Annotations\Adapter;
-use Phalcon\Annotations\Reflection;
-
/**
* Stores the parsed annotations in memory. This adapter is the suitable
* development/testing
diff --git a/src/Phalcon/Annotations/Adapter/Stream.php b/src/Phalcon/Annotations/Adapter/Stream.php
index fdae0ea2..3e47be77 100644
--- a/src/Phalcon/Annotations/Adapter/Stream.php
+++ b/src/Phalcon/Annotations/Adapter/Stream.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Annotations\Adapter;
-use Phalcon\Annotations\Reflection;
-use Phalcon\Annotations\Exception;
-use RuntimeException;
-
/**
* Stores the parsed annotations in files. This adapter is suitable for production
*
diff --git a/src/Phalcon/Annotations/AnnotationsFactory.php b/src/Phalcon/Annotations/AnnotationsFactory.php
index f52447a7..2428e9fa 100644
--- a/src/Phalcon/Annotations/AnnotationsFactory.php
+++ b/src/Phalcon/Annotations/AnnotationsFactory.php
@@ -11,7 +11,6 @@
use Phalcon\Annotations\Adapter\AdapterInterface;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Helper\Arr;
/**
* Factory to create annotations components
diff --git a/src/Phalcon/Annotations/Collection.php b/src/Phalcon/Annotations/Collection.php
index 1d4140ae..5bcb82e2 100644
--- a/src/Phalcon/Annotations/Collection.php
+++ b/src/Phalcon/Annotations/Collection.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Annotations;
-use Countable;
-use Iterator;
-
/**
* Represents a collection of annotations. This class allows to traverse a group
* of annotations easily
diff --git a/src/Phalcon/Annotations/Reader.php b/src/Phalcon/Annotations/Reader.php
index 21eeb9d4..ddccab04 100644
--- a/src/Phalcon/Annotations/Reader.php
+++ b/src/Phalcon/Annotations/Reader.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Annotations;
-use ReflectionClass;
-
/**
* Parses docblocks returning an array with the found annotations
*/
diff --git a/src/Phalcon/Application/AbstractApplication.php b/src/Phalcon/Application/AbstractApplication.php
index 5fe26b29..9b1a733f 100644
--- a/src/Phalcon/Application/AbstractApplication.php
+++ b/src/Phalcon/Application/AbstractApplication.php
@@ -11,7 +11,6 @@
use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
/**
diff --git a/src/Phalcon/Assets/Asset/Css.php b/src/Phalcon/Assets/Asset/Css.php
index 6473ba4e..a730da27 100644
--- a/src/Phalcon/Assets/Asset/Css.php
+++ b/src/Phalcon/Assets/Asset/Css.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Asset;
-use Phalcon\Assets\Asset as AssetBase;
-
/**
* Represents CSS assets
*/
diff --git a/src/Phalcon/Assets/Asset/Js.php b/src/Phalcon/Assets/Asset/Js.php
index f149ad74..80c4b120 100644
--- a/src/Phalcon/Assets/Asset/Js.php
+++ b/src/Phalcon/Assets/Asset/Js.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Asset;
-use Phalcon\Assets\Asset as AssetBase;
-
/**
* Represents Javascript assets
*/
diff --git a/src/Phalcon/Assets/Collection.php b/src/Phalcon/Assets/Collection.php
index b2bd620d..e4fd9766 100644
--- a/src/Phalcon/Assets/Collection.php
+++ b/src/Phalcon/Assets/Collection.php
@@ -9,13 +9,6 @@
*/
namespace Phalcon\Assets;
-use Countable;
-use Iterator;
-use Phalcon\Assets\Asset\Css as AssetCss;
-use Phalcon\Assets\Asset\Js as AssetJs;
-use Phalcon\Assets\Inline\Js as InlineJs;
-use Phalcon\Assets\Inline\Css as InlineCss;
-
/**
* Represents a collection of assets
*/
diff --git a/src/Phalcon/Assets/Filters/Cssmin.php b/src/Phalcon/Assets/Filters/Cssmin.php
index 8f9ba9dc..8c2698e6 100644
--- a/src/Phalcon/Assets/Filters/Cssmin.php
+++ b/src/Phalcon/Assets/Filters/Cssmin.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Filters;
-use Phalcon\Assets\FilterInterface;
-
/**
* Minify the css - removes comments removes newlines and line feeds keeping
* removes last semicolon from last property
diff --git a/src/Phalcon/Assets/Filters/Jsmin.php b/src/Phalcon/Assets/Filters/Jsmin.php
index fedadb6e..e0701838 100644
--- a/src/Phalcon/Assets/Filters/Jsmin.php
+++ b/src/Phalcon/Assets/Filters/Jsmin.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Filters;
-use Phalcon\Assets\FilterInterface;
-
/**
* Deletes the characters which are insignificant to JavaScript. Comments will
* be removed. Tabs will be replaced with spaces. Carriage returns will be
diff --git a/src/Phalcon/Assets/Filters/None.php b/src/Phalcon/Assets/Filters/None.php
index ba7c59c9..a5e19df9 100644
--- a/src/Phalcon/Assets/Filters/None.php
+++ b/src/Phalcon/Assets/Filters/None.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Filters;
-use Phalcon\Assets\FilterInterface;
-
/**
* Returns the content without make any modification to the original source
*/
diff --git a/src/Phalcon/Assets/Inline/Css.php b/src/Phalcon/Assets/Inline/Css.php
index 4021e7aa..2353cd4e 100644
--- a/src/Phalcon/Assets/Inline/Css.php
+++ b/src/Phalcon/Assets/Inline/Css.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Inline;
-use Phalcon\Assets\Inline as InlineBase;
-
/**
* Represents an inlined CSS
*/
diff --git a/src/Phalcon/Assets/Inline/Js.php b/src/Phalcon/Assets/Inline/Js.php
index a35a1b41..1ec6fd4e 100644
--- a/src/Phalcon/Assets/Inline/Js.php
+++ b/src/Phalcon/Assets/Inline/Js.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Assets\Inline;
-use Phalcon\Assets\Inline as InlineBase;
-
/**
* Represents an inline JavaScript
*/
diff --git a/src/Phalcon/Assets/Manager.php b/src/Phalcon/Assets/Manager.php
index f8bd2a77..b84eb4e7 100644
--- a/src/Phalcon/Assets/Manager.php
+++ b/src/Phalcon/Assets/Manager.php
@@ -9,12 +9,6 @@
*/
namespace Phalcon\Assets;
-use Phalcon\Tag;
-use Phalcon\Assets\Asset\Js as AssetJs;
-use Phalcon\Assets\Asset\Css as AssetCss;
-use Phalcon\Assets\Inline\Css as InlineCss;
-use Phalcon\Assets\Inline\Js as InlineJs;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
/**
diff --git a/src/Phalcon/Cache.php b/src/Phalcon/Cache.php
index 616d216f..cf660ec4 100644
--- a/src/Phalcon/Cache.php
+++ b/src/Phalcon/Cache.php
@@ -10,10 +10,8 @@
namespace Phalcon;
use Phalcon\Cache\Adapter\AdapterInterface;
-use Phalcon\Cache\Exception\Exception;
use Phalcon\Cache\Exception\InvalidArgumentException;
use Psr\SimpleCache\CacheInterface;
-use Traversable;
/**
* This component offers caching capabilities for your application.
diff --git a/src/Phalcon/Cache/Adapter/Apcu.php b/src/Phalcon/Cache/Adapter/Apcu.php
index 191e2ec9..01481ad0 100644
--- a/src/Phalcon/Cache/Adapter/Apcu.php
+++ b/src/Phalcon/Cache/Adapter/Apcu.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
-use Phalcon\Storage\Adapter\Apcu as StorageApcu;
/**
* Apcu adapter
diff --git a/src/Phalcon/Cache/Adapter/Libmemcached.php b/src/Phalcon/Cache/Adapter/Libmemcached.php
index a00deb4a..43526134 100644
--- a/src/Phalcon/Cache/Adapter/Libmemcached.php
+++ b/src/Phalcon/Cache/Adapter/Libmemcached.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
-use Phalcon\Storage\Adapter\Libmemcached as StorageLibmemcached;
/**
* Libmemcached adapter
diff --git a/src/Phalcon/Cache/Adapter/Memory.php b/src/Phalcon/Cache/Adapter/Memory.php
index 41619081..4cbe2d5e 100644
--- a/src/Phalcon/Cache/Adapter/Memory.php
+++ b/src/Phalcon/Cache/Adapter/Memory.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
-use Phalcon\Storage\Adapter\Memory as StorageMemory;
/**
* Memory adapter
diff --git a/src/Phalcon/Cache/Adapter/Redis.php b/src/Phalcon/Cache/Adapter/Redis.php
index f9551cec..c3c8ce7a 100644
--- a/src/Phalcon/Cache/Adapter/Redis.php
+++ b/src/Phalcon/Cache/Adapter/Redis.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
-use Phalcon\Storage\Adapter\Redis as StorageRedis;
/**
* Redis adapter
diff --git a/src/Phalcon/Cache/Adapter/Stream.php b/src/Phalcon/Cache/Adapter/Stream.php
index 376e7a73..7002ae87 100644
--- a/src/Phalcon/Cache/Adapter/Stream.php
+++ b/src/Phalcon/Cache/Adapter/Stream.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
-use Phalcon\Storage\Adapter\Stream as StorageStream;
/**
* Stream adapter
diff --git a/src/Phalcon/Cache/AdapterFactory.php b/src/Phalcon/Cache/AdapterFactory.php
index 0c5936a4..794a10d7 100644
--- a/src/Phalcon/Cache/AdapterFactory.php
+++ b/src/Phalcon/Cache/AdapterFactory.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cache;
use Phalcon\Cache\Adapter\AdapterInterface;
-use Phalcon\Cache\Exception\Exception;
use Phalcon\Factory\AbstractFactory;
use Phalcon\Storage\SerializerFactory;
diff --git a/src/Phalcon/Cache/CacheFactory.php b/src/Phalcon/Cache/CacheFactory.php
index c42d1995..a78c1bf2 100644
--- a/src/Phalcon/Cache/CacheFactory.php
+++ b/src/Phalcon/Cache/CacheFactory.php
@@ -9,12 +9,7 @@
*/
namespace Phalcon\Cache;
-use Phalcon\Cache\Adapter\AdapterInterface;
-use Phalcon\Cache;
use Psr\SimpleCache\CacheInterface;
-use Phalcon\Cache\Exception\Exception;
-use Phalcon\Config;
-use Phalcon\Helper\Arr;
/**
* Creates a new Cache class
diff --git a/src/Phalcon/Cli/Console.php b/src/Phalcon/Cli/Console.php
index 8dfa9988..b0b15ca9 100644
--- a/src/Phalcon/Cli/Console.php
+++ b/src/Phalcon/Cli/Console.php
@@ -10,10 +10,6 @@
namespace Phalcon\Cli;
use Phalcon\Application\AbstractApplication;
-use Phalcon\Cli\Router\Route;
-use Phalcon\Cli\Console\Exception;
-use Phalcon\Di\DiInterface;
-use Phalcon\Events\ManagerInterface;
/**
* This component allows to create CLI applications using Phalcon
diff --git a/src/Phalcon/Cli/Dispatcher.php b/src/Phalcon/Cli/Dispatcher.php
index 0911faae..aa31c964 100644
--- a/src/Phalcon/Cli/Dispatcher.php
+++ b/src/Phalcon/Cli/Dispatcher.php
@@ -9,11 +9,6 @@
*/
namespace Phalcon\Cli;
-use Phalcon\Cli\Dispatcher\Exception;
-use Phalcon\Dispatcher\AbstractDispatcher as CliDispatcher;
-use Phalcon\Events\ManagerInterface;
-use Phalcon\Filter\FilterInterface;
-
/**
* Dispatching is the process of taking the command-line arguments, extracting
* the module name, task name, action name, and optional parameters contained in
diff --git a/src/Phalcon/Cli/Router.php b/src/Phalcon/Cli/Router.php
index f03a0e4a..79745c4c 100644
--- a/src/Phalcon/Cli/Router.php
+++ b/src/Phalcon/Cli/Router.php
@@ -9,11 +9,8 @@
*/
namespace Phalcon\Cli;
-use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Cli\Router\Route;
-use Phalcon\Cli\Router\Exception;
use Phalcon\Cli\Router\RouteInterface;
+use Phalcon\Di\AbstractInjectionAware;
/**
* Phalcon\Cli\Router is the standard framework router. Routing is the process
diff --git a/src/Phalcon/Cli/Task.php b/src/Phalcon/Cli/Task.php
index c31f7a41..02010ee6 100644
--- a/src/Phalcon/Cli/Task.php
+++ b/src/Phalcon/Cli/Task.php
@@ -10,7 +10,6 @@
namespace Phalcon\Cli;
use Phalcon\Di\Injectable;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
/**
diff --git a/src/Phalcon/Collection.php b/src/Phalcon/Collection.php
index eb097141..0c8dd5af 100644
--- a/src/Phalcon/Collection.php
+++ b/src/Phalcon/Collection.php
@@ -9,13 +9,6 @@
*/
namespace Phalcon;
-use ArrayAccess;
-use ArrayIterator;
-use Countable;
-use IteratorAggregate;
-use JsonSerializable;
-use Phalcon\Helper\Json;
-use Serializable;
use Traversable;
/**
diff --git a/src/Phalcon/Collection/Exception.php b/src/Phalcon/Collection/Exception.php
index badabd18..5b84c7ed 100644
--- a/src/Phalcon/Collection/Exception.php
+++ b/src/Phalcon/Collection/Exception.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Collection;
-use Throwable;
-
/**
* Exceptions for the Collection object
*/
diff --git a/src/Phalcon/Config.php b/src/Phalcon/Config.php
index adda6d0c..6339dff4 100644
--- a/src/Phalcon/Config.php
+++ b/src/Phalcon/Config.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon;
-use Phalcon\Collection;
-use Phalcon\Config\Exception;
-
/**
* `Phalcon\Config` is designed to simplify the access to, and the use of,
* configuration data within applications. It provides a nested object property
diff --git a/src/Phalcon/Config/Adapter/Grouped.php b/src/Phalcon/Config/Adapter/Grouped.php
index 61ea5056..23fb326f 100644
--- a/src/Phalcon/Config/Adapter/Grouped.php
+++ b/src/Phalcon/Config/Adapter/Grouped.php
@@ -10,9 +10,6 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
-use Phalcon\Config\Exception;
-use Phalcon\Factory\Exception as FactoryException;
-use Phalcon\Config\ConfigFactory;
/**
* Reads multiple files (or arrays) and merges them all together.
diff --git a/src/Phalcon/Config/Adapter/Ini.php b/src/Phalcon/Config/Adapter/Ini.php
index f7aa38ca..2d94f022 100644
--- a/src/Phalcon/Config/Adapter/Ini.php
+++ b/src/Phalcon/Config/Adapter/Ini.php
@@ -10,7 +10,6 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
-use Phalcon\Config\Exception;
/**
* Reads ini files and converts them to Phalcon\Config objects.
diff --git a/src/Phalcon/Config/Adapter/Json.php b/src/Phalcon/Config/Adapter/Json.php
index f3595078..4c4b1e3f 100644
--- a/src/Phalcon/Config/Adapter/Json.php
+++ b/src/Phalcon/Config/Adapter/Json.php
@@ -10,7 +10,6 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
-use Phalcon\Helper\Json as JsonHelper;
/**
* Reads JSON files and converts them to Phalcon\Config objects.
diff --git a/src/Phalcon/Config/Adapter/Yaml.php b/src/Phalcon/Config/Adapter/Yaml.php
index 07961a2c..b4713fba 100644
--- a/src/Phalcon/Config/Adapter/Yaml.php
+++ b/src/Phalcon/Config/Adapter/Yaml.php
@@ -10,7 +10,6 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
-use Phalcon\Config\Exception;
/**
* Reads YAML files and converts them to Phalcon\Config objects.
diff --git a/src/Phalcon/Config/ConfigFactory.php b/src/Phalcon/Config/ConfigFactory.php
index 882f6235..a08c4b62 100644
--- a/src/Phalcon/Config/ConfigFactory.php
+++ b/src/Phalcon/Config/ConfigFactory.php
@@ -9,15 +9,7 @@
*/
namespace Phalcon\Config;
-use Phalcon\Config;
-use Phalcon\Config\Adapter\Grouped;
-use Phalcon\Config\Adapter\Ini;
-use Phalcon\Config\Adapter\Json;
-use Phalcon\Config\Adapter\Php;
-use Phalcon\Config\Adapter\Yaml;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Factory\Exception as FactoryException;
-use Phalcon\Helper\Arr;
/**
* Loads Config Adapter class using 'adapter' option, if no extension is
diff --git a/src/Phalcon/Container.php b/src/Phalcon/Container.php
index 1ecadfe3..fe533a3c 100644
--- a/src/Phalcon/Container.php
+++ b/src/Phalcon/Container.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon;
-use Psr\Container\ContainerInterface;
use Phalcon\Di\DiInterface;
/**
diff --git a/src/Phalcon/Crypt.php b/src/Phalcon/Crypt.php
index d6c6a494..add83cf9 100644
--- a/src/Phalcon/Crypt.php
+++ b/src/Phalcon/Crypt.php
@@ -10,8 +10,6 @@
namespace Phalcon;
use Phalcon\Crypt\CryptInterface;
-use Phalcon\Crypt\Exception;
-use Phalcon\Crypt\Mismatch;
/**
* Provides encryption capabilities to Phalcon applications.
diff --git a/src/Phalcon/Db/AbstractDb.php b/src/Phalcon/Db/AbstractDb.php
index 0a53b095..7ee0ca46 100644
--- a/src/Phalcon/Db/AbstractDb.php
+++ b/src/Phalcon/Db/AbstractDb.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Db;
-use \PDO as Pdo;
-
/**
* Phalcon\Db and its related classes provide a simple SQL database interface
* for Phalcon Framework. The Phalcon\Db is the basic class you use to connect
diff --git a/src/Phalcon/Db/Adapter/AbstractAdapter.php b/src/Phalcon/Db/Adapter/AbstractAdapter.php
index 52f31074..c91fc8c6 100644
--- a/src/Phalcon/Db/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Db/Adapter/AbstractAdapter.php
@@ -10,15 +10,8 @@
namespace Phalcon\Db\Adapter;
use Phalcon\Db\DialectInterface;
-use Phalcon\Db\ColumnInterface;
use Phalcon\Db\Enum;
-use Phalcon\Db\Exception;
-use Phalcon\Db\Index;
-use Phalcon\Db\IndexInterface;
-use Phalcon\Db\Reference;
-use Phalcon\Db\ReferenceInterface;
use Phalcon\Db\RawValue;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
/**
diff --git a/src/Phalcon/Db/Adapter/AdapterInterface.php b/src/Phalcon/Db/Adapter/AdapterInterface.php
index 9e4b21ea..9cf09489 100644
--- a/src/Phalcon/Db/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Db/Adapter/AdapterInterface.php
@@ -10,11 +10,7 @@
namespace Phalcon\Db\Adapter;
use Phalcon\Db\DialectInterface;
-use Phalcon\Db\ResultInterface;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\IndexInterface;
use Phalcon\Db\RawValue;
-use Phalcon\Db\ReferenceInterface;
/**
* Interface for Phalcon\Db adapters
diff --git a/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php b/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php
index fb228e73..6be2d961 100644
--- a/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php
+++ b/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php
@@ -10,11 +10,6 @@
namespace Phalcon\Db\Adapter\Pdo;
use Phalcon\Db\Adapter\AbstractAdapter;
-use Phalcon\Db\Column;
-use Phalcon\Db\Exception;
-use Phalcon\Db\Result\Pdo as ResultPdo;
-use Phalcon\Db\ResultInterface;
-use Phalcon\Events\ManagerInterface;
/**
* Phalcon\Db\Adapter\Pdo is the Phalcon\Db that internally uses PDO to connect
diff --git a/src/Phalcon/Db/Adapter/Pdo/Mysql.php b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
index fe71fcbb..04d16231 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Mysql.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Mysql.php
@@ -9,16 +9,6 @@
*/
namespace Phalcon\Db\Adapter\Pdo;
-use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
-use Phalcon\Db\Column;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\Enum;
-use Phalcon\Db\Exception;
-use Phalcon\Db\Index;
-use Phalcon\Db\IndexInterface;
-use Phalcon\Db\Reference;
-use Phalcon\Db\ReferenceInterface;
-
/**
* Specific functions for the Mysql database system
*
diff --git a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
index 86819e61..2d581d59 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php
@@ -9,15 +9,7 @@
*/
namespace Phalcon\Db\Adapter\Pdo;
-use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
-use Phalcon\Db\Column;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\Enum;
-use Phalcon\Db\Exception;
use Phalcon\Db\RawValue;
-use Phalcon\Db\Reference;
-use Phalcon\Db\ReferenceInterface;
-use Throwable;
/**
* Specific functions for the Postgresql database system
diff --git a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
index 8eea1183..7bb69a4c 100644
--- a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
+++ b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php
@@ -9,16 +9,7 @@
*/
namespace Phalcon\Db\Adapter\Pdo;
-use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
-use Phalcon\Db\Column;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\Enum;
-use Phalcon\Db\Exception;
-use Phalcon\Db\Index;
-use Phalcon\Db\IndexInterface;
use Phalcon\Db\RawValue;
-use Phalcon\Db\Reference;
-use Phalcon\Db\ReferenceInterface;
/**
* Specific functions for the Sqlite database system
diff --git a/src/Phalcon/Db/Adapter/PdoFactory.php b/src/Phalcon/Db/Adapter/PdoFactory.php
index ad5d9c62..b539b732 100644
--- a/src/Phalcon/Db/Adapter/PdoFactory.php
+++ b/src/Phalcon/Db/Adapter/PdoFactory.php
@@ -10,7 +10,6 @@
namespace Phalcon\Db\Adapter;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Helper\Arr;
/**
* This file is part of the Phalcon Framework.
diff --git a/src/Phalcon/Db/Dialect/Mysql.php b/src/Phalcon/Db/Dialect/Mysql.php
index 91c6265c..eeef5199 100644
--- a/src/Phalcon/Db/Dialect/Mysql.php
+++ b/src/Phalcon/Db/Dialect/Mysql.php
@@ -10,12 +10,6 @@
namespace Phalcon\Db\Dialect;
use Phalcon\Db\Dialect;
-use Phalcon\Db\Column;
-use Phalcon\Db\Exception;
-use Phalcon\Db\IndexInterface;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\ReferenceInterface;
-use Phalcon\Db\DialectInterface;
/**
* Generates database specific SQL for the MySQL RDBMS
diff --git a/src/Phalcon/Db/Dialect/Postgresql.php b/src/Phalcon/Db/Dialect/Postgresql.php
index 25783793..4e57d5f8 100644
--- a/src/Phalcon/Db/Dialect/Postgresql.php
+++ b/src/Phalcon/Db/Dialect/Postgresql.php
@@ -10,12 +10,6 @@
namespace Phalcon\Db\Dialect;
use Phalcon\Db\Dialect;
-use Phalcon\Db\Column;
-use Phalcon\Db\Exception;
-use Phalcon\Db\IndexInterface;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\ReferenceInterface;
-use Phalcon\Db\DialectInterface;
/**
* Generates database specific SQL for the PostgreSQL RDBMS
diff --git a/src/Phalcon/Db/Dialect/Sqlite.php b/src/Phalcon/Db/Dialect/Sqlite.php
index c4e4393f..3b2a56cc 100644
--- a/src/Phalcon/Db/Dialect/Sqlite.php
+++ b/src/Phalcon/Db/Dialect/Sqlite.php
@@ -9,13 +9,7 @@
*/
namespace Phalcon\Db\Dialect;
-use Phalcon\Db\Column;
-use Phalcon\Db\Exception;
-use Phalcon\Db\IndexInterface;
use Phalcon\Db\Dialect;
-use Phalcon\Db\DialectInterface;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\ReferenceInterface;
/**
* Generates database specific SQL for the SQLite RDBMS
diff --git a/src/Phalcon/Db/Result/Pdo.php b/src/Phalcon/Db/Result/Pdo.php
index 4ffb8fd2..ab2ffa8f 100644
--- a/src/Phalcon/Db/Result/Pdo.php
+++ b/src/Phalcon/Db/Result/Pdo.php
@@ -10,8 +10,6 @@
namespace Phalcon\Db\Result;
use Phalcon\Db\Enum;
-use Phalcon\Db\ResultInterface;
-use Phalcon\Db\Adapter\AdapterInterface;
/**
* Encapsulates the resultset internals
diff --git a/src/Phalcon/Debug.php b/src/Phalcon/Debug.php
index 5be42015..8911041f 100644
--- a/src/Phalcon/Debug.php
+++ b/src/Phalcon/Debug.php
@@ -9,13 +9,6 @@
*/
namespace Phalcon;
-use ErrorException;
-use Phalcon\Helper\Arr;
-use Phalcon\Version;
-use Phalcon\Tag;
-use ReflectionClass;
-use ReflectionFunction;
-
/**
* Provides debug capabilities to Phalcon applications
*/
diff --git a/src/Phalcon/Debug/Dump.php b/src/Phalcon/Debug/Dump.php
index e5b401dc..aad14563 100644
--- a/src/Phalcon/Debug/Dump.php
+++ b/src/Phalcon/Debug/Dump.php
@@ -9,13 +9,6 @@
*/
namespace Phalcon\Debug;
-use Phalcon\Di;
-use Phalcon\Helper\Json;
-use Reflection;
-use ReflectionClass;
-use ReflectionProperty;
-use stdClass;
-
/**
* Dumps information about a variable(s)
*
diff --git a/src/Phalcon/Di.php b/src/Phalcon/Di.php
index 555170ff..b7d54e62 100644
--- a/src/Phalcon/Di.php
+++ b/src/Phalcon/Di.php
@@ -9,16 +9,9 @@
*/
namespace Phalcon;
-use Phalcon\Di\Service;
use Phalcon\Di\DiInterface;
-use Phalcon\Di\Exception;
-use Phalcon\Di\Exception\ServiceResolutionException;
-use Phalcon\Config\Adapter\Php;
-use Phalcon\Config\Adapter\Yaml;
use Phalcon\Di\ServiceInterface;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Di\ServiceProviderInterface;
/**
* Phalcon\Di is a component that implements Dependency Injection/Service
diff --git a/src/Phalcon/Di/DiInterface.php b/src/Phalcon/Di/DiInterface.php
index 157d3394..6c47e9f4 100644
--- a/src/Phalcon/Di/DiInterface.php
+++ b/src/Phalcon/Di/DiInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Di;
-use ArrayAccess;
-
/**
* Interface for Phalcon\Di
*/
diff --git a/src/Phalcon/Di/FactoryDefault.php b/src/Phalcon/Di/FactoryDefault.php
index 4f151e00..6d8546f6 100644
--- a/src/Phalcon/Di/FactoryDefault.php
+++ b/src/Phalcon/Di/FactoryDefault.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Di;
-use Phalcon\Filter\FilterFactory;
-
/**
* This is a variant of the standard Phalcon\Di. By default it automatically
* registers all the services provided by the framework. Thanks to this, the
diff --git a/src/Phalcon/Di/FactoryDefault/Cli.php b/src/Phalcon/Di/FactoryDefault/Cli.php
index c3dddddd..d2d3c9be 100644
--- a/src/Phalcon/Di/FactoryDefault/Cli.php
+++ b/src/Phalcon/Di/FactoryDefault/Cli.php
@@ -10,8 +10,6 @@
namespace Phalcon\Di\FactoryDefault;
use Phalcon\Di\FactoryDefault;
-use Phalcon\Di\Service;
-use Phalcon\Filter\FilterFactory;
/**
* Phalcon\Di\FactoryDefault\Cli
diff --git a/src/Phalcon/Di/Injectable.php b/src/Phalcon/Di/Injectable.php
index f206dc2a..6fab0c01 100644
--- a/src/Phalcon/Di/Injectable.php
+++ b/src/Phalcon/Di/Injectable.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Di;
-use Phalcon\Di;
use Phalcon\Session\BagInterface;
/**
diff --git a/src/Phalcon/Di/Service.php b/src/Phalcon/Di/Service.php
index 924e992d..f3db7b4a 100644
--- a/src/Phalcon/Di/Service.php
+++ b/src/Phalcon/Di/Service.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Di;
-use Closure;
-use Phalcon\Di\Exception\ServiceResolutionException;
-use Phalcon\Di\Service\Builder;
-
/**
* Represents individually a service in the services container
*
diff --git a/src/Phalcon/Di/Service/Builder.php b/src/Phalcon/Di/Service/Builder.php
index 36e6d6d7..b8a5a1f3 100644
--- a/src/Phalcon/Di/Service/Builder.php
+++ b/src/Phalcon/Di/Service/Builder.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Di\Service;
-use Phalcon\Di\DiInterface;
-use Phalcon\Di\Exception;
-
/**
* Phalcon\Di\Service\Builder
*
diff --git a/src/Phalcon/Dispatcher/AbstractDispatcher.php b/src/Phalcon/Dispatcher/AbstractDispatcher.php
index 25c3893a..7b307449 100644
--- a/src/Phalcon/Dispatcher/AbstractDispatcher.php
+++ b/src/Phalcon/Dispatcher/AbstractDispatcher.php
@@ -9,14 +9,8 @@
*/
namespace Phalcon\Dispatcher;
-use Exception;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Dispatcher\Exception as PhalconException;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Filter\FilterInterface;
-use Phalcon\Mvc\Model\Binder;
use Phalcon\Mvc\Model\BinderInterface;
/**
diff --git a/src/Phalcon/Escaper.php b/src/Phalcon/Escaper.php
index 19cba442..218cfa25 100644
--- a/src/Phalcon/Escaper.php
+++ b/src/Phalcon/Escaper.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon;
-use Phalcon\Di\DiInterface;
-use Phalcon\Escaper\EscaperInterface;
-use Phalcon\Escaper\Exception;
-
/**
* Phalcon\Escaper
*
diff --git a/src/Phalcon/Events/Manager.php b/src/Phalcon/Events/Manager.php
index ebcfeb66..90fc951f 100644
--- a/src/Phalcon/Events/Manager.php
+++ b/src/Phalcon/Events/Manager.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Events;
-use Closure;
-use SplPriorityQueue;
-
/**
* Phalcon\Events\Manager
*
diff --git a/src/Phalcon/Factory/AbstractFactory.php b/src/Phalcon/Factory/AbstractFactory.php
index 2b74d0a1..d4feaa9b 100644
--- a/src/Phalcon/Factory/AbstractFactory.php
+++ b/src/Phalcon/Factory/AbstractFactory.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Factory;
-use Phalcon\Config;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Filter.php b/src/Phalcon/Filter.php
index 5f305fa2..cf5fcae8 100644
--- a/src/Phalcon/Filter.php
+++ b/src/Phalcon/Filter.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon;
-use Closure;
-use Phalcon\Filter\Exception;
-use Phalcon\Filter\FilterInterface;
-
/**
* Lazy loads, stores and exposes sanitizer objects
*/
diff --git a/src/Phalcon/Filter/FilterFactory.php b/src/Phalcon/Filter/FilterFactory.php
index d5a5f2bc..649ba460 100644
--- a/src/Phalcon/Filter/FilterFactory.php
+++ b/src/Phalcon/Filter/FilterFactory.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Filter;
-use Phalcon\Filter;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Flash/AbstractFlash.php b/src/Phalcon/Flash/AbstractFlash.php
index 1b10e461..cb3086e4 100644
--- a/src/Phalcon/Flash/AbstractFlash.php
+++ b/src/Phalcon/Flash/AbstractFlash.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Flash;
-use Phalcon\Di;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
use Phalcon\Escaper\EscaperInterface;
use Phalcon\Session\ManagerInterface as SessionInterface;
diff --git a/src/Phalcon/Flash/Session.php b/src/Phalcon/Flash/Session.php
index 63883d67..4bf0687f 100644
--- a/src/Phalcon/Flash/Session.php
+++ b/src/Phalcon/Flash/Session.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Flash;
-use Phalcon\Di\DiInterface;
use Phalcon\Session\ManagerInterface;
/**
diff --git a/src/Phalcon/Forms/Element/AbstractElement.php b/src/Phalcon/Forms/Element/AbstractElement.php
index 2ca9ed18..f9397385 100644
--- a/src/Phalcon/Forms/Element/AbstractElement.php
+++ b/src/Phalcon/Forms/Element/AbstractElement.php
@@ -9,13 +9,8 @@
*/
namespace Phalcon\Forms\Element;
-use InvalidArgumentException;
use Phalcon\Forms\Form;
-use Phalcon\Forms\Exception;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Messages\Messages;
-use Phalcon\Tag;
-use Phalcon\Validation\ValidatorInterface;
/**
* This is a base class for form elements
diff --git a/src/Phalcon/Forms/Element/Check.php b/src/Phalcon/Forms/Element/Check.php
index 63630147..252045d6 100644
--- a/src/Phalcon/Forms/Element/Check.php
+++ b/src/Phalcon/Forms/Element/Check.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Check
*
diff --git a/src/Phalcon/Forms/Element/Date.php b/src/Phalcon/Forms/Element/Date.php
index 76ba07f9..fc2cc229 100644
--- a/src/Phalcon/Forms/Element/Date.php
+++ b/src/Phalcon/Forms/Element/Date.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Component INPUT[type=date] for forms
*/
diff --git a/src/Phalcon/Forms/Element/ElementInterface.php b/src/Phalcon/Forms/Element/ElementInterface.php
index 6031abf4..ec77a1d4 100644
--- a/src/Phalcon/Forms/Element/ElementInterface.php
+++ b/src/Phalcon/Forms/Element/ElementInterface.php
@@ -10,9 +10,7 @@
namespace Phalcon\Forms\Element;
use Phalcon\Forms\Form;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Messages\Messages;
-use Phalcon\Validation\ValidatorInterface;
/**
* Interface for Phalcon\Forms\Element classes
diff --git a/src/Phalcon/Forms/Element/Email.php b/src/Phalcon/Forms/Element/Email.php
index c6e051f4..d89895dd 100644
--- a/src/Phalcon/Forms/Element/Email.php
+++ b/src/Phalcon/Forms/Element/Email.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Email
*
diff --git a/src/Phalcon/Forms/Element/File.php b/src/Phalcon/Forms/Element/File.php
index d40ca6e8..7085a434 100644
--- a/src/Phalcon/Forms/Element/File.php
+++ b/src/Phalcon/Forms/Element/File.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Component INPUT[type=file] for forms
*/
diff --git a/src/Phalcon/Forms/Element/Hidden.php b/src/Phalcon/Forms/Element/Hidden.php
index 3357ded8..faa70448 100644
--- a/src/Phalcon/Forms/Element/Hidden.php
+++ b/src/Phalcon/Forms/Element/Hidden.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Hidden
*
diff --git a/src/Phalcon/Forms/Element/Numeric.php b/src/Phalcon/Forms/Element/Numeric.php
index 1e72b598..384b8af1 100644
--- a/src/Phalcon/Forms/Element/Numeric.php
+++ b/src/Phalcon/Forms/Element/Numeric.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Numeric
*
diff --git a/src/Phalcon/Forms/Element/Password.php b/src/Phalcon/Forms/Element/Password.php
index af663d86..a914d3c0 100644
--- a/src/Phalcon/Forms/Element/Password.php
+++ b/src/Phalcon/Forms/Element/Password.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Password
*
diff --git a/src/Phalcon/Forms/Element/Radio.php b/src/Phalcon/Forms/Element/Radio.php
index ef3b2ed1..c3ce28db 100644
--- a/src/Phalcon/Forms/Element/Radio.php
+++ b/src/Phalcon/Forms/Element/Radio.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Radio
*
diff --git a/src/Phalcon/Forms/Element/Select.php b/src/Phalcon/Forms/Element/Select.php
index 0a2c78c7..7796f076 100644
--- a/src/Phalcon/Forms/Element/Select.php
+++ b/src/Phalcon/Forms/Element/Select.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag\Select as SelectTag;
-
/**
* Phalcon\Forms\Element\Select
*
diff --git a/src/Phalcon/Forms/Element/Submit.php b/src/Phalcon/Forms/Element/Submit.php
index 7b4052fa..36dfea82 100644
--- a/src/Phalcon/Forms/Element/Submit.php
+++ b/src/Phalcon/Forms/Element/Submit.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Component INPUT[type=submit] for forms
*/
diff --git a/src/Phalcon/Forms/Element/Text.php b/src/Phalcon/Forms/Element/Text.php
index ff3a434d..f66ebf22 100644
--- a/src/Phalcon/Forms/Element/Text.php
+++ b/src/Phalcon/Forms/Element/Text.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Phalcon\Forms\Element\Text
*
diff --git a/src/Phalcon/Forms/Element/TextArea.php b/src/Phalcon/Forms/Element/TextArea.php
index f7885541..b316bbf2 100644
--- a/src/Phalcon/Forms/Element/TextArea.php
+++ b/src/Phalcon/Forms/Element/TextArea.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Forms\Element;
-use Phalcon\Tag;
-
/**
* Component TEXTAREA for forms
*/
diff --git a/src/Phalcon/Forms/Form.php b/src/Phalcon/Forms/Form.php
index 1ac7c1b0..dcf85e29 100644
--- a/src/Phalcon/Forms/Form.php
+++ b/src/Phalcon/Forms/Form.php
@@ -9,18 +9,11 @@
*/
namespace Phalcon\Forms;
-use Countable;
-use Iterator;
use Phalcon\Di\Injectable;
-use Phalcon\Di\DiInterface;
-use Phalcon\Filter\FilterInterface;
use Phalcon\Forms\Element\ElementInterface;
use Phalcon\Html\Attributes;
use Phalcon\Html\Attributes\AttributesInterface;
use Phalcon\Messages\Messages;
-use Phalcon\Tag;
-use Phalcon\Validation;
-use Phalcon\Validation\ValidationInterface;
/**
* This component allows to build forms using an object-oriented interface
diff --git a/src/Phalcon/Helper/Arr.php b/src/Phalcon/Helper/Arr.php
index 9c318c2f..a269fc1b 100644
--- a/src/Phalcon/Helper/Arr.php
+++ b/src/Phalcon/Helper/Arr.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Helper;
-use stdClass;
-
/**
* This class offers quick array functions throughout the framework
*/
diff --git a/src/Phalcon/Helper/Json.php b/src/Phalcon/Helper/Json.php
index caab0ece..3ee32285 100644
--- a/src/Phalcon/Helper/Json.php
+++ b/src/Phalcon/Helper/Json.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Helper;
-use InvalidArgumentException;
-
/**
* This class offers a wrapper for JSON methods to serialize and unserialize
*/
diff --git a/src/Phalcon/Helper/Str.php b/src/Phalcon/Helper/Str.php
index ad3c8119..06393094 100644
--- a/src/Phalcon/Helper/Str.php
+++ b/src/Phalcon/Helper/Str.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Helper;
-use RuntimeException;
-
/**
* This class offers quick string functions throughout the framework
*/
diff --git a/src/Phalcon/Html/Attributes.php b/src/Phalcon/Html/Attributes.php
index 3f4148c6..d431bbcc 100644
--- a/src/Phalcon/Html/Attributes.php
+++ b/src/Phalcon/Html/Attributes.php
@@ -10,8 +10,6 @@
namespace Phalcon\Html;
use Phalcon\Collection;
-use Phalcon\Html\Attributes\RenderInterface;
-use Phalcon\Tag;
/**
* This class helps to work with HTML Attributes
diff --git a/src/Phalcon/Html/Breadcrumbs.php b/src/Phalcon/Html/Breadcrumbs.php
index 5b4b9d9b..dae1eeb7 100644
--- a/src/Phalcon/Html/Breadcrumbs.php
+++ b/src/Phalcon/Html/Breadcrumbs.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Html;
-use Phalcon\Di\DiInterface;
-
/**
* Phalcon\Html\Breadcrumbs
*
diff --git a/src/Phalcon/Html/Helper/AbstractHelper.php b/src/Phalcon/Html/Helper/AbstractHelper.php
index 6e927824..8e02f3e8 100644
--- a/src/Phalcon/Html/Helper/AbstractHelper.php
+++ b/src/Phalcon/Html/Helper/AbstractHelper.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Html\Helper;
-use Phalcon\Html\Exception;
use Phalcon\Escaper\EscaperInterface;
/**
diff --git a/src/Phalcon/Html/TagFactory.php b/src/Phalcon/Html/TagFactory.php
index a492e0de..63c147f3 100644
--- a/src/Phalcon/Html/TagFactory.php
+++ b/src/Phalcon/Html/TagFactory.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Html;
-use Phalcon\Escaper;
use Phalcon\Escaper\EscaperInterface;
use Phalcon\Factory\AbstractFactory;
diff --git a/src/Phalcon/Http/Cookie.php b/src/Phalcon/Http/Cookie.php
index 74b700f3..9009f6c9 100644
--- a/src/Phalcon/Http/Cookie.php
+++ b/src/Phalcon/Http/Cookie.php
@@ -9,16 +9,8 @@
*/
namespace Phalcon\Http;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Crypt\CryptInterface;
-use Phalcon\Crypt\Mismatch;
-use Phalcon\Filter\FilterInterface;
-use Phalcon\Helper\Arr;
-use Phalcon\Http\Response\Exception;
use Phalcon\Http\Cookie\CookieInterface;
-use Phalcon\Http\Cookie\Exception as CookieException;
-use Phalcon\Session\ManagerInterface as SessionManagerInterface;
/**
* Provide OO wrappers to manage a HTTP cookie.
diff --git a/src/Phalcon/Http/Message/AbstractCommon.php b/src/Phalcon/Http/Message/AbstractCommon.php
index e2b49ac6..91c209e8 100644
--- a/src/Phalcon/Http/Message/AbstractCommon.php
+++ b/src/Phalcon/Http/Message/AbstractCommon.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Http\Message\Exception\InvalidArgumentException;
-
/**
* Common methods
*/
diff --git a/src/Phalcon/Http/Message/AbstractRequest.php b/src/Phalcon/Http/Message/AbstractRequest.php
index 518d3c3c..fd605d15 100644
--- a/src/Phalcon/Http/Message/AbstractRequest.php
+++ b/src/Phalcon/Http/Message/AbstractRequest.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Collection;
use Phalcon\Http\Message\Exception\InvalidArgumentException;
use Psr\Http\Message\UriInterface;
diff --git a/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php b/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php
index 9ceabc76..14de3be7 100644
--- a/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php
+++ b/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Http\Message\Exception;
-use Throwable;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Http/Message/Request.php b/src/Phalcon/Http/Message/Request.php
index ec21b4b3..802c9ceb 100644
--- a/src/Phalcon/Http/Message/Request.php
+++ b/src/Phalcon/Http/Message/Request.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Http\Message\Stream\Input;
-use Phalcon\Http\Message\AbstractRequest;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UriInterface;
diff --git a/src/Phalcon/Http/Message/RequestFactory.php b/src/Phalcon/Http/Message/RequestFactory.php
index 10fa956d..b7bd65e4 100644
--- a/src/Phalcon/Http/Message/RequestFactory.php
+++ b/src/Phalcon/Http/Message/RequestFactory.php
@@ -9,8 +9,8 @@
*/
namespace Phalcon\Http\Message;
-use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\UriInterface;
/**
diff --git a/src/Phalcon/Http/Message/Response.php b/src/Phalcon/Http/Message/Response.php
index 4a3a56c6..cfb4ec27 100644
--- a/src/Phalcon/Http/Message/Response.php
+++ b/src/Phalcon/Http/Message/Response.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Helper\Number;
-use Phalcon\Http\Message\AbstractMessage;
-use Phalcon\Http\Message\Exception\InvalidArgumentException;
use Psr\Http\Message\ResponseInterface;
/**
diff --git a/src/Phalcon/Http/Message/ResponseFactory.php b/src/Phalcon/Http/Message/ResponseFactory.php
index 44d9504c..7491c31a 100644
--- a/src/Phalcon/Http/Message/ResponseFactory.php
+++ b/src/Phalcon/Http/Message/ResponseFactory.php
@@ -9,8 +9,8 @@
*/
namespace Phalcon\Http\Message;
-use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
/**
* PSR-17 ResponseFactory
diff --git a/src/Phalcon/Http/Message/ServerRequest.php b/src/Phalcon/Http/Message/ServerRequest.php
index ea5bf989..e11cfb58 100644
--- a/src/Phalcon/Http/Message/ServerRequest.php
+++ b/src/Phalcon/Http/Message/ServerRequest.php
@@ -11,7 +11,6 @@
use Phalcon\Collection;
use Phalcon\Http\Message\Exception\InvalidArgumentException;
-use Phalcon\Http\Message\Stream\Input;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UploadedFileInterface;
diff --git a/src/Phalcon/Http/Message/ServerRequestFactory.php b/src/Phalcon/Http/Message/ServerRequestFactory.php
index d224212d..65dbc874 100644
--- a/src/Phalcon/Http/Message/ServerRequestFactory.php
+++ b/src/Phalcon/Http/Message/ServerRequestFactory.php
@@ -10,12 +10,11 @@
namespace Phalcon\Http\Message;
use Phalcon\Collection;
-use Phalcon\Helper\Arr;
use Phalcon\Http\Message\Exception\InvalidArgumentException;
use Psr\Http\Message\ServerRequestFactoryInterface;
use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\UriInterface;
use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Message\UriInterface;
/**
* PSR-17 ServerRequestFactory
diff --git a/src/Phalcon/Http/Message/Stream.php b/src/Phalcon/Http/Message/Stream.php
index 285e05ba..d01bbcb5 100644
--- a/src/Phalcon/Http/Message/Stream.php
+++ b/src/Phalcon/Http/Message/Stream.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Helper\Arr;
-use Exception;
use Psr\Http\Message\StreamInterface;
-use RuntimeException;
/**
* PSR-7 Stream
diff --git a/src/Phalcon/Http/Message/StreamFactory.php b/src/Phalcon/Http/Message/StreamFactory.php
index 9a1c4b9f..f8401d0d 100644
--- a/src/Phalcon/Http/Message/StreamFactory.php
+++ b/src/Phalcon/Http/Message/StreamFactory.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Http\Message\Exception\InvalidArgumentException;
use Psr\Http\Message\StreamFactoryInterface;
use Psr\Http\Message\StreamInterface;
diff --git a/src/Phalcon/Http/Message/UploadedFile.php b/src/Phalcon/Http/Message/UploadedFile.php
index 89c07508..d309089f 100644
--- a/src/Phalcon/Http/Message/UploadedFile.php
+++ b/src/Phalcon/Http/Message/UploadedFile.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Helper\Number;
-use Phalcon\Helper\Arr;
-use Phalcon\Helper\Str;
use Phalcon\Http\Message\Exception\InvalidArgumentException;
use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UploadedFileInterface;
diff --git a/src/Phalcon/Http/Message/UploadedFileFactory.php b/src/Phalcon/Http/Message/UploadedFileFactory.php
index a8c31f4e..e01d2ad4 100644
--- a/src/Phalcon/Http/Message/UploadedFileFactory.php
+++ b/src/Phalcon/Http/Message/UploadedFileFactory.php
@@ -10,8 +10,8 @@
namespace Phalcon\Http\Message;
use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileInterface;
use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UploadedFileInterface;
/**
* PSR-17 UploadedFileFactory
diff --git a/src/Phalcon/Http/Message/Uri.php b/src/Phalcon/Http/Message/Uri.php
index 2f912be5..2b20450a 100644
--- a/src/Phalcon/Http/Message/Uri.php
+++ b/src/Phalcon/Http/Message/Uri.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Http\Message;
-use Phalcon\Helper\Arr;
-use Phalcon\Helper\Str;
use Phalcon\Http\Message\Exception\InvalidArgumentException;
use Psr\Http\Message\UriInterface;
diff --git a/src/Phalcon/Http/Request.php b/src/Phalcon/Http/Request.php
index bb38b85a..fa2cf8ba 100644
--- a/src/Phalcon/Http/Request.php
+++ b/src/Phalcon/Http/Request.php
@@ -9,16 +9,8 @@
*/
namespace Phalcon\Http;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Events\ManagerInterface;
use Phalcon\Filter\FilterInterface;
-use Phalcon\Helper\Json;
-use Phalcon\Http\Request\File;
-use Phalcon\Http\Request\FileInterface;
-use Phalcon\Http\Request\Exception;
-use UnexpectedValueException;
-use stdClass;
/**
* Encapsulates request information for easy and secure access from application
diff --git a/src/Phalcon/Http/RequestInterface.php b/src/Phalcon/Http/RequestInterface.php
index 38efd689..8c96e2e2 100644
--- a/src/Phalcon/Http/RequestInterface.php
+++ b/src/Phalcon/Http/RequestInterface.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Http;
-use Phalcon\Http\Request\FileInterface;
-use stdClass;
-
/**
* Interface for Phalcon\Http\Request
*/
diff --git a/src/Phalcon/Http/Response.php b/src/Phalcon/Http/Response.php
index e16a08d3..bb19e53d 100644
--- a/src/Phalcon/Http/Response.php
+++ b/src/Phalcon/Http/Response.php
@@ -9,21 +9,10 @@
*/
namespace Phalcon\Http;
-use DateTime;
-use DateTimeZone;
-use Phalcon\Di;
use Phalcon\Di\DiInterface;
-use Phalcon\Helper\Fs;
-use Phalcon\Helper\Json;
-use Phalcon\Http\Response\Exception;
-use Phalcon\Http\Response\HeadersInterface;
-use Phalcon\Http\Response\CookiesInterface;
-use Phalcon\Url\UrlInterface;
-use Phalcon\Mvc\ViewInterface;
-use Phalcon\Http\Response\Headers;
-use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
+use Phalcon\Http\Response\CookiesInterface;
+use Phalcon\Http\Response\HeadersInterface;
/**
* Part of the HTTP cycle is return responses to the clients.
diff --git a/src/Phalcon/Http/Response/Cookies.php b/src/Phalcon/Http/Response/Cookies.php
index c3eaf31d..79e2a2fc 100644
--- a/src/Phalcon/Http/Response/Cookies.php
+++ b/src/Phalcon/Http/Response/Cookies.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Http\Response;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Http\Cookie\Exception;
use Phalcon\Http\Cookie\CookieInterface;
/**
diff --git a/src/Phalcon/Http/ResponseInterface.php b/src/Phalcon/Http/ResponseInterface.php
index 935ced0c..effb2543 100644
--- a/src/Phalcon/Http/ResponseInterface.php
+++ b/src/Phalcon/Http/ResponseInterface.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Http;
-use DateTime;
use Phalcon\Http\Response\HeadersInterface;
/**
diff --git a/src/Phalcon/Image/Adapter/AbstractAdapter.php b/src/Phalcon/Image/Adapter/AbstractAdapter.php
index 5ce3da90..24633d97 100644
--- a/src/Phalcon/Image/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Image/Adapter/AbstractAdapter.php
@@ -10,7 +10,6 @@
namespace Phalcon\Image\Adapter;
use Phalcon\Image\Enum;
-use Phalcon\Image\Exception;
/**
* Phalcon\Image\Adapter
diff --git a/src/Phalcon/Image/Adapter/Gd.php b/src/Phalcon/Image/Adapter/Gd.php
index a413f2ba..719b860b 100644
--- a/src/Phalcon/Image/Adapter/Gd.php
+++ b/src/Phalcon/Image/Adapter/Gd.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Image\Adapter;
-use Phalcon\Image\Enum;
-use Phalcon\Image\Exception;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Image/Adapter/Imagick.php b/src/Phalcon/Image/Adapter/Imagick.php
index 9b28643d..8991ffb6 100644
--- a/src/Phalcon/Image/Adapter/Imagick.php
+++ b/src/Phalcon/Image/Adapter/Imagick.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Image\Adapter;
-use Phalcon\Image\Enum;
-use Phalcon\Image\Exception;
-
/**
* Phalcon\Image\Adapter\Imagick
*
diff --git a/src/Phalcon/Image/ImageFactory.php b/src/Phalcon/Image/ImageFactory.php
index f25b6d72..d1814299 100644
--- a/src/Phalcon/Image/ImageFactory.php
+++ b/src/Phalcon/Image/ImageFactory.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Image;
-use Phalcon\Config;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Helper\Arr;
use Phalcon\Image\Adapter\AdapterInterface;
/**
diff --git a/src/Phalcon/Loader.php b/src/Phalcon/Loader.php
index bbc1a30b..3ae299da 100644
--- a/src/Phalcon/Loader.php
+++ b/src/Phalcon/Loader.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon;
-use Phalcon\Loader\Exception;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Events\EventsAwareInterface;
/**
* This component helps to load your project classes automatically based on some
diff --git a/src/Phalcon/Logger.php b/src/Phalcon/Logger.php
index fe36aa37..23095a96 100644
--- a/src/Phalcon/Logger.php
+++ b/src/Phalcon/Logger.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon;
-use Psr\Log\LoggerInterface;
use Phalcon\Logger\Adapter\AdapterInterface;
-use Phalcon\Logger\Item;
use Phalcon\Logger\Exception;
/**
diff --git a/src/Phalcon/Logger/Adapter/AbstractAdapter.php b/src/Phalcon/Logger/Adapter/AbstractAdapter.php
index aaea892c..325b51a8 100644
--- a/src/Phalcon/Logger/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Logger/Adapter/AbstractAdapter.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Logger\Adapter;
-use Phalcon\Logger;
-use Phalcon\Logger\Exception;
use Phalcon\Logger\Formatter\FormatterInterface;
-use Phalcon\Logger\Item;
/**
* This file is part of the Phalcon Framework.
diff --git a/src/Phalcon/Logger/Adapter/AdapterInterface.php b/src/Phalcon/Logger/Adapter/AdapterInterface.php
index 5ae0cab3..1242f12b 100644
--- a/src/Phalcon/Logger/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Logger/Adapter/AdapterInterface.php
@@ -10,7 +10,6 @@
namespace Phalcon\Logger\Adapter;
use Phalcon\Logger\Formatter\FormatterInterface;
-use Phalcon\Logger\Item;
/**
* Phalcon\Logger\AdapterInterface
diff --git a/src/Phalcon/Logger/Adapter/Noop.php b/src/Phalcon/Logger/Adapter/Noop.php
index 582a0261..0565cbf0 100644
--- a/src/Phalcon/Logger/Adapter/Noop.php
+++ b/src/Phalcon/Logger/Adapter/Noop.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Logger\Adapter;
-use Phalcon\Logger\Item;
-
/**
* Phalcon\Logger\Adapter\Noop
*
diff --git a/src/Phalcon/Logger/Adapter/Stream.php b/src/Phalcon/Logger/Adapter/Stream.php
index c55dc795..a925f3a5 100644
--- a/src/Phalcon/Logger/Adapter/Stream.php
+++ b/src/Phalcon/Logger/Adapter/Stream.php
@@ -9,12 +9,6 @@
*/
namespace Phalcon\Logger\Adapter;
-use Phalcon\Logger\Adapter;
-use Phalcon\Logger\Exception;
-use Phalcon\Logger\Formatter\FormatterInterface;
-use Phalcon\Logger\Item;
-use UnexpectedValueException;
-
/**
* Phalcon\Logger\Adapter\Stream
*
diff --git a/src/Phalcon/Logger/Adapter/Syslog.php b/src/Phalcon/Logger/Adapter/Syslog.php
index 603557a6..89990999 100644
--- a/src/Phalcon/Logger/Adapter/Syslog.php
+++ b/src/Phalcon/Logger/Adapter/Syslog.php
@@ -9,14 +9,6 @@
*/
namespace Phalcon\Logger\Adapter;
-use LogicException;
-use Phalcon\Helper\Arr;
-use Phalcon\Logger;
-use Phalcon\Logger\Adapter;
-use Phalcon\Logger\Exception;
-use Phalcon\Logger\Formatter\FormatterInterface;
-use Phalcon\Logger\Item;
-
/**
* Phalcon\Logger\Adapter\Syslog
*
diff --git a/src/Phalcon/Logger/Formatter/AbstractFormatter.php b/src/Phalcon/Logger/Formatter/AbstractFormatter.php
index cf2f0288..9de8a6ce 100644
--- a/src/Phalcon/Logger/Formatter/AbstractFormatter.php
+++ b/src/Phalcon/Logger/Formatter/AbstractFormatter.php
@@ -9,11 +9,6 @@
*/
namespace Phalcon\Logger\Formatter;
-use DateTimeImmutable;
-use DateTimeZone;
-use Phalcon\Logger;
-use Phalcon\Logger\Item;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Logger/Formatter/FormatterInterface.php b/src/Phalcon/Logger/Formatter/FormatterInterface.php
index 84ee5d55..e51a353d 100644
--- a/src/Phalcon/Logger/Formatter/FormatterInterface.php
+++ b/src/Phalcon/Logger/Formatter/FormatterInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Logger\Formatter;
-use Phalcon\Logger\Item;
-
/**
* Phalcon\Logger\FormatterInterface
*
diff --git a/src/Phalcon/Logger/Formatter/Json.php b/src/Phalcon/Logger/Formatter/Json.php
index d1a65d25..19527618 100644
--- a/src/Phalcon/Logger/Formatter/Json.php
+++ b/src/Phalcon/Logger/Formatter/Json.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Logger\Formatter;
-use Phalcon\Helper\Json as JsonHelper;
-use Phalcon\Logger\Item;
-
/**
* Phalcon\Logger\Formatter\Json
*
diff --git a/src/Phalcon/Logger/Formatter/Line.php b/src/Phalcon/Logger/Formatter/Line.php
index 173aec9b..ac36a234 100644
--- a/src/Phalcon/Logger/Formatter/Line.php
+++ b/src/Phalcon/Logger/Formatter/Line.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Logger\Formatter;
-use DateTime;
-use Phalcon\Logger\Item;
-
/**
* Phalcon\Logger\Formatter\Line
*
diff --git a/src/Phalcon/Logger/LoggerFactory.php b/src/Phalcon/Logger/LoggerFactory.php
index fa56692f..de0205bc 100644
--- a/src/Phalcon/Logger/LoggerFactory.php
+++ b/src/Phalcon/Logger/LoggerFactory.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Logger;
-use Phalcon\Config;
-use Phalcon\Helper\Arr;
use Phalcon\Logger;
/**
diff --git a/src/Phalcon/Messages/Message.php b/src/Phalcon/Messages/Message.php
index c0c64851..e0da5621 100644
--- a/src/Phalcon/Messages/Message.php
+++ b/src/Phalcon/Messages/Message.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Messages;
-use JsonSerializable;
-
/**
* Phalcon\Messages\Message
*
diff --git a/src/Phalcon/Messages/Messages.php b/src/Phalcon/Messages/Messages.php
index 54d8d33b..9340fb2b 100644
--- a/src/Phalcon/Messages/Messages.php
+++ b/src/Phalcon/Messages/Messages.php
@@ -9,11 +9,6 @@
*/
namespace Phalcon\Messages;
-use ArrayAccess;
-use Countable;
-use Iterator;
-use JsonSerializable;
-
/**
* Represents a collection of messages
*/
diff --git a/src/Phalcon/Mvc/Application.php b/src/Phalcon/Mvc/Application.php
index 3c8bdbd9..338827f4 100644
--- a/src/Phalcon/Mvc/Application.php
+++ b/src/Phalcon/Mvc/Application.php
@@ -9,13 +9,7 @@
*/
namespace Phalcon\Mvc;
-use Closure;
use Phalcon\Application\AbstractApplication;
-use Phalcon\Di\DiInterface;
-use Phalcon\Http\ResponseInterface;
-use Phalcon\Events\ManagerInterface;
-use Phalcon\Mvc\Application\Exception;
-use Phalcon\Mvc\Router\RouteInterface;
use Phalcon\Mvc\ModuleDefinitionInterface;
/**
diff --git a/src/Phalcon/Mvc/Dispatcher.php b/src/Phalcon/Mvc/Dispatcher.php
index 6347a0c9..af0a7413 100644
--- a/src/Phalcon/Mvc/Dispatcher.php
+++ b/src/Phalcon/Mvc/Dispatcher.php
@@ -9,11 +9,6 @@
*/
namespace Phalcon\Mvc;
-use Phalcon\Mvc\Dispatcher\Exception;
-use Phalcon\Events\ManagerInterface;
-use Phalcon\Http\ResponseInterface;
-use Phalcon\Dispatcher\AbstractDispatcher as BaseDispatcher;
-
/**
* Dispatching is the process of taking the request object, extracting the
* module name, controller name, action name, and optional parameters contained
diff --git a/src/Phalcon/Mvc/Micro.php b/src/Phalcon/Mvc/Micro.php
index fc3115ff..012171b3 100644
--- a/src/Phalcon/Mvc/Micro.php
+++ b/src/Phalcon/Mvc/Micro.php
@@ -9,23 +9,11 @@
*/
namespace Phalcon\Mvc;
-use ArrayAccess;
-use Closure;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
-use Phalcon\Di\FactoryDefault;
-use Phalcon\Mvc\Micro\Exception;
use Phalcon\Di\ServiceInterface;
-use Phalcon\Mvc\Micro\Collection;
-use Phalcon\Mvc\Micro\LazyLoader;
-use Phalcon\Http\ResponseInterface;
+use Phalcon\Events\ManagerInterface;
use Phalcon\Mvc\Model\BinderInterface;
use Phalcon\Mvc\Router\RouteInterface;
-use Phalcon\Events\EventsAwareInterface;
-use Phalcon\Events\ManagerInterface;
-use Phalcon\Mvc\Micro\MiddlewareInterface;
-use Phalcon\Mvc\Micro\CollectionInterface;
-use Throwable;
/**
* Phalcon\Mvc\Micro
diff --git a/src/Phalcon/Mvc/Micro/LazyLoader.php b/src/Phalcon/Mvc/Micro/LazyLoader.php
index 4ce54ae6..1713ab44 100644
--- a/src/Phalcon/Mvc/Micro/LazyLoader.php
+++ b/src/Phalcon/Mvc/Micro/LazyLoader.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\Micro;
-use Phalcon\Mvc\Model\BinderInterface;
-
/**
* Phalcon\Mvc\Micro\LazyLoader
*
diff --git a/src/Phalcon/Mvc/Micro/MiddlewareInterface.php b/src/Phalcon/Mvc/Micro/MiddlewareInterface.php
index 3b5de100..ab24356d 100644
--- a/src/Phalcon/Mvc/Micro/MiddlewareInterface.php
+++ b/src/Phalcon/Mvc/Micro/MiddlewareInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\Micro;
-use Phalcon\Mvc\Micro;
-
/**
* Allows to implement Phalcon\Mvc\Micro middleware in classes
*/
diff --git a/src/Phalcon/Mvc/Model.php b/src/Phalcon/Mvc/Model.php
index 60991170..dab6d99f 100644
--- a/src/Phalcon/Mvc/Model.php
+++ b/src/Phalcon/Mvc/Model.php
@@ -9,39 +9,15 @@
*/
namespace Phalcon\Mvc;
-use JsonSerializable;
use Phalcon\Db\Adapter\AdapterInterface;
-use Phalcon\Db\Column;
-use Phalcon\Db\DialectInterface;
-use Phalcon\Db\Enum;
-use Phalcon\Db\RawValue;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Di;
-use Phalcon\Di\DiInterface;
use Phalcon\Events\ManagerInterface as EventsManagerInterface;
-use Phalcon\Helper\Arr;
-use Phalcon\Messages\Message;
-use Phalcon\Messages\MessageInterface;
-use Phalcon\Mvc\Model\BehaviorInterface;
-use Phalcon\Mvc\Model\Criteria;
use Phalcon\Mvc\Model\CriteriaInterface;
-use Phalcon\Mvc\Model\Exception;
use Phalcon\Mvc\Model\ManagerInterface;
use Phalcon\Mvc\Model\MetaDataInterface;
use Phalcon\Mvc\Model\Query;
-use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Mvc\Model\Query\BuilderInterface;
-use Phalcon\Mvc\Model\QueryInterface;
-use Phalcon\Mvc\Model\ResultInterface;
-use Phalcon\Mvc\Model\Resultset;
-use Phalcon\Mvc\Model\ResultsetInterface;
use Phalcon\Mvc\Model\Relation;
-use Phalcon\Mvc\Model\RelationInterface;
-use Phalcon\Mvc\Model\TransactionInterface;
-use Phalcon\Mvc\Model\ValidationFailed;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Validation\ValidationInterface;
-use Serializable;
+use Phalcon\Mvc\Model\ResultsetInterface;
/**
* Phalcon\Mvc\Model
diff --git a/src/Phalcon/Mvc/Model/Behavior.php b/src/Phalcon/Mvc/Model/Behavior.php
index 301149cc..25bf961e 100644
--- a/src/Phalcon/Mvc/Model/Behavior.php
+++ b/src/Phalcon/Mvc/Model/Behavior.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
-
/**
* Phalcon\Mvc\Model\Behavior
*
diff --git a/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php b/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php
index 9b9ee263..85b47a4d 100644
--- a/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php
+++ b/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Mvc\Model\Behavior;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Mvc\Model\Behavior;
-use Phalcon\Mvc\Model\Exception;
/**
* Phalcon\Mvc\Model\Behavior\SoftDelete
diff --git a/src/Phalcon/Mvc/Model/Behavior/Timestampable.php b/src/Phalcon/Mvc/Model/Behavior/Timestampable.php
index 455eaba4..0863099b 100644
--- a/src/Phalcon/Mvc/Model/Behavior/Timestampable.php
+++ b/src/Phalcon/Mvc/Model/Behavior/Timestampable.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Mvc\Model\Behavior;
-use Closure;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Mvc\Model\Behavior;
-use Phalcon\Mvc\Model\Exception;
/**
* Phalcon\Mvc\Model\Behavior\Timestampable
diff --git a/src/Phalcon/Mvc/Model/BehaviorInterface.php b/src/Phalcon/Mvc/Model/BehaviorInterface.php
index b923b5f5..8d42f024 100644
--- a/src/Phalcon/Mvc/Model/BehaviorInterface.php
+++ b/src/Phalcon/Mvc/Model/BehaviorInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
-
/**
* Phalcon\Mvc\Model\BehaviorInterface
*
diff --git a/src/Phalcon/Mvc/Model/Binder.php b/src/Phalcon/Mvc/Model/Binder.php
index 30abd4a0..980c7340 100644
--- a/src/Phalcon/Mvc/Model/Binder.php
+++ b/src/Phalcon/Mvc/Model/Binder.php
@@ -9,12 +9,7 @@
*/
namespace Phalcon\Mvc\Model;
-use Closure;
-use Phalcon\Mvc\Controller\BindModelInterface;
-use Phalcon\Mvc\Model\Binder\BindableInterface;
use Phalcon\Cache\Adapter\AdapterInterface;
-use ReflectionFunction;
-use ReflectionMethod;
/**
* Phalcon\Mvc\Model\Binding
diff --git a/src/Phalcon/Mvc/Model/Criteria.php b/src/Phalcon/Mvc/Model/Criteria.php
index fbf3a7d6..532ce0b7 100644
--- a/src/Phalcon/Mvc/Model/Criteria.php
+++ b/src/Phalcon/Mvc/Model/Criteria.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Di;
-use Phalcon\Db\Column;
use Phalcon\Di\DiInterface;
-use Phalcon\Di\InjectionAwareInterface;
use Phalcon\Mvc\Model\Query\BuilderInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/CriteriaInterface.php b/src/Phalcon/Mvc/Model/CriteriaInterface.php
index 7879a64c..419e17a5 100644
--- a/src/Phalcon/Mvc/Model/CriteriaInterface.php
+++ b/src/Phalcon/Mvc/Model/CriteriaInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Di\DiInterface;
-
/**
* Phalcon\Mvc\Model\CriteriaInterface
*
diff --git a/src/Phalcon/Mvc/Model/Manager.php b/src/Phalcon/Mvc/Model/Manager.php
index 7b11b5d0..9af259ba 100644
--- a/src/Phalcon/Mvc/Model/Manager.php
+++ b/src/Phalcon/Mvc/Model/Manager.php
@@ -9,19 +9,11 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Di\DiInterface;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Db\Adapter\AdapterInterface;
-use Phalcon\Mvc\Model\ResultsetInterface;
-use Phalcon\Mvc\Model\ManagerInterface;
-use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Events\EventsAwareInterface;
-use Phalcon\Mvc\Model\Query;
-use Phalcon\Mvc\Model\QueryInterface;
-use Phalcon\Mvc\Model\Query\Builder;
-use Phalcon\Mvc\Model\Query\BuilderInterface;
-use Phalcon\Mvc\Model\BehaviorInterface;
+use Phalcon\Di\DiInterface;
use Phalcon\Events\ManagerInterface as EventsManagerInterface;
+use Phalcon\Mvc\Model\Query\BuilderInterface;
+use Phalcon\Mvc\ModelInterface;
/**
* Phalcon\Mvc\Model\Manager
diff --git a/src/Phalcon/Mvc/Model/ManagerInterface.php b/src/Phalcon/Mvc/Model/ManagerInterface.php
index 039dfaae..1e1193c5 100644
--- a/src/Phalcon/Mvc/Model/ManagerInterface.php
+++ b/src/Phalcon/Mvc/Model/ManagerInterface.php
@@ -10,9 +10,8 @@
namespace Phalcon\Mvc\Model;
use Phalcon\Db\Adapter\AdapterInterface;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Mvc\Model\Query\BuilderInterface;
-use Phalcon\Mvc\Model\QueryInterface;
+use Phalcon\Mvc\ModelInterface;
/**
* Phalcon\Mvc\Model\ManagerInterface
diff --git a/src/Phalcon/Mvc/Model/MetaData.php b/src/Phalcon/Mvc/Model/MetaData.php
index 3d48ffd2..e6e6309b 100644
--- a/src/Phalcon/Mvc/Model/MetaData.php
+++ b/src/Phalcon/Mvc/Model/MetaData.php
@@ -11,10 +11,7 @@
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
use Phalcon\Di\DiInterface;
-use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Mvc\Model\MetaData\Strategy\Introspection;
use Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface;
-use Phalcon\Mvc\ModelInterface;
/**
* Phalcon\Mvc\Model\MetaData
diff --git a/src/Phalcon/Mvc/Model/MetaData/Apcu.php b/src/Phalcon/Mvc/Model/MetaData/Apcu.php
index 27cb4644..0280a7f7 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Apcu.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Apcu.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Mvc\Model\MetaData;
-use Phalcon\Helper\Arr;
use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\Exception;
-use Phalcon\Cache\AdapterFactory;
/**
* Phalcon\Mvc\Model\MetaData\Apcu
diff --git a/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php b/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php
index 295ae497..0598634e 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Mvc\Model\MetaData;
-use Phalcon\Helper\Arr;
-use Phalcon\Mvc\Model\Exception;
use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Cache\AdapterFactory;
/**
* Phalcon\Mvc\Model\MetaData\Libmemcached
diff --git a/src/Phalcon/Mvc/Model/MetaData/Memory.php b/src/Phalcon/Mvc/Model/MetaData/Memory.php
index 2f749e5c..7b6ef87a 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Memory.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Memory.php
@@ -10,7 +10,6 @@
namespace Phalcon\Mvc\Model\MetaData;
use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\Exception;
/**
* Phalcon\Mvc\Model\MetaData\Memory
diff --git a/src/Phalcon/Mvc/Model/MetaData/Redis.php b/src/Phalcon/Mvc/Model/MetaData/Redis.php
index 579b0502..d320f49a 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Redis.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Redis.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Mvc\Model\MetaData;
-use Phalcon\Helper\Arr;
use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Cache\AdapterFactory;
/**
* Phalcon\Mvc\Model\MetaData\Redis
diff --git a/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php b/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php
index 116e86f8..9fdd2e38 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php
@@ -9,12 +9,6 @@
*/
namespace Phalcon\Mvc\Model\MetaData\Strategy;
-use Phalcon\Di\DiInterface;
-use Phalcon\Db\Column;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\Exception;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php b/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php
index 5f07f3c3..0e875ac1 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php
@@ -9,13 +9,6 @@
*/
namespace Phalcon\Mvc\Model\MetaData\Strategy;
-use Phalcon\Di\DiInterface;
-use Phalcon\Db\Adapter\AdapterInterface;
-use Phalcon\Db\Column;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Exception;
-use Phalcon\Mvc\Model\MetaData;
-
/**
* Phalcon\Mvc\Model\MetaData\Strategy\Introspection
*
diff --git a/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php b/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php
index 37c512ec..f2cf8b19 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Mvc\Model\MetaData\Strategy;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Di\DiInterface;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Mvc/Model/MetaData/Stream.php b/src/Phalcon/Mvc/Model/MetaData/Stream.php
index be7d92f5..a9c7d71d 100644
--- a/src/Phalcon/Mvc/Model/MetaData/Stream.php
+++ b/src/Phalcon/Mvc/Model/MetaData/Stream.php
@@ -10,7 +10,6 @@
namespace Phalcon\Mvc\Model\MetaData;
use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\Exception;
/**
* Phalcon\Mvc\Model\MetaData\Stream
diff --git a/src/Phalcon/Mvc/Model/MetaDataInterface.php b/src/Phalcon/Mvc/Model/MetaDataInterface.php
index 2f5baa76..40abad22 100644
--- a/src/Phalcon/Mvc/Model/MetaDataInterface.php
+++ b/src/Phalcon/Mvc/Model/MetaDataInterface.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/Query.php b/src/Phalcon/Mvc/Model/Query.php
index f9b0a04a..31d41240 100644
--- a/src/Phalcon/Mvc/Model/Query.php
+++ b/src/Phalcon/Mvc/Model/Query.php
@@ -9,21 +9,10 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Db\Column;
-use Phalcon\Db\RawValue;
-use Phalcon\Db\ResultInterface;
use Phalcon\Db\Adapter\AdapterInterface;
use Phalcon\Di\DiInterface;
-use Phalcon\Helper\Arr;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Query\Status;
-use Phalcon\Mvc\Model\Resultset\Complex;
use Phalcon\Mvc\Model\Query\StatusInterface;
-use Phalcon\Mvc\Model\ResultsetInterface;
-use Phalcon\Mvc\Model\Resultset\Simple;
-use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Db\DialectInterface;
-use Phalcon\Mvc\Model\Query\Lang;
+use Phalcon\Mvc\ModelInterface;
/**
* Phalcon\Mvc\Model\Query
diff --git a/src/Phalcon/Mvc/Model/Query/Builder.php b/src/Phalcon/Mvc/Model/Query/Builder.php
index 11b63604..6c919f58 100644
--- a/src/Phalcon/Mvc/Model/Query/Builder.php
+++ b/src/Phalcon/Mvc/Model/Query/Builder.php
@@ -9,12 +9,7 @@
*/
namespace Phalcon\Mvc\Model\Query;
-use Phalcon\Di;
-use Phalcon\Db\Column;
use Phalcon\Di\DiInterface;
-use Phalcon\Helper\Arr;
-use Phalcon\Mvc\Model\Exception;
-use Phalcon\Di\InjectionAwareInterface;
use Phalcon\Mvc\Model\QueryInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/Query/Status.php b/src/Phalcon/Mvc/Model/Query/Status.php
index 6c1e9a11..623b3ca1 100644
--- a/src/Phalcon/Mvc/Model/Query/Status.php
+++ b/src/Phalcon/Mvc/Model/Query/Status.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Mvc\Model\Query;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Mvc\ModelInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/Query/StatusInterface.php b/src/Phalcon/Mvc/Model/Query/StatusInterface.php
index c899514a..b70cbae2 100644
--- a/src/Phalcon/Mvc/Model/Query/StatusInterface.php
+++ b/src/Phalcon/Mvc/Model/Query/StatusInterface.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Mvc\Model\Query;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Mvc\ModelInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/ResultInterface.php b/src/Phalcon/Mvc/Model/ResultInterface.php
index c4fa0b86..3f71406f 100644
--- a/src/Phalcon/Mvc/Model/ResultInterface.php
+++ b/src/Phalcon/Mvc/Model/ResultInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
-
/**
* Phalcon\Mvc\Model\ResultInterface
*
diff --git a/src/Phalcon/Mvc/Model/Resultset.php b/src/Phalcon/Mvc/Model/Resultset.php
index aa8a4f10..c5f57173 100644
--- a/src/Phalcon/Mvc/Model/Resultset.php
+++ b/src/Phalcon/Mvc/Model/Resultset.php
@@ -9,19 +9,8 @@
*/
namespace Phalcon\Mvc\Model;
-use ArrayAccess;
-use Closure;
-use Countable;
-use Iterator;
-use JsonSerializable;
-use Phalcon\Db\Enum;
-use Phalcon\Messages\MessageInterface;
-use Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Cache\Adapter\AdapterInterface;
-use Phalcon\Storage\Serializer\SerializerInterface;
-use SeekableIterator;
-use Serializable;
+use Phalcon\Mvc\ModelInterface;
/**
* Phalcon\Mvc\Model\Resultset
diff --git a/src/Phalcon/Mvc/Model/Resultset/Complex.php b/src/Phalcon/Mvc/Model/Resultset/Complex.php
index 216ba78b..4f3240f2 100644
--- a/src/Phalcon/Mvc/Model/Resultset/Complex.php
+++ b/src/Phalcon/Mvc/Model/Resultset/Complex.php
@@ -9,18 +9,7 @@
*/
namespace Phalcon\Mvc\Model\Resultset;
-use Phalcon\Cache\Adapter\AdapterInterface;
-use Phalcon\Di;
-use Phalcon\Di\DiInterface;
-use Phalcon\Db\ResultInterface;
-use Phalcon\Mvc\Model;
-use Phalcon\Mvc\Model\Exception;
use Phalcon\Mvc\Model\Resultset;
-use Phalcon\Mvc\Model\ResultsetInterface;
-use Phalcon\Mvc\Model\Row;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Storage\Serializer\SerializerInterface;
-use stdClass;
/**
* Phalcon\Mvc\Model\Resultset\Complex
diff --git a/src/Phalcon/Mvc/Model/Resultset/Simple.php b/src/Phalcon/Mvc/Model/Resultset/Simple.php
index 0622bdf2..0d428d2b 100644
--- a/src/Phalcon/Mvc/Model/Resultset/Simple.php
+++ b/src/Phalcon/Mvc/Model/Resultset/Simple.php
@@ -9,15 +9,8 @@
*/
namespace Phalcon\Mvc\Model\Resultset;
-use Phalcon\Cache\Adapter\AdapterInterface;
-use Phalcon\Di;
-use Phalcon\Di\DiInterface;
-use Phalcon\Mvc\Model;
-use Phalcon\Mvc\Model\Exception;
use Phalcon\Mvc\Model\Resultset;
-use Phalcon\Mvc\Model\Row;
use Phalcon\Mvc\ModelInterface;
-use Phalcon\Storage\Serializer\SerializerInterface;
/**
* Phalcon\Mvc\Model\Resultset\Simple
diff --git a/src/Phalcon/Mvc/Model/ResultsetInterface.php b/src/Phalcon/Mvc/Model/ResultsetInterface.php
index 8852a7eb..6e2f6730 100644
--- a/src/Phalcon/Mvc/Model/ResultsetInterface.php
+++ b/src/Phalcon/Mvc/Model/ResultsetInterface.php
@@ -9,10 +9,8 @@
*/
namespace Phalcon\Mvc\Model;
-use Closure;
-use Phalcon\Messages\MessageInterface;
-use Phalcon\Mvc\ModelInterface;
use Phalcon\Cache\Adapter\AdapterInterface;
+use Phalcon\Mvc\ModelInterface;
/**
* Phalcon\Mvc\Model\ResultsetInterface
diff --git a/src/Phalcon/Mvc/Model/Row.php b/src/Phalcon/Mvc/Model/Row.php
index 41322110..5ad81337 100644
--- a/src/Phalcon/Mvc/Model/Row.php
+++ b/src/Phalcon/Mvc/Model/Row.php
@@ -9,11 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use ArrayAccess;
-use JsonSerializable;
-use Phalcon\Mvc\EntityInterface;
-use Phalcon\Mvc\ModelInterface;
-
/**
* Phalcon\Mvc\Model\Row
*
diff --git a/src/Phalcon/Mvc/Model/Transaction.php b/src/Phalcon/Mvc/Model/Transaction.php
index af323b46..9f8d9866 100644
--- a/src/Phalcon/Mvc/Model/Transaction.php
+++ b/src/Phalcon/Mvc/Model/Transaction.php
@@ -9,12 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Di\DiInterface;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Transaction\Failed as TxFailed;
-use Phalcon\Mvc\Model\Transaction\ManagerInterface;
-use Phalcon\Mvc\Model\TransactionInterface;
-
/**
* Phalcon\Mvc\Model\Transaction
*
diff --git a/src/Phalcon/Mvc/Model/Transaction/Failed.php b/src/Phalcon/Mvc/Model/Transaction/Failed.php
index fe6b28a9..0c0ec856 100644
--- a/src/Phalcon/Mvc/Model/Transaction/Failed.php
+++ b/src/Phalcon/Mvc/Model/Transaction/Failed.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Mvc\Model\Transaction;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Mvc\ModelInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/Transaction/Manager.php b/src/Phalcon/Mvc/Model/Transaction/Manager.php
index a4d2978f..28fd6173 100644
--- a/src/Phalcon/Mvc/Model/Transaction/Manager.php
+++ b/src/Phalcon/Mvc/Model/Transaction/Manager.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Mvc\Model\Transaction;
-use Phalcon\Di;
use Phalcon\Di\DiInterface;
-use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\Mvc\Model\Transaction;
use Phalcon\Mvc\Model\TransactionInterface;
/**
diff --git a/src/Phalcon/Mvc/Model/TransactionInterface.php b/src/Phalcon/Mvc/Model/TransactionInterface.php
index dc112efd..99dba3e3 100644
--- a/src/Phalcon/Mvc/Model/TransactionInterface.php
+++ b/src/Phalcon/Mvc/Model/TransactionInterface.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Transaction\ManagerInterface;
-
/**
* Phalcon\Mvc\Model\TransactionInterface
*
diff --git a/src/Phalcon/Mvc/ModelInterface.php b/src/Phalcon/Mvc/ModelInterface.php
index 32b7d7c4..50ab8ab2 100644
--- a/src/Phalcon/Mvc/ModelInterface.php
+++ b/src/Phalcon/Mvc/ModelInterface.php
@@ -10,12 +10,9 @@
namespace Phalcon\Mvc;
use Phalcon\Db\Adapter\AdapterInterface;
-use Phalcon\Di\DiInterface;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Mvc\Model\CriteriaInterface;
use Phalcon\Mvc\Model\MetaDataInterface;
use Phalcon\Mvc\Model\ResultsetInterface;
-use Phalcon\Mvc\Model\TransactionInterface;
/**
* Phalcon\Mvc\ModelInterface
diff --git a/src/Phalcon/Mvc/ModuleDefinitionInterface.php b/src/Phalcon/Mvc/ModuleDefinitionInterface.php
index 514135f4..ac195410 100644
--- a/src/Phalcon/Mvc/ModuleDefinitionInterface.php
+++ b/src/Phalcon/Mvc/ModuleDefinitionInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc;
-use Phalcon\Di\DiInterface;
-
/**
* Phalcon\Mvc\ModuleDefinitionInterface
*
diff --git a/src/Phalcon/Mvc/Router.php b/src/Phalcon/Mvc/Router.php
index a9a02b4a..75b49be9 100644
--- a/src/Phalcon/Mvc/Router.php
+++ b/src/Phalcon/Mvc/Router.php
@@ -9,14 +9,8 @@
*/
namespace Phalcon\Mvc;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Http\RequestInterface;
-use Phalcon\Mvc\Router\Exception;
-use Phalcon\Mvc\Router\GroupInterface;
-use Phalcon\Mvc\Router\Route;
use Phalcon\Mvc\Router\RouteInterface;
/**
diff --git a/src/Phalcon/Mvc/Router/Annotations.php b/src/Phalcon/Mvc/Router/Annotations.php
index bead7d61..4fd2e415 100644
--- a/src/Phalcon/Mvc/Router/Annotations.php
+++ b/src/Phalcon/Mvc/Router/Annotations.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Mvc\Router;
-use Phalcon\Di\DiInterface;
use Phalcon\Mvc\Router;
-use Phalcon\Annotations\Annotation;
/**
* Phalcon\Mvc\Router\Annotations
diff --git a/src/Phalcon/Mvc/RouterInterface.php b/src/Phalcon/Mvc/RouterInterface.php
index 41a01d0b..e6e702a9 100644
--- a/src/Phalcon/Mvc/RouterInterface.php
+++ b/src/Phalcon/Mvc/RouterInterface.php
@@ -10,7 +10,6 @@
namespace Phalcon\Mvc;
use Phalcon\Mvc\Router\RouteInterface;
-use Phalcon\Mvc\Router\GroupInterface;
/**
* Interface for Phalcon\Mvc\Router
diff --git a/src/Phalcon/Mvc/View.php b/src/Phalcon/Mvc/View.php
index 502f3cf0..29bd0da4 100644
--- a/src/Phalcon/Mvc/View.php
+++ b/src/Phalcon/Mvc/View.php
@@ -9,15 +9,8 @@
*/
namespace Phalcon\Mvc;
-use Closure;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Helper\Arr;
-use Phalcon\Helper\Str;
-use Phalcon\Mvc\View\Exception;
-use Phalcon\Events\EventsAwareInterface;
-use Phalcon\Mvc\View\Engine\Php as PhpEngine;
/**
* Phalcon\Mvc\View
diff --git a/src/Phalcon/Mvc/View/Engine/AbstractEngine.php b/src/Phalcon/Mvc/View/Engine/AbstractEngine.php
index b81f3d0d..007c9c85 100644
--- a/src/Phalcon/Mvc/View/Engine/AbstractEngine.php
+++ b/src/Phalcon/Mvc/View/Engine/AbstractEngine.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Mvc\View\Engine;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
use Phalcon\Mvc\ViewBaseInterface;
diff --git a/src/Phalcon/Mvc/View/Engine/Volt.php b/src/Phalcon/Mvc/View/Engine/Volt.php
index 78651114..6192db65 100644
--- a/src/Phalcon/Mvc/View/Engine/Volt.php
+++ b/src/Phalcon/Mvc/View/Engine/Volt.php
@@ -9,11 +9,8 @@
*/
namespace Phalcon\Mvc\View\Engine;
-use Phalcon\Di\DiInterface;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
use Phalcon\Mvc\View\Engine\Volt\Compiler;
-use Phalcon\Mvc\View\Exception;
/**
* Designer friendly and fast template engine for PHP written in Zephir/C
diff --git a/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php b/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php
index ff7b45dc..9fe907a5 100644
--- a/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php
+++ b/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Mvc\View\Engine\Volt;
-use Closure;
use Phalcon\Di\DiInterface;
-use Phalcon\Mvc\ViewBaseInterface;
-use Phalcon\Di\InjectionAwareInterface;
/**
* This class reads and compiles Volt templates into PHP plain code
diff --git a/src/Phalcon/Mvc/View/Engine/Volt/Exception.php b/src/Phalcon/Mvc/View/Engine/Volt/Exception.php
index a097d61c..08a2dad3 100644
--- a/src/Phalcon/Mvc/View/Engine/Volt/Exception.php
+++ b/src/Phalcon/Mvc/View/Engine/Volt/Exception.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc\View\Engine\Volt;
-use Phalcon\Mvc\View\Exception as BaseException;
-
/**
* Class for exceptions thrown by Phalcon\Mvc\View
*/
diff --git a/src/Phalcon/Mvc/View/Simple.php b/src/Phalcon/Mvc/View/Simple.php
index 94bc11ff..7b4e6dd3 100644
--- a/src/Phalcon/Mvc/View/Simple.php
+++ b/src/Phalcon/Mvc/View/Simple.php
@@ -9,16 +9,8 @@
*/
namespace Phalcon\Mvc\View;
-use Closure;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
-use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
-use Phalcon\Helper\Arr;
-use Phalcon\Helper\Str;
-use Phalcon\Mvc\ViewBaseInterface;
-use Phalcon\Mvc\View\Engine\EngineInterface;
-use Phalcon\Mvc\View\Engine\Php as PhpEngine;
/**
* Phalcon\Mvc\View\Simple
diff --git a/src/Phalcon/Mvc/ViewBaseInterface.php b/src/Phalcon/Mvc/ViewBaseInterface.php
index fc7f446f..494f184a 100644
--- a/src/Phalcon/Mvc/ViewBaseInterface.php
+++ b/src/Phalcon/Mvc/ViewBaseInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Mvc;
-use Phalcon\Cache\Adapter\AdapterInterface;
-
/**
* Phalcon\Mvc\ViewInterface
*
diff --git a/src/Phalcon/Paginator/Adapter/AbstractAdapter.php b/src/Phalcon/Paginator/Adapter/AbstractAdapter.php
index bb1378af..4a919273 100644
--- a/src/Phalcon/Paginator/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Paginator/Adapter/AbstractAdapter.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Paginator\Adapter;
-use Phalcon\Paginator\Exception;
-use Phalcon\Paginator\Repository;
use Phalcon\Paginator\RepositoryInterface;
/**
diff --git a/src/Phalcon/Paginator/Adapter/Model.php b/src/Phalcon/Paginator/Adapter/Model.php
index 21f04fe3..cca3b9d3 100644
--- a/src/Phalcon/Paginator/Adapter/Model.php
+++ b/src/Phalcon/Paginator/Adapter/Model.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Paginator\Adapter;
-use Phalcon\Helper\Arr;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\ResultsetInterface;
-use Phalcon\Paginator\Exception;
use Phalcon\Paginator\RepositoryInterface;
/**
diff --git a/src/Phalcon/Paginator/Adapter/NativeArray.php b/src/Phalcon/Paginator/Adapter/NativeArray.php
index 98dc5e5e..a6bae499 100644
--- a/src/Phalcon/Paginator/Adapter/NativeArray.php
+++ b/src/Phalcon/Paginator/Adapter/NativeArray.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Paginator\Adapter;
-use Phalcon\Paginator\Exception;
use Phalcon\Paginator\RepositoryInterface;
/**
diff --git a/src/Phalcon/Paginator/Adapter/QueryBuilder.php b/src/Phalcon/Paginator/Adapter/QueryBuilder.php
index 6d325ea0..fd9fc9e9 100644
--- a/src/Phalcon/Paginator/Adapter/QueryBuilder.php
+++ b/src/Phalcon/Paginator/Adapter/QueryBuilder.php
@@ -9,10 +9,8 @@
*/
namespace Phalcon\Paginator\Adapter;
-use Phalcon\Db\Enum;
use Phalcon\Mvc\Model\Query\Builder;
use Phalcon\Paginator\RepositoryInterface;
-use Phalcon\Paginator\Exception;
/**
* Phalcon\Paginator\Adapter\QueryBuilder
diff --git a/src/Phalcon/Paginator/PaginatorFactory.php b/src/Phalcon/Paginator/PaginatorFactory.php
index ce26290e..a6ef3ec1 100644
--- a/src/Phalcon/Paginator/PaginatorFactory.php
+++ b/src/Phalcon/Paginator/PaginatorFactory.php
@@ -9,9 +9,8 @@
*/
namespace Phalcon\Paginator;
-use Phalcon\Paginator\Adapter\AdapterInterface;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Helper\Arr;
+use Phalcon\Paginator\Adapter\AdapterInterface;
/**
* This file is part of the Phalcon Framework.
diff --git a/src/Phalcon/Paginator/Repository.php b/src/Phalcon/Paginator/Repository.php
index 124c8086..798df280 100644
--- a/src/Phalcon/Paginator/Repository.php
+++ b/src/Phalcon/Paginator/Repository.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Paginator;
-use JsonSerializable;
-use Phalcon\Helper\Arr;
-
/**
* Phalcon\Paginator\Repository
*
diff --git a/src/Phalcon/Security.php b/src/Phalcon/Security.php
index 64c8f119..bd340029 100644
--- a/src/Phalcon/Security.php
+++ b/src/Phalcon/Security.php
@@ -9,11 +9,9 @@
*/
namespace Phalcon;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
use Phalcon\Http\RequestInterface;
use Phalcon\Security\Random;
-use Phalcon\Security\Exception;
use Phalcon\Session\ManagerInterface as SessionInterface;
/**
diff --git a/src/Phalcon/Session/Adapter/AbstractAdapter.php b/src/Phalcon/Session/Adapter/AbstractAdapter.php
index f86ae7f9..e0d4fc6e 100644
--- a/src/Phalcon/Session/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Session/Adapter/AbstractAdapter.php
@@ -10,7 +10,6 @@
namespace Phalcon\Session\Adapter;
use Phalcon\Storage\Adapter\AdapterInterface;
-use SessionHandlerInterface;
/**
* This file is part of the Phalcon.
diff --git a/src/Phalcon/Session/Adapter/Libmemcached.php b/src/Phalcon/Session/Adapter/Libmemcached.php
index ec6b682d..9e9b0098 100644
--- a/src/Phalcon/Session/Adapter/Libmemcached.php
+++ b/src/Phalcon/Session/Adapter/Libmemcached.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Session\Adapter;
-use Phalcon\Storage\AdapterFactory;
-
/**
* Phalcon\Session\Adapter\Libmemcached
*/
diff --git a/src/Phalcon/Session/Adapter/Noop.php b/src/Phalcon/Session/Adapter/Noop.php
index feb2e656..38eeef82 100644
--- a/src/Phalcon/Session/Adapter/Noop.php
+++ b/src/Phalcon/Session/Adapter/Noop.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Session\Adapter;
-use SessionHandlerInterface;
-
/**
* Phalcon\Session\Adapter\Noop
*
diff --git a/src/Phalcon/Session/Adapter/Redis.php b/src/Phalcon/Session/Adapter/Redis.php
index 4a4c8d60..a483a4ce 100644
--- a/src/Phalcon/Session/Adapter/Redis.php
+++ b/src/Phalcon/Session/Adapter/Redis.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Session\Adapter;
-use Phalcon\Storage\AdapterFactory;
-
/**
* Phalcon\Session\Adapter\Redis
*/
diff --git a/src/Phalcon/Session/Adapter/Stream.php b/src/Phalcon/Session/Adapter/Stream.php
index 2dcb1c33..1a8d4d2d 100644
--- a/src/Phalcon/Session/Adapter/Stream.php
+++ b/src/Phalcon/Session/Adapter/Stream.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Session\Adapter;
-use Phalcon\Helper\Str;
-use Phalcon\Session\Exception;
-
/**
* Phalcon\Session\Adapter\Stream
*
diff --git a/src/Phalcon/Session/Bag.php b/src/Phalcon/Session/Bag.php
index 310f82d0..5e2d1468 100644
--- a/src/Phalcon/Session/Bag.php
+++ b/src/Phalcon/Session/Bag.php
@@ -10,9 +10,7 @@
namespace Phalcon\Session;
use Phalcon\Collection;
-use Phalcon\Di;
use Phalcon\Di\DiInterface;
-use Phalcon\Di\InjectionAwareInterface;
/**
* Phalcon\Session\Bag
diff --git a/src/Phalcon/Session/Manager.php b/src/Phalcon/Session/Manager.php
index 7a8529aa..7f5b4aa7 100644
--- a/src/Phalcon/Session/Manager.php
+++ b/src/Phalcon/Session/Manager.php
@@ -10,11 +10,8 @@
namespace Phalcon\Session;
use InvalidArgumentException;
-use RuntimeException;
-use SessionHandlerInterface;
use Phalcon\Di\AbstractInjectionAware;
-use Phalcon\Di\DiInterface;
-use Phalcon\Helper\Arr;
+use SessionHandlerInterface;
/**
* Phalcon\Session\Manager
diff --git a/src/Phalcon/Session/ManagerInterface.php b/src/Phalcon/Session/ManagerInterface.php
index 71730b61..8be38a03 100644
--- a/src/Phalcon/Session/ManagerInterface.php
+++ b/src/Phalcon/Session/ManagerInterface.php
@@ -10,7 +10,6 @@
namespace Phalcon\Session;
use InvalidArgumentException;
-use RuntimeException;
use SessionHandlerInterface;
/**
diff --git a/src/Phalcon/Storage/Adapter/AbstractAdapter.php b/src/Phalcon/Storage/Adapter/AbstractAdapter.php
index a25d51be..a19ab19c 100644
--- a/src/Phalcon/Storage/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Storage/Adapter/AbstractAdapter.php
@@ -10,12 +10,9 @@
namespace Phalcon\Storage\Adapter;
use DateInterval;
-use DateTime;
-use Phalcon\Helper\Arr;
-use Phalcon\Helper\Str;
use Phalcon\Storage\Exception;
-use Phalcon\Storage\SerializerFactory;
use Phalcon\Storage\Serializer\SerializerInterface;
+use Phalcon\Storage\SerializerFactory;
/**
* This file is part of the Phalcon Framework.
diff --git a/src/Phalcon/Storage/Adapter/AdapterInterface.php b/src/Phalcon/Storage/Adapter/AdapterInterface.php
index 37c2324b..2387928a 100644
--- a/src/Phalcon/Storage/Adapter/AdapterInterface.php
+++ b/src/Phalcon/Storage/Adapter/AdapterInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Storage\Adapter;
-use Phalcon\Storage\Serializer\SerializerInterface;
-
/**
* Interface for Phalcon\Logger adapters
*/
diff --git a/src/Phalcon/Storage/Adapter/Apcu.php b/src/Phalcon/Storage/Adapter/Apcu.php
index 3f9844ba..00d9940b 100644
--- a/src/Phalcon/Storage/Adapter/Apcu.php
+++ b/src/Phalcon/Storage/Adapter/Apcu.php
@@ -9,12 +9,6 @@
*/
namespace Phalcon\Storage\Adapter;
-use APCuIterator;
-use Phalcon\Helper\Arr;
-use Phalcon\Storage\Exception;
-use Phalcon\Storage\SerializerFactory;
-use Phalcon\Storage\Serializer\SerializerInterface;
-
/**
* Apcu adapter
*/
diff --git a/src/Phalcon/Storage/Adapter/Libmemcached.php b/src/Phalcon/Storage/Adapter/Libmemcached.php
index 6e7d58fd..174214c1 100644
--- a/src/Phalcon/Storage/Adapter/Libmemcached.php
+++ b/src/Phalcon/Storage/Adapter/Libmemcached.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Storage\Adapter;
-use Phalcon\Helper\Arr;
use Phalcon\Storage\Exception;
-use Phalcon\Storage\SerializerFactory;
-use Phalcon\Storage\Serializer\SerializerInterface;
/**
* Libmemcached adapter
diff --git a/src/Phalcon/Storage/Adapter/Memory.php b/src/Phalcon/Storage/Adapter/Memory.php
index b94a9c44..99607a68 100644
--- a/src/Phalcon/Storage/Adapter/Memory.php
+++ b/src/Phalcon/Storage/Adapter/Memory.php
@@ -10,10 +10,6 @@
namespace Phalcon\Storage\Adapter;
use Phalcon\Collection;
-use Phalcon\Helper\Arr;
-use Phalcon\Storage\Exception;
-use Phalcon\Storage\SerializerFactory;
-use Phalcon\Storage\Serializer\SerializerInterface;
/**
* Memory adapter
diff --git a/src/Phalcon/Storage/Adapter/Redis.php b/src/Phalcon/Storage/Adapter/Redis.php
index 68e25fd0..5885c61e 100644
--- a/src/Phalcon/Storage/Adapter/Redis.php
+++ b/src/Phalcon/Storage/Adapter/Redis.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Storage\Adapter;
-use Phalcon\Helper\Arr;
use Phalcon\Storage\Exception;
-use Phalcon\Storage\SerializerFactory;
-use Phalcon\Storage\Serializer\SerializerInterface;
/**
* Redis adapter
diff --git a/src/Phalcon/Storage/Adapter/Stream.php b/src/Phalcon/Storage/Adapter/Stream.php
index 9abc7e46..d57b5d79 100644
--- a/src/Phalcon/Storage/Adapter/Stream.php
+++ b/src/Phalcon/Storage/Adapter/Stream.php
@@ -9,15 +9,8 @@
*/
namespace Phalcon\Storage\Adapter;
-use FilesystemIterator;
use Iterator;
-use Phalcon\Helper\Arr;
-use Phalcon\Helper\Str;
use Phalcon\Storage\Exception;
-use Phalcon\Storage\SerializerFactory;
-use Phalcon\Storage\Serializer\SerializerInterface;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
/**
* Stream adapter
diff --git a/src/Phalcon/Storage/Serializer/AbstractSerializer.php b/src/Phalcon/Storage/Serializer/AbstractSerializer.php
index af131b21..7dbe671d 100644
--- a/src/Phalcon/Storage/Serializer/AbstractSerializer.php
+++ b/src/Phalcon/Storage/Serializer/AbstractSerializer.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Storage\Serializer;
-use Phalcon\Storage\Exception;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Storage/Serializer/Base64.php b/src/Phalcon/Storage/Serializer/Base64.php
index 1e506e4e..45363d98 100644
--- a/src/Phalcon/Storage/Serializer/Base64.php
+++ b/src/Phalcon/Storage/Serializer/Base64.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Storage\Serializer;
-use InvalidArgumentException;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Storage/Serializer/Json.php b/src/Phalcon/Storage/Serializer/Json.php
index 6e148320..6695c299 100644
--- a/src/Phalcon/Storage/Serializer/Json.php
+++ b/src/Phalcon/Storage/Serializer/Json.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Storage\Serializer;
-use InvalidArgumentException;
-use JsonSerializable;
-use Phalcon\Helper\Json as JsonHelper;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Storage/Serializer/None.php b/src/Phalcon/Storage/Serializer/None.php
index 5f6931f4..141510a0 100644
--- a/src/Phalcon/Storage/Serializer/None.php
+++ b/src/Phalcon/Storage/Serializer/None.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Storage\Serializer;
-use InvalidArgumentException;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Storage/Serializer/Php.php b/src/Phalcon/Storage/Serializer/Php.php
index a606e340..40355084 100644
--- a/src/Phalcon/Storage/Serializer/Php.php
+++ b/src/Phalcon/Storage/Serializer/Php.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Storage\Serializer;
-use InvalidArgumentException;
-use Phalcon\Storage\Exception;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Storage/Serializer/SerializerInterface.php b/src/Phalcon/Storage/Serializer/SerializerInterface.php
index 0e567290..50a28a44 100644
--- a/src/Phalcon/Storage/Serializer/SerializerInterface.php
+++ b/src/Phalcon/Storage/Serializer/SerializerInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Storage\Serializer;
-use Serializable;
-
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Phalcon/Tag.php b/src/Phalcon/Tag.php
index 55543f04..c7004216 100644
--- a/src/Phalcon/Tag.php
+++ b/src/Phalcon/Tag.php
@@ -11,8 +11,6 @@
use Phalcon\Di\DiInterface;
use Phalcon\Escaper\EscaperInterface;
-use Phalcon\Tag\Select;
-use Phalcon\Tag\Exception;
use Phalcon\Url\UrlInterface;
/**
diff --git a/src/Phalcon/Tag/Select.php b/src/Phalcon/Tag/Select.php
index c73437ff..afc70182 100644
--- a/src/Phalcon/Tag/Select.php
+++ b/src/Phalcon/Tag/Select.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Tag;
-use Phalcon\Tag as BaseTag;
-use Phalcon\Escaper\EscaperInterface;
-use Phalcon\Mvc\Model\ResultsetInterface;
-
/**
* Phalcon\Tag\Select
*
diff --git a/src/Phalcon/Text.php b/src/Phalcon/Text.php
index 78975e85..38a3a944 100644
--- a/src/Phalcon/Text.php
+++ b/src/Phalcon/Text.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon;
-use Phalcon\Helper\Str;
-
/**
* Provides utilities to work with texts
*/
diff --git a/src/Phalcon/Translate/Adapter/AbstractAdapter.php b/src/Phalcon/Translate/Adapter/AbstractAdapter.php
index 8ad141e0..5c2cb5c4 100644
--- a/src/Phalcon/Translate/Adapter/AbstractAdapter.php
+++ b/src/Phalcon/Translate/Adapter/AbstractAdapter.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Translate\Adapter;
-use Phalcon\Helper\Arr;
-use Phalcon\Translate\Exception;
use Phalcon\Translate\InterpolatorFactory;
/**
diff --git a/src/Phalcon/Translate/Adapter/Csv.php b/src/Phalcon/Translate/Adapter/Csv.php
index 45b3523f..73fb0ccf 100644
--- a/src/Phalcon/Translate/Adapter/Csv.php
+++ b/src/Phalcon/Translate/Adapter/Csv.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Translate\Adapter;
-use ArrayAccess;
-use Phalcon\Translate\Exception;
-use Phalcon\Translate\InterpolatorFactory;
-
/**
* Phalcon\Translate\Adapter\Csv
*
diff --git a/src/Phalcon/Translate/Adapter/Gettext.php b/src/Phalcon/Translate/Adapter/Gettext.php
index 95ad60ca..e536a0c1 100644
--- a/src/Phalcon/Translate/Adapter/Gettext.php
+++ b/src/Phalcon/Translate/Adapter/Gettext.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Translate\Adapter;
-use ArrayAccess;
-use Phalcon\Translate\Exception;
-use Phalcon\Translate\InterpolatorFactory;
-
/**
* Phalcon\Translate\Adapter\Gettext
*
diff --git a/src/Phalcon/Translate/Adapter/NativeArray.php b/src/Phalcon/Translate/Adapter/NativeArray.php
index 08adffa8..7b35a0aa 100644
--- a/src/Phalcon/Translate/Adapter/NativeArray.php
+++ b/src/Phalcon/Translate/Adapter/NativeArray.php
@@ -9,10 +9,6 @@
*/
namespace Phalcon\Translate\Adapter;
-use ArrayAccess;
-use Phalcon\Translate\Exception;
-use Phalcon\Translate\InterpolatorFactory;
-
/**
* Phalcon\Translate\Adapter\NativeArray
*
diff --git a/src/Phalcon/Translate/TranslateFactory.php b/src/Phalcon/Translate/TranslateFactory.php
index a5f831aa..59d0c027 100644
--- a/src/Phalcon/Translate/TranslateFactory.php
+++ b/src/Phalcon/Translate/TranslateFactory.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Translate;
-use Phalcon\Config;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Helper\Arr;
use Phalcon\Translate\Adapter\AdapterInterface;
/**
diff --git a/src/Phalcon/Url.php b/src/Phalcon/Url.php
index 9d0d767e..86b152e2 100644
--- a/src/Phalcon/Url.php
+++ b/src/Phalcon/Url.php
@@ -9,11 +9,8 @@
*/
namespace Phalcon;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
use Phalcon\Mvc\RouterInterface;
-use Phalcon\Mvc\Router\RouteInterface;
-use Phalcon\Url\Exception;
use Phalcon\Url\UrlInterface;
/**
diff --git a/src/Phalcon/Validation.php b/src/Phalcon/Validation.php
index 6d8d3836..ed18b42d 100644
--- a/src/Phalcon/Validation.php
+++ b/src/Phalcon/Validation.php
@@ -9,15 +9,9 @@
*/
namespace Phalcon;
-use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
-use Phalcon\Filter\FilterInterface;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Messages\Messages;
use Phalcon\Validation\ValidationInterface;
-use Phalcon\Validation\Exception;
-use Phalcon\Validation\ValidatorInterface;
-use Phalcon\Validation\AbstractCombinedFieldsValidator;
/**
* Allows to validate data using custom or built-in validators
diff --git a/src/Phalcon/Validation/AbstractValidator.php b/src/Phalcon/Validation/AbstractValidator.php
index b27ad90b..92f00e49 100644
--- a/src/Phalcon/Validation/AbstractValidator.php
+++ b/src/Phalcon/Validation/AbstractValidator.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Validation;
-use Phalcon\Collection;
-use Phalcon\Helper\Arr;
use Phalcon\Messages\Message;
-use Phalcon\Validation;
/**
* This is a base class for validators
diff --git a/src/Phalcon/Validation/AbstractValidatorComposite.php b/src/Phalcon/Validation/AbstractValidatorComposite.php
index 667eddb5..b1180f8d 100644
--- a/src/Phalcon/Validation/AbstractValidatorComposite.php
+++ b/src/Phalcon/Validation/AbstractValidatorComposite.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation;
-use Phalcon\Validation;
-
/**
* This is a base class for combined fields validators
*/
diff --git a/src/Phalcon/Validation/ValidationInterface.php b/src/Phalcon/Validation/ValidationInterface.php
index 517fb752..d8a7caf5 100644
--- a/src/Phalcon/Validation/ValidationInterface.php
+++ b/src/Phalcon/Validation/ValidationInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation;
-use Phalcon\Di\Injectable;
-use Phalcon\Messages\MessageInterface;
use Phalcon\Messages\Messages;
/**
diff --git a/src/Phalcon/Validation/Validator/Alnum.php b/src/Phalcon/Validation/Validator/Alnum.php
index e472c230..342fdb1c 100644
--- a/src/Phalcon/Validation/Validator/Alnum.php
+++ b/src/Phalcon/Validation/Validator/Alnum.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Alpha.php b/src/Phalcon/Validation/Validator/Alpha.php
index 2a6d2cd1..8459a1e4 100644
--- a/src/Phalcon/Validation/Validator/Alpha.php
+++ b/src/Phalcon/Validation/Validator/Alpha.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Between.php b/src/Phalcon/Validation/Validator/Between.php
index a8a68798..5582b835 100644
--- a/src/Phalcon/Validation/Validator/Between.php
+++ b/src/Phalcon/Validation/Validator/Between.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Callback.php b/src/Phalcon/Validation/Validator/Callback.php
index 597f4119..6bbe556a 100644
--- a/src/Phalcon/Validation/Validator/Callback.php
+++ b/src/Phalcon/Validation/Validator/Callback.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
-use Phalcon\Validation\ValidatorInterface;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Confirmation.php b/src/Phalcon/Validation/Validator/Confirmation.php
index 14b05359..33e22044 100644
--- a/src/Phalcon/Validation/Validator/Confirmation.php
+++ b/src/Phalcon/Validation/Validator/Confirmation.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
-use Phalcon\Validation\Exception;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/CreditCard.php b/src/Phalcon/Validation/Validator/CreditCard.php
index d29f587e..17c60812 100644
--- a/src/Phalcon/Validation/Validator/CreditCard.php
+++ b/src/Phalcon/Validation/Validator/CreditCard.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Date.php b/src/Phalcon/Validation/Validator/Date.php
index b9bc3a08..43d15351 100644
--- a/src/Phalcon/Validation/Validator/Date.php
+++ b/src/Phalcon/Validation/Validator/Date.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use DateTime;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Digit.php b/src/Phalcon/Validation/Validator/Digit.php
index 901d23a5..56873037 100644
--- a/src/Phalcon/Validation/Validator/Digit.php
+++ b/src/Phalcon/Validation/Validator/Digit.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Email.php b/src/Phalcon/Validation/Validator/Email.php
index 0726c88f..dde2b525 100644
--- a/src/Phalcon/Validation/Validator/Email.php
+++ b/src/Phalcon/Validation/Validator/Email.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/ExclusionIn.php b/src/Phalcon/Validation/Validator/ExclusionIn.php
index 83c1fc9f..0ff1673c 100644
--- a/src/Phalcon/Validation/Validator/ExclusionIn.php
+++ b/src/Phalcon/Validation/Validator/ExclusionIn.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
-use Phalcon\Validation\Exception;
/**
* Check if a value is not included into a list of values
diff --git a/src/Phalcon/Validation/Validator/File.php b/src/Phalcon/Validation/Validator/File.php
index db50a308..94b54a6b 100644
--- a/src/Phalcon/Validation/Validator/File.php
+++ b/src/Phalcon/Validation/Validator/File.php
@@ -9,17 +9,7 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Helper\Arr;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidatorComposite;
-use Phalcon\Validation\Validator\File\MimeType;
-use Phalcon\Validation\Validator\File\Resolution\Equal as EqualResolution;
-use Phalcon\Validation\Validator\File\Resolution\Max as MaxResolution;
-use Phalcon\Validation\Validator\File\Resolution\Min as MinResolution;
-use Phalcon\Validation\Validator\File\Size\Equal as EqualFileSize;
-use Phalcon\Validation\Validator\File\Size\Max as MaxFileSize;
-use Phalcon\Validation\Validator\File\Size\Min as MinFileSize;
/**
* Checks if a value has a correct file
diff --git a/src/Phalcon/Validation/Validator/File/AbstractFile.php b/src/Phalcon/Validation/Validator/File/AbstractFile.php
index e9108c55..849cd591 100644
--- a/src/Phalcon/Validation/Validator/File/AbstractFile.php
+++ b/src/Phalcon/Validation/Validator/File/AbstractFile.php
@@ -9,7 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File;
-use Phalcon\Messages\Message;
use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
diff --git a/src/Phalcon/Validation/Validator/File/MimeType.php b/src/Phalcon/Validation/Validator/File/MimeType.php
index 60cb7c75..443c35bd 100644
--- a/src/Phalcon/Validation/Validator/File/MimeType.php
+++ b/src/Phalcon/Validation/Validator/File/MimeType.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Validation\Validator\File;
-use Phalcon\Messages\Message;
use Phalcon\Validation;
-use Phalcon\Validation\Exception;
/**
* Checks if a value has a correct file mime type
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
index afd76049..fdd9bd33 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File\Resolution;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\Validator\File\AbstractFile;
/**
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Max.php b/src/Phalcon/Validation/Validator/File/Resolution/Max.php
index aa3fb6b4..eac298ab 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Max.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Max.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File\Resolution;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\Validator\File\AbstractFile;
/**
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Min.php b/src/Phalcon/Validation/Validator/File/Resolution/Min.php
index c798e93a..0866f57e 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Min.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Min.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File\Resolution;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\Validator\File\AbstractFile;
/**
diff --git a/src/Phalcon/Validation/Validator/File/Size/Equal.php b/src/Phalcon/Validation/Validator/File/Size/Equal.php
index d9540a66..d1c56a84 100644
--- a/src/Phalcon/Validation/Validator/File/Size/Equal.php
+++ b/src/Phalcon/Validation/Validator/File/Size/Equal.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File\Size;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\Validator\File\AbstractFile;
/**
diff --git a/src/Phalcon/Validation/Validator/File/Size/Max.php b/src/Phalcon/Validation/Validator/File/Size/Max.php
index 88789e0c..0ea7f76e 100644
--- a/src/Phalcon/Validation/Validator/File/Size/Max.php
+++ b/src/Phalcon/Validation/Validator/File/Size/Max.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File\Size;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\Validator\File\AbstractFile;
/**
diff --git a/src/Phalcon/Validation/Validator/File/Size/Min.php b/src/Phalcon/Validation/Validator/File/Size/Min.php
index 177b6f0b..69ea086a 100644
--- a/src/Phalcon/Validation/Validator/File/Size/Min.php
+++ b/src/Phalcon/Validation/Validator/File/Size/Min.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator\File\Size;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\Validator\File\AbstractFile;
/**
diff --git a/src/Phalcon/Validation/Validator/Identical.php b/src/Phalcon/Validation/Validator/Identical.php
index c0ce1863..62828f50 100644
--- a/src/Phalcon/Validation/Validator/Identical.php
+++ b/src/Phalcon/Validation/Validator/Identical.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/InclusionIn.php b/src/Phalcon/Validation/Validator/InclusionIn.php
index b10ac528..5ee64b88 100644
--- a/src/Phalcon/Validation/Validator/InclusionIn.php
+++ b/src/Phalcon/Validation/Validator/InclusionIn.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
-use Phalcon\Validation\Exception;
/**
* Check if a value is included into a list of values
diff --git a/src/Phalcon/Validation/Validator/Ip.php b/src/Phalcon/Validation/Validator/Ip.php
index 510937ac..9949603b 100644
--- a/src/Phalcon/Validation/Validator/Ip.php
+++ b/src/Phalcon/Validation/Validator/Ip.php
@@ -9,9 +9,7 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
-use Phalcon\Messages\Message;
/**
* Check for IP addresses
diff --git a/src/Phalcon/Validation/Validator/Numericality.php b/src/Phalcon/Validation/Validator/Numericality.php
index 0dbffa5e..a797a62e 100644
--- a/src/Phalcon/Validation/Validator/Numericality.php
+++ b/src/Phalcon/Validation/Validator/Numericality.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/PresenceOf.php b/src/Phalcon/Validation/Validator/PresenceOf.php
index 86fee665..1d81446e 100644
--- a/src/Phalcon/Validation/Validator/PresenceOf.php
+++ b/src/Phalcon/Validation/Validator/PresenceOf.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/Regex.php b/src/Phalcon/Validation/Validator/Regex.php
index 20c406ea..69181504 100644
--- a/src/Phalcon/Validation/Validator/Regex.php
+++ b/src/Phalcon/Validation/Validator/Regex.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/Validator/StringLength.php b/src/Phalcon/Validation/Validator/StringLength.php
index 438ce622..761ad171 100644
--- a/src/Phalcon/Validation/Validator/StringLength.php
+++ b/src/Phalcon/Validation/Validator/StringLength.php
@@ -9,12 +9,7 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation\AbstractValidator;
use Phalcon\Validation\AbstractValidatorComposite;
-use Phalcon\Validation\Validator\StringLength\Max;
-use Phalcon\Validation\Validator\StringLength\Min;
-use Phalcon\Validation\Exception;
/**
* Validates that a string has the specified maximum and minimum constraints
diff --git a/src/Phalcon/Validation/Validator/StringLength/Max.php b/src/Phalcon/Validation/Validator/StringLength/Max.php
index 496c4100..9735456e 100644
--- a/src/Phalcon/Validation/Validator/StringLength/Max.php
+++ b/src/Phalcon/Validation/Validator/StringLength/Max.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Validation\Validator\StringLength;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
-use Phalcon\Validation\Exception;
/**
* Validates that a string has the specified maximum constraints
diff --git a/src/Phalcon/Validation/Validator/StringLength/Min.php b/src/Phalcon/Validation/Validator/StringLength/Min.php
index 3e61bb04..236c4927 100644
--- a/src/Phalcon/Validation/Validator/StringLength/Min.php
+++ b/src/Phalcon/Validation/Validator/StringLength/Min.php
@@ -9,10 +9,7 @@
*/
namespace Phalcon\Validation\Validator\StringLength;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
-use Phalcon\Validation\Exception;
/**
* Validates that a string has the specified minimum constraints
diff --git a/src/Phalcon/Validation/Validator/Uniqueness.php b/src/Phalcon/Validation/Validator/Uniqueness.php
index 48caa76d..a01760e7 100644
--- a/src/Phalcon/Validation/Validator/Uniqueness.php
+++ b/src/Phalcon/Validation/Validator/Uniqueness.php
@@ -9,12 +9,7 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Mvc\Model;
-use Phalcon\Mvc\ModelInterface;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractCombinedFieldsValidator;
-use Phalcon\Validation\Exception;
/**
* Check that a field is unique in the related table
diff --git a/src/Phalcon/Validation/Validator/Url.php b/src/Phalcon/Validation/Validator/Url.php
index 68ee2633..9a1c3745 100644
--- a/src/Phalcon/Validation/Validator/Url.php
+++ b/src/Phalcon/Validation/Validator/Url.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation\Validator;
-use Phalcon\Messages\Message;
-use Phalcon\Validation;
use Phalcon\Validation\AbstractValidator;
/**
diff --git a/src/Phalcon/Validation/ValidatorCompositeInterface.php b/src/Phalcon/Validation/ValidatorCompositeInterface.php
index 9d1335de..cb532dfc 100644
--- a/src/Phalcon/Validation/ValidatorCompositeInterface.php
+++ b/src/Phalcon/Validation/ValidatorCompositeInterface.php
@@ -9,8 +9,6 @@
*/
namespace Phalcon\Validation;
-use Phalcon\Validation;
-
/**
* This is a base class for combined fields validators
*/
diff --git a/src/Phalcon/Validation/ValidatorFactory.php b/src/Phalcon/Validation/ValidatorFactory.php
index e19a54d1..154d67d5 100644
--- a/src/Phalcon/Validation/ValidatorFactory.php
+++ b/src/Phalcon/Validation/ValidatorFactory.php
@@ -10,8 +10,6 @@
namespace Phalcon\Validation;
use Phalcon\Factory\AbstractFactory;
-use Phalcon\Factory\ValidatorInterface;
-use Phalcon\Helper\Arr;
/**
* This file is part of the Phalcon Framework.
diff --git a/src/Phalcon/Validation/ValidatorInterface.php b/src/Phalcon/Validation/ValidatorInterface.php
index 25e113c2..2019197f 100644
--- a/src/Phalcon/Validation/ValidatorInterface.php
+++ b/src/Phalcon/Validation/ValidatorInterface.php
@@ -9,9 +9,6 @@
*/
namespace Phalcon\Validation;
-use Phalcon\Collection;
-use Phalcon\Validation;
-
/**
* Interface for Phalcon\Validation\AbstractValidator
*/