From e61310c2f5c2c2d6af2cd339a8d70ff42c4b11cb Mon Sep 17 00:00:00 2001 From: Ruud Boon Date: Sun, 12 Jan 2020 07:40:07 +0100 Subject: [PATCH 1/2] Bumbed stubs to latest Phalcon --- src/Phalcon/Acl/Adapter/AbstractAdapter.php | 6 +- src/Phalcon/Acl/Adapter/AdapterInterface.php | 4 +- src/Phalcon/Acl/Adapter/Memory.php | 6 +- src/Phalcon/Acl/Component.php | 2 +- src/Phalcon/Acl/Role.php | 2 +- .../Annotations/Adapter/AbstractAdapter.php | 6 +- .../Annotations/Adapter/AdapterInterface.php | 4 +- src/Phalcon/Annotations/Adapter/Apcu.php | 6 +- src/Phalcon/Annotations/Adapter/Memory.php | 6 +- src/Phalcon/Annotations/Adapter/Stream.php | 6 +- .../Annotations/AnnotationsFactory.php | 3 +- src/Phalcon/Annotations/Collection.php | 2 +- src/Phalcon/Annotations/Reader.php | 2 +- .../Application/AbstractApplication.php | 10 +- src/Phalcon/Assets/Asset.php | 2 +- src/Phalcon/Assets/Asset/Css.php | 2 +- src/Phalcon/Assets/Asset/Js.php | 2 +- src/Phalcon/Assets/Collection.php | 2 +- src/Phalcon/Assets/Filters/Cssmin.php | 2 +- src/Phalcon/Assets/Filters/Jsmin.php | 2 +- src/Phalcon/Assets/Filters/None.php | 2 +- src/Phalcon/Assets/Inline.php | 2 +- src/Phalcon/Assets/Inline/Css.php | 2 +- src/Phalcon/Assets/Inline/Js.php | 2 +- src/Phalcon/Cache.php | 9 +- src/Phalcon/Cache/Adapter/Apcu.php | 2 +- src/Phalcon/Cache/Adapter/Libmemcached.php | 2 +- src/Phalcon/Cache/Adapter/Memory.php | 2 +- src/Phalcon/Cache/Adapter/Redis.php | 2 +- src/Phalcon/Cache/Adapter/Stream.php | 2 +- src/Phalcon/Cache/AdapterFactory.php | 4 +- src/Phalcon/Cache/CacheFactory.php | 2 +- src/Phalcon/Cache/Exception/Exception.php | 4 +- src/Phalcon/Cli/Dispatcher.php | 2 +- src/Phalcon/Cli/Router.php | 2 +- src/Phalcon/Cli/Router/Route.php | 2 +- src/Phalcon/Cli/RouterInterface.php | 2 +- src/Phalcon/Cli/Task.php | 6 +- src/Phalcon/Collection.php | 2 +- src/Phalcon/Collection/Exception.php | 2 +- src/Phalcon/Config/Adapter/Json.php | 1 + src/Phalcon/Config/ConfigFactory.php | 2 +- src/Phalcon/Container.php | 6 +- src/Phalcon/Crypt.php | 6 +- src/Phalcon/Crypt/Mismatch.php | 2 +- src/Phalcon/Db/Adapter/AbstractAdapter.php | 40 ++--- src/Phalcon/Db/Adapter/AdapterInterface.php | 37 ++-- src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php | 21 +-- src/Phalcon/Db/Adapter/Pdo/Mysql.php | 12 +- src/Phalcon/Db/Adapter/Pdo/Postgresql.php | 12 +- src/Phalcon/Db/Adapter/Pdo/Sqlite.php | 8 +- src/Phalcon/Db/Adapter/PdoFactory.php | 3 +- src/Phalcon/Db/Column.php | 2 +- src/Phalcon/Db/Dialect.php | 2 +- src/Phalcon/Db/Dialect/Mysql.php | 34 ++-- src/Phalcon/Db/Dialect/Postgresql.php | 30 ++-- src/Phalcon/Db/Dialect/Sqlite.php | 26 +-- src/Phalcon/Db/Index.php | 2 +- src/Phalcon/Db/Profiler.php | 4 +- src/Phalcon/Db/Reference.php | 2 +- src/Phalcon/Db/Result/Pdo.php | 15 +- src/Phalcon/Db/ResultInterface.php | 6 +- src/Phalcon/Di.php | 20 +-- src/Phalcon/Di/AbstractInjectionAware.php | 2 +- src/Phalcon/Di/DiInterface.php | 2 +- .../Exception/ServiceResolutionException.php | 4 +- src/Phalcon/Di/FactoryDefault.php | 3 +- src/Phalcon/Di/Injectable.php | 74 +++----- src/Phalcon/Di/Service.php | 2 +- src/Phalcon/Di/Service/Builder.php | 16 +- src/Phalcon/Dispatcher/AbstractDispatcher.php | 12 +- src/Phalcon/Domain/Payload/Payload.php | 4 +- .../Domain/Payload/PayloadInterface.php | 2 +- .../Domain/Payload/WriteableInterface.php | 2 +- src/Phalcon/Escaper.php | 2 +- src/Phalcon/Events/Event.php | 2 +- src/Phalcon/Events/Manager.php | 8 +- src/Phalcon/Exception.php | 4 +- src/Phalcon/Filter.php | 2 +- src/Phalcon/Flash/AbstractFlash.php | 12 +- src/Phalcon/Flash/Direct.php | 2 +- src/Phalcon/Flash/Session.php | 2 +- src/Phalcon/Forms/Element/AbstractElement.php | 24 +-- src/Phalcon/Forms/Element/Check.php | 2 +- src/Phalcon/Forms/Element/Date.php | 2 +- .../Forms/Element/ElementInterface.php | 22 +-- src/Phalcon/Forms/Element/Email.php | 2 +- src/Phalcon/Forms/Element/File.php | 2 +- src/Phalcon/Forms/Element/Hidden.php | 2 +- src/Phalcon/Forms/Element/Numeric.php | 2 +- src/Phalcon/Forms/Element/Password.php | 2 +- src/Phalcon/Forms/Element/Radio.php | 2 +- src/Phalcon/Forms/Element/Select.php | 2 +- src/Phalcon/Forms/Element/Submit.php | 2 +- src/Phalcon/Forms/Element/Text.php | 2 +- src/Phalcon/Forms/Element/TextArea.php | 2 +- src/Phalcon/Forms/Form.php | 12 +- src/Phalcon/Helper/Json.php | 4 +- src/Phalcon/Html/Attributes.php | 2 +- .../Html/Attributes/AttributesInterface.php | 4 +- src/Phalcon/Html/Helper/AbstractHelper.php | 4 +- src/Phalcon/Html/Helper/Anchor.php | 2 +- src/Phalcon/Html/Helper/AnchorRaw.php | 2 +- src/Phalcon/Html/Helper/Body.php | 2 +- src/Phalcon/Html/Helper/Button.php | 2 +- src/Phalcon/Html/Helper/Close.php | 2 +- src/Phalcon/Html/Helper/Element.php | 2 +- src/Phalcon/Html/Helper/ElementRaw.php | 2 +- src/Phalcon/Html/Helper/Form.php | 2 +- src/Phalcon/Html/Helper/Img.php | 2 +- src/Phalcon/Html/Helper/Label.php | 2 +- src/Phalcon/Html/Helper/TextArea.php | 2 +- src/Phalcon/Html/Link/EvolvableLink.php | 2 +- .../Html/Link/EvolvableLinkProvider.php | 6 +- src/Phalcon/Html/Link/Link.php | 2 +- src/Phalcon/Html/Link/LinkProvider.php | 7 +- src/Phalcon/Html/Link/Serializer/Header.php | 2 +- src/Phalcon/Html/TagFactory.php | 4 +- src/Phalcon/Http/Cookie.php | 9 +- src/Phalcon/Http/Message/AbstractMessage.php | 8 +- src/Phalcon/Http/Message/AbstractRequest.php | 4 +- .../Exception/InvalidArgumentException.php | 2 +- src/Phalcon/Http/Message/Request.php | 2 +- src/Phalcon/Http/Message/RequestFactory.php | 2 +- src/Phalcon/Http/Message/Response.php | 2 +- src/Phalcon/Http/Message/ResponseFactory.php | 2 +- src/Phalcon/Http/Message/ServerRequest.php | 2 +- .../Http/Message/ServerRequestFactory.php | 18 +- src/Phalcon/Http/Message/Stream.php | 2 +- src/Phalcon/Http/Message/StreamFactory.php | 2 +- src/Phalcon/Http/Message/UploadedFile.php | 2 +- .../Http/Message/UploadedFileFactory.php | 7 +- src/Phalcon/Http/Message/Uri.php | 2 +- src/Phalcon/Http/Message/UriFactory.php | 2 +- src/Phalcon/Http/Request.php | 4 +- src/Phalcon/Http/Request/File.php | 2 +- src/Phalcon/Http/RequestInterface.php | 2 +- src/Phalcon/Http/Response.php | 26 +-- src/Phalcon/Http/Response/Cookies.php | 2 +- src/Phalcon/Http/Response/Headers.php | 2 +- src/Phalcon/Http/ResponseInterface.php | 4 +- .../Http/Server/AbstractMiddleware.php | 8 +- .../Http/Server/AbstractRequestHandler.php | 6 +- src/Phalcon/Image/Adapter/AbstractAdapter.php | 2 +- src/Phalcon/Image/Adapter/Gd.php | 2 +- src/Phalcon/Image/Adapter/Imagick.php | 2 +- src/Phalcon/Image/ImageFactory.php | 2 +- src/Phalcon/Loader.php | 6 +- src/Phalcon/Logger.php | 4 +- .../Logger/Adapter/AbstractAdapter.php | 14 +- .../Logger/Adapter/AdapterInterface.php | 12 +- src/Phalcon/Logger/Adapter/Noop.php | 6 +- src/Phalcon/Logger/Adapter/Stream.php | 6 +- src/Phalcon/Logger/Adapter/Syslog.php | 6 +- .../Logger/Formatter/AbstractFormatter.php | 41 ++++- .../Logger/Formatter/FormatterInterface.php | 4 +- src/Phalcon/Logger/Formatter/Json.php | 32 +--- src/Phalcon/Logger/Formatter/Line.php | 32 +--- src/Phalcon/Logger/Item.php | 1 + src/Phalcon/Logger/LoggerFactory.php | 2 +- src/Phalcon/Messages/Message.php | 2 +- src/Phalcon/Messages/Messages.php | 8 +- src/Phalcon/Mvc/Controller.php | 2 +- src/Phalcon/Mvc/Dispatcher.php | 2 +- src/Phalcon/Mvc/Micro.php | 22 +-- src/Phalcon/Mvc/Micro/Collection.php | 2 +- src/Phalcon/Mvc/Micro/LazyLoader.php | 6 +- src/Phalcon/Mvc/Micro/MiddlewareInterface.php | 4 +- src/Phalcon/Mvc/Model.php | 78 ++++---- src/Phalcon/Mvc/Model/Behavior.php | 10 +- src/Phalcon/Mvc/Model/Behavior/SoftDelete.php | 4 +- .../Mvc/Model/Behavior/Timestampable.php | 4 +- src/Phalcon/Mvc/Model/BehaviorInterface.php | 8 +- src/Phalcon/Mvc/Model/Binder.php | 10 +- src/Phalcon/Mvc/Model/BinderInterface.php | 4 +- src/Phalcon/Mvc/Model/Criteria.php | 10 +- src/Phalcon/Mvc/Model/Manager.php | 170 +++++++++--------- src/Phalcon/Mvc/Model/ManagerInterface.php | 138 +++++++------- src/Phalcon/Mvc/Model/MetaData.php | 106 +++++------ src/Phalcon/Mvc/Model/MetaData/Apcu.php | 4 +- .../Mvc/Model/MetaData/Libmemcached.php | 4 +- src/Phalcon/Mvc/Model/MetaData/Redis.php | 4 +- .../Model/MetaData/Strategy/Annotations.php | 14 +- .../Model/MetaData/Strategy/Introspection.php | 14 +- .../MetaData/Strategy/StrategyInterface.php | 14 +- src/Phalcon/Mvc/Model/MetaDataInterface.php | 96 +++++----- src/Phalcon/Mvc/Model/Query.php | 22 +-- src/Phalcon/Mvc/Model/Query/Builder.php | 10 +- src/Phalcon/Mvc/Model/Query/Status.php | 8 +- .../Mvc/Model/Query/StatusInterface.php | 2 +- src/Phalcon/Mvc/Model/Relation.php | 2 +- src/Phalcon/Mvc/Model/Resultset.php | 20 +-- src/Phalcon/Mvc/Model/Resultset/Complex.php | 8 +- src/Phalcon/Mvc/Model/Resultset/Simple.php | 7 +- src/Phalcon/Mvc/Model/ResultsetInterface.php | 12 +- src/Phalcon/Mvc/Model/Row.php | 4 +- src/Phalcon/Mvc/Model/Transaction.php | 21 ++- src/Phalcon/Mvc/Model/Transaction/Failed.php | 8 +- src/Phalcon/Mvc/Model/Transaction/Manager.php | 22 +-- .../Model/Transaction/ManagerInterface.php | 8 +- .../Mvc/Model/TransactionInterface.php | 17 +- src/Phalcon/Mvc/Model/ValidationFailed.php | 6 +- src/Phalcon/Mvc/ModelInterface.php | 21 ++- src/Phalcon/Mvc/ModuleDefinitionInterface.php | 8 +- src/Phalcon/Mvc/Router.php | 16 +- src/Phalcon/Mvc/Router/Annotations.php | 8 +- src/Phalcon/Mvc/Router/Group.php | 2 +- src/Phalcon/Mvc/Router/Route.php | 2 +- src/Phalcon/Mvc/RouterInterface.php | 10 +- src/Phalcon/Mvc/View.php | 6 +- .../Mvc/View/Engine/AbstractEngine.php | 8 +- src/Phalcon/Mvc/View/Engine/Php.php | 2 +- src/Phalcon/Mvc/View/Engine/Volt.php | 6 +- src/Phalcon/Mvc/View/Engine/Volt/Compiler.php | 10 +- .../Mvc/View/Engine/Volt/Exception.php | 2 +- src/Phalcon/Mvc/View/Simple.php | 6 +- src/Phalcon/Mvc/ViewInterface.php | 2 +- .../Paginator/Adapter/AbstractAdapter.php | 6 +- src/Phalcon/Paginator/Adapter/Model.php | 2 +- src/Phalcon/Paginator/Adapter/NativeArray.php | 2 +- .../Paginator/Adapter/QueryBuilder.php | 6 +- src/Phalcon/Paginator/PaginatorFactory.php | 5 +- src/Phalcon/Paginator/Repository.php | 2 +- src/Phalcon/Registry.php | 2 +- src/Phalcon/Security.php | 6 +- .../Session/Adapter/AbstractAdapter.php | 2 +- src/Phalcon/Session/Adapter/Libmemcached.php | 6 +- src/Phalcon/Session/Adapter/Noop.php | 2 +- src/Phalcon/Session/Adapter/Redis.php | 6 +- src/Phalcon/Session/Adapter/Stream.php | 2 +- src/Phalcon/Session/Bag.php | 6 +- src/Phalcon/Session/Manager.php | 6 +- src/Phalcon/Session/ManagerInterface.php | 4 +- .../Storage/Adapter/AbstractAdapter.php | 6 +- src/Phalcon/Storage/Adapter/Apcu.php | 6 +- src/Phalcon/Storage/Adapter/Libmemcached.php | 13 +- src/Phalcon/Storage/Adapter/Memory.php | 6 +- src/Phalcon/Storage/Adapter/Redis.php | 6 +- src/Phalcon/Storage/Adapter/Stream.php | 6 +- .../Storage/Serializer/AbstractSerializer.php | 2 +- src/Phalcon/Storage/Serializer/Base64.php | 2 +- src/Phalcon/Storage/Serializer/Igbinary.php | 2 +- src/Phalcon/Storage/Serializer/Json.php | 3 +- src/Phalcon/Storage/Serializer/Msgpack.php | 2 +- src/Phalcon/Storage/Serializer/None.php | 2 +- src/Phalcon/Storage/Serializer/Php.php | 2 +- .../Serializer/SerializerInterface.php | 2 +- src/Phalcon/Tag.php | 4 +- src/Phalcon/Tag/Select.php | 4 +- .../Translate/Adapter/AbstractAdapter.php | 6 +- src/Phalcon/Translate/Adapter/Csv.php | 6 +- src/Phalcon/Translate/Adapter/Gettext.php | 6 +- src/Phalcon/Translate/Adapter/NativeArray.php | 6 +- .../Interpolator/AssociativeArray.php | 2 +- .../Translate/Interpolator/IndexedArray.php | 2 +- src/Phalcon/Translate/TranslateFactory.php | 4 +- src/Phalcon/Url.php | 6 +- src/Phalcon/Validation.php | 18 +- .../AbstractCombinedFieldsValidator.php | 2 +- src/Phalcon/Validation/AbstractValidator.php | 20 +-- .../Validation/AbstractValidatorComposite.php | 6 +- .../Validation/ValidationInterface.php | 4 +- src/Phalcon/Validation/Validator/Alnum.php | 4 +- src/Phalcon/Validation/Validator/Alpha.php | 4 +- src/Phalcon/Validation/Validator/Between.php | 4 +- src/Phalcon/Validation/Validator/Callback.php | 4 +- .../Validation/Validator/Confirmation.php | 4 +- .../Validation/Validator/CreditCard.php | 4 +- src/Phalcon/Validation/Validator/Date.php | 4 +- src/Phalcon/Validation/Validator/Digit.php | 4 +- src/Phalcon/Validation/Validator/Email.php | 4 +- .../Validation/Validator/ExclusionIn.php | 4 +- .../Validator/File/AbstractFile.php | 10 +- .../Validation/Validator/File/MimeType.php | 4 +- .../Validator/File/Resolution/Equal.php | 4 +- .../Validator/File/Resolution/Max.php | 4 +- .../Validator/File/Resolution/Min.php | 4 +- .../Validation/Validator/File/Size/Equal.php | 4 +- .../Validation/Validator/File/Size/Max.php | 4 +- .../Validation/Validator/File/Size/Min.php | 4 +- .../Validation/Validator/Identical.php | 4 +- .../Validation/Validator/InclusionIn.php | 4 +- src/Phalcon/Validation/Validator/Ip.php | 4 +- .../Validation/Validator/Numericality.php | 4 +- .../Validation/Validator/PresenceOf.php | 4 +- src/Phalcon/Validation/Validator/Regex.php | 4 +- .../Validation/Validator/StringLength/Max.php | 4 +- .../Validation/Validator/StringLength/Min.php | 4 +- .../Validation/Validator/Uniqueness.php | 8 +- src/Phalcon/Validation/Validator/Url.php | 4 +- .../ValidatorCompositeInterface.php | 4 +- src/Phalcon/Validation/ValidatorInterface.php | 6 +- 292 files changed, 1170 insertions(+), 1230 deletions(-) diff --git a/src/Phalcon/Acl/Adapter/AbstractAdapter.php b/src/Phalcon/Acl/Adapter/AbstractAdapter.php index 6c11e916..72deaa2c 100644 --- a/src/Phalcon/Acl/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Acl/Adapter/AbstractAdapter.php @@ -15,7 +15,7 @@ /** * Adapter for Phalcon\Acl adapters */ -abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface +abstract class AbstractAdapter implements \Phalcon\Acl\Adapter\AdapterInterface, \Phalcon\Events\EventsAwareInterface { /** * Active access which the list is checking if some role can access it @@ -121,10 +121,10 @@ public function setDefaultAction(int $defaultAccess) /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } } diff --git a/src/Phalcon/Acl/Adapter/AdapterInterface.php b/src/Phalcon/Acl/Adapter/AdapterInterface.php index 8197d508..994dab75 100644 --- a/src/Phalcon/Acl/Adapter/AdapterInterface.php +++ b/src/Phalcon/Acl/Adapter/AdapterInterface.php @@ -130,14 +130,14 @@ public function getNoArgumentsDefaultAction(): int; /** * Return an array with every role registered in the list * - * @return array|RoleInterface[] + * @return array|\Phalcon\Acl\RoleInterface[] */ public function getRoles(): array; /** * Return an array with every component registered in the list * - * @return array|ComponentInterface[] + * @return array|\Phalcon\Acl\ComponentInterface[] */ public function getComponents(): array; diff --git a/src/Phalcon/Acl/Adapter/Memory.php b/src/Phalcon/Acl/Adapter/Memory.php index ed76a85a..ff209094 100644 --- a/src/Phalcon/Acl/Adapter/Memory.php +++ b/src/Phalcon/Acl/Adapter/Memory.php @@ -83,7 +83,7 @@ * } * ``` */ -class Memory extends AbstractAdapter +class Memory extends \Phalcon\Acl\Adapter\AbstractAdapter { /** * Access @@ -371,7 +371,7 @@ public function getNoArgumentsDefaultAction(): int /** * Return an array with every role registered in the list * - * @return array|RoleInterface[] + * @return array|\Phalcon\Acl\RoleInterface[] */ public function getRoles(): array { @@ -380,7 +380,7 @@ public function getRoles(): array /** * Return an array with every component registered in the list * - * @return array|ComponentInterface[] + * @return array|\Phalcon\Acl\ComponentInterface[] */ public function getComponents(): array { diff --git a/src/Phalcon/Acl/Component.php b/src/Phalcon/Acl/Component.php index ea46a65a..3de82caf 100644 --- a/src/Phalcon/Acl/Component.php +++ b/src/Phalcon/Acl/Component.php @@ -12,7 +12,7 @@ /** * This class defines component entity and its description */ -class Component implements ComponentInterface +class Component implements \Phalcon\Acl\ComponentInterface { /** * Component description diff --git a/src/Phalcon/Acl/Role.php b/src/Phalcon/Acl/Role.php index 1b69208b..0618f41a 100644 --- a/src/Phalcon/Acl/Role.php +++ b/src/Phalcon/Acl/Role.php @@ -12,7 +12,7 @@ /** * This class defines role entity and its description */ -class Role implements RoleInterface +class Role implements \Phalcon\Acl\RoleInterface { /** * Role name diff --git a/src/Phalcon/Annotations/Adapter/AbstractAdapter.php b/src/Phalcon/Annotations/Adapter/AbstractAdapter.php index bc523ea2..4c61654b 100644 --- a/src/Phalcon/Annotations/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Annotations/Adapter/AbstractAdapter.php @@ -18,7 +18,7 @@ /** * This is the base class for Phalcon\Annotations adapters */ -abstract class AbstractAdapter implements AdapterInterface +abstract class AbstractAdapter implements \Phalcon\Annotations\Adapter\AdapterInterface { /** * @var array @@ -95,9 +95,9 @@ public function getReader(): ReaderInterface /** * Sets the annotations parser * - * @param ReaderInterface $reader + * @param \Phalcon\Annotations\ReaderInterface $reader */ - public function setReader(ReaderInterface $reader) + public function setReader(\Phalcon\Annotations\ReaderInterface $reader) { } } diff --git a/src/Phalcon/Annotations/Adapter/AdapterInterface.php b/src/Phalcon/Annotations/Adapter/AdapterInterface.php index 139297fd..60587208 100644 --- a/src/Phalcon/Annotations/Adapter/AdapterInterface.php +++ b/src/Phalcon/Annotations/Adapter/AdapterInterface.php @@ -71,7 +71,7 @@ public function getReader(): ReaderInterface; /** * Sets the annotations parser * - * @param ReaderInterface $reader + * @param \Phalcon\Annotations\ReaderInterface $reader */ - public function setReader(ReaderInterface $reader); + public function setReader(\Phalcon\Annotations\ReaderInterface $reader); } diff --git a/src/Phalcon/Annotations/Adapter/Apcu.php b/src/Phalcon/Annotations/Adapter/Apcu.php index 3d47fd6a..27d2c906 100644 --- a/src/Phalcon/Annotations/Adapter/Apcu.php +++ b/src/Phalcon/Annotations/Adapter/Apcu.php @@ -20,7 +20,7 @@ * $annotations = new Apcu(); * ``` */ -class Apcu extends AbstractAdapter +class Apcu extends \Phalcon\Annotations\Adapter\AbstractAdapter { /** * @var string @@ -59,10 +59,10 @@ public function read(string $key) * Writes parsed annotations to APCu * * @param string $key - * @param Reflection $data + * @param \Phalcon\Annotations\Reflection $data * @return bool */ - public function write(string $key, Reflection $data): bool + public function write(string $key, \Phalcon\Annotations\Reflection $data): bool { } } diff --git a/src/Phalcon/Annotations/Adapter/Memory.php b/src/Phalcon/Annotations/Adapter/Memory.php index 063679a3..a31b012b 100644 --- a/src/Phalcon/Annotations/Adapter/Memory.php +++ b/src/Phalcon/Annotations/Adapter/Memory.php @@ -15,7 +15,7 @@ * Stores the parsed annotations in memory. This adapter is the suitable * development/testing */ -class Memory extends AbstractAdapter +class Memory extends \Phalcon\Annotations\Adapter\AbstractAdapter { /** * @var mixed @@ -37,10 +37,10 @@ public function read(string $key) * Writes parsed annotations to memory * * @param string $key - * @param Reflection $data + * @param \Phalcon\Annotations\Reflection $data * @return void */ - public function write(string $key, Reflection $data) + public function write(string $key, \Phalcon\Annotations\Reflection $data) { } } diff --git a/src/Phalcon/Annotations/Adapter/Stream.php b/src/Phalcon/Annotations/Adapter/Stream.php index a8bd147e..fdae0ea2 100644 --- a/src/Phalcon/Annotations/Adapter/Stream.php +++ b/src/Phalcon/Annotations/Adapter/Stream.php @@ -26,7 +26,7 @@ * ); * ``` */ -class Stream extends AbstractAdapter +class Stream extends \Phalcon\Annotations\Adapter\AbstractAdapter { /** * @var string @@ -59,10 +59,10 @@ public function read(string $key) * Writes parsed annotations to files * * @param string $key - * @param Reflection $data + * @param \Phalcon\Annotations\Reflection $data * @return void */ - public function write(string $key, Reflection $data) + public function write(string $key, \Phalcon\Annotations\Reflection $data) { } } diff --git a/src/Phalcon/Annotations/AnnotationsFactory.php b/src/Phalcon/Annotations/AnnotationsFactory.php index 2acd879c..f52447a7 100644 --- a/src/Phalcon/Annotations/AnnotationsFactory.php +++ b/src/Phalcon/Annotations/AnnotationsFactory.php @@ -10,7 +10,6 @@ namespace Phalcon\Annotations; use Phalcon\Annotations\Adapter\AdapterInterface; -use Phalcon\Config; use Phalcon\Factory\AbstractFactory; use Phalcon\Helper\Arr; @@ -30,7 +29,7 @@ public function __construct(array $services = array()) } /** - * @param array|Config $config = [ + * @param array|\Phalcon\Config $config = [ * 'adapter' => 'apcu', * 'options' => [ * 'prefix' => 'phalcon', diff --git a/src/Phalcon/Annotations/Collection.php b/src/Phalcon/Annotations/Collection.php index 17595aab..1d4140ae 100644 --- a/src/Phalcon/Annotations/Collection.php +++ b/src/Phalcon/Annotations/Collection.php @@ -29,7 +29,7 @@ * $annotation = $classAnnotations->get("Cacheable"); * ``` */ -class Collection implements Iterator, Countable +class Collection implements \Iterator, \Countable { /** * @var array diff --git a/src/Phalcon/Annotations/Reader.php b/src/Phalcon/Annotations/Reader.php index cce8000c..21eeb9d4 100644 --- a/src/Phalcon/Annotations/Reader.php +++ b/src/Phalcon/Annotations/Reader.php @@ -14,7 +14,7 @@ /** * Parses docblocks returning an array with the found annotations */ -class Reader implements ReaderInterface +class Reader implements \Phalcon\Annotations\ReaderInterface { /** diff --git a/src/Phalcon/Application/AbstractApplication.php b/src/Phalcon/Application/AbstractApplication.php index 64629f54..5fe26b29 100644 --- a/src/Phalcon/Application/AbstractApplication.php +++ b/src/Phalcon/Application/AbstractApplication.php @@ -17,7 +17,7 @@ /** * Base class for Phalcon\Cli\Console and Phalcon\Mvc\Application. */ -abstract class AbstractApplication extends Injectable implements EventsAwareInterface +abstract class AbstractApplication extends Injectable implements \Phalcon\Events\EventsAwareInterface { /** * @var DiInterface @@ -43,9 +43,9 @@ abstract class AbstractApplication extends Injectable implements EventsAwareInte /** * Phalcon\AbstractApplication constructor * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function __construct(DiInterface $container = null) + public function __construct(\Phalcon\Di\DiInterface $container = null) { } @@ -125,10 +125,10 @@ public function setDefaultModule(string $defaultModule): AbstractApplication /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } } diff --git a/src/Phalcon/Assets/Asset.php b/src/Phalcon/Assets/Asset.php index 46e9d927..59669813 100644 --- a/src/Phalcon/Assets/Asset.php +++ b/src/Phalcon/Assets/Asset.php @@ -16,7 +16,7 @@ * $asset = new \Phalcon\Assets\Asset("js", "javascripts/jquery.js"); * ``` */ -class Asset implements AssetInterface +class Asset implements \Phalcon\Assets\AssetInterface { /** * @var array | null diff --git a/src/Phalcon/Assets/Asset/Css.php b/src/Phalcon/Assets/Asset/Css.php index 644ea27b..6473ba4e 100644 --- a/src/Phalcon/Assets/Asset/Css.php +++ b/src/Phalcon/Assets/Asset/Css.php @@ -14,7 +14,7 @@ /** * Represents CSS assets */ -class Css extends AssetBase +class Css extends \Phalcon\Assets\Asset { /** diff --git a/src/Phalcon/Assets/Asset/Js.php b/src/Phalcon/Assets/Asset/Js.php index 02e2cb09..f149ad74 100644 --- a/src/Phalcon/Assets/Asset/Js.php +++ b/src/Phalcon/Assets/Asset/Js.php @@ -14,7 +14,7 @@ /** * Represents Javascript assets */ -class Js extends AssetBase +class Js extends \Phalcon\Assets\Asset { /** diff --git a/src/Phalcon/Assets/Collection.php b/src/Phalcon/Assets/Collection.php index 59ace8dc..b2bd620d 100644 --- a/src/Phalcon/Assets/Collection.php +++ b/src/Phalcon/Assets/Collection.php @@ -19,7 +19,7 @@ /** * Represents a collection of assets */ -class Collection implements Countable, Iterator +class Collection implements \Countable, \Iterator { /** * @var array diff --git a/src/Phalcon/Assets/Filters/Cssmin.php b/src/Phalcon/Assets/Filters/Cssmin.php index b772fd07..8f9ba9dc 100644 --- a/src/Phalcon/Assets/Filters/Cssmin.php +++ b/src/Phalcon/Assets/Filters/Cssmin.php @@ -15,7 +15,7 @@ * Minify the css - removes comments removes newlines and line feeds keeping * removes last semicolon from last property */ -class Cssmin implements FilterInterface +class Cssmin implements \Phalcon\Assets\FilterInterface { /** diff --git a/src/Phalcon/Assets/Filters/Jsmin.php b/src/Phalcon/Assets/Filters/Jsmin.php index 381bba16..fedadb6e 100644 --- a/src/Phalcon/Assets/Filters/Jsmin.php +++ b/src/Phalcon/Assets/Filters/Jsmin.php @@ -16,7 +16,7 @@ * be removed. Tabs will be replaced with spaces. Carriage returns will be * replaced with linefeeds. Most spaces and linefeeds will be removed. */ -class Jsmin implements FilterInterface +class Jsmin implements \Phalcon\Assets\FilterInterface { /** diff --git a/src/Phalcon/Assets/Filters/None.php b/src/Phalcon/Assets/Filters/None.php index 29d1c080..ba7c59c9 100644 --- a/src/Phalcon/Assets/Filters/None.php +++ b/src/Phalcon/Assets/Filters/None.php @@ -14,7 +14,7 @@ /** * Returns the content without make any modification to the original source */ -class None implements FilterInterface +class None implements \Phalcon\Assets\FilterInterface { /** diff --git a/src/Phalcon/Assets/Inline.php b/src/Phalcon/Assets/Inline.php index 6e7e4ce2..8a76055b 100644 --- a/src/Phalcon/Assets/Inline.php +++ b/src/Phalcon/Assets/Inline.php @@ -16,7 +16,7 @@ * $inline = new \Phalcon\Assets\Inline("js", "alert('hello world');"); * ``` */ -class Inline implements AssetInterface +class Inline implements \Phalcon\Assets\AssetInterface { /** * @var array | null diff --git a/src/Phalcon/Assets/Inline/Css.php b/src/Phalcon/Assets/Inline/Css.php index 5ec4d234..4021e7aa 100644 --- a/src/Phalcon/Assets/Inline/Css.php +++ b/src/Phalcon/Assets/Inline/Css.php @@ -14,7 +14,7 @@ /** * Represents an inlined CSS */ -class Css extends InlineBase +class Css extends \Phalcon\Assets\Inline { /** diff --git a/src/Phalcon/Assets/Inline/Js.php b/src/Phalcon/Assets/Inline/Js.php index dc01af1b..a35a1b41 100644 --- a/src/Phalcon/Assets/Inline/Js.php +++ b/src/Phalcon/Assets/Inline/Js.php @@ -14,7 +14,7 @@ /** * Represents an inline JavaScript */ -class Js extends InlineBase +class Js extends \Phalcon\Assets\Inline { /** diff --git a/src/Phalcon/Cache.php b/src/Phalcon/Cache.php index 81c0d2d1..616d216f 100644 --- a/src/Phalcon/Cache.php +++ b/src/Phalcon/Cache.php @@ -9,7 +9,6 @@ */ namespace Phalcon; -use DateInterval; use Phalcon\Cache\Adapter\AdapterInterface; use Phalcon\Cache\Exception\Exception; use Phalcon\Cache\Exception\InvalidArgumentException; @@ -20,7 +19,7 @@ * This component offers caching capabilities for your application. * Phalcon\Cache implements PSR-16. */ -class Cache implements CacheInterface +class Cache implements \Psr\SimpleCache\CacheInterface { /** * The adapter @@ -44,7 +43,7 @@ public function getAdapter() * * @param AdapterInterface $adapter The cache adapter */ - public function __construct(AdapterInterface $adapter) + public function __construct(\Phalcon\Cache\Adapter\AdapterInterface $adapter) { } @@ -129,7 +128,7 @@ public function has($key): bool * * @param string $key The key of the item to store. * @param mixed $value The value of the item to store. Must be serializable. - * @param null|int|DateInterval $ttl Optional. The TTL value of this item. If no value is sent and + * @param null|int|\DateInterval $ttl Optional. The TTL value of this item. If no value is sent and * the driver supports TTL then the library may set a default value * for it or let the driver take care of that. * @@ -145,7 +144,7 @@ public function set($key, $value, $ttl = null): bool * Persists a set of key => value pairs in the cache, with an optional TTL. * * @param iterable $values A list of key => value pairs for a multiple-set operation. - * @param null|int|DateInterval $ttl Optional. The TTL value of this item. If no value is sent and + * @param null|int|\DateInterval $ttl Optional. The TTL value of this item. If no value is sent and * the driver supports TTL then the library may set a default value * for it or let the driver take care of that. * diff --git a/src/Phalcon/Cache/Adapter/Apcu.php b/src/Phalcon/Cache/Adapter/Apcu.php index 4054ddc5..191e2ec9 100644 --- a/src/Phalcon/Cache/Adapter/Apcu.php +++ b/src/Phalcon/Cache/Adapter/Apcu.php @@ -15,7 +15,7 @@ /** * Apcu adapter */ -class Apcu extends StorageApcu implements CacheAdapterInterface +class Apcu extends \Phalcon\Storage\Adapter\Apcu implements CacheAdapterInterface { } diff --git a/src/Phalcon/Cache/Adapter/Libmemcached.php b/src/Phalcon/Cache/Adapter/Libmemcached.php index 7c75a9c5..a00deb4a 100644 --- a/src/Phalcon/Cache/Adapter/Libmemcached.php +++ b/src/Phalcon/Cache/Adapter/Libmemcached.php @@ -15,7 +15,7 @@ /** * Libmemcached adapter */ -class Libmemcached extends StorageLibmemcached implements CacheAdapterInterface +class Libmemcached extends \Phalcon\Storage\Adapter\Libmemcached implements CacheAdapterInterface { } diff --git a/src/Phalcon/Cache/Adapter/Memory.php b/src/Phalcon/Cache/Adapter/Memory.php index 69eeecd5..41619081 100644 --- a/src/Phalcon/Cache/Adapter/Memory.php +++ b/src/Phalcon/Cache/Adapter/Memory.php @@ -15,7 +15,7 @@ /** * Memory adapter */ -class Memory extends StorageMemory implements CacheAdapterInterface +class Memory extends \Phalcon\Storage\Adapter\Memory implements CacheAdapterInterface { } diff --git a/src/Phalcon/Cache/Adapter/Redis.php b/src/Phalcon/Cache/Adapter/Redis.php index 0e7a1949..f9551cec 100644 --- a/src/Phalcon/Cache/Adapter/Redis.php +++ b/src/Phalcon/Cache/Adapter/Redis.php @@ -15,7 +15,7 @@ /** * Redis adapter */ -class Redis extends StorageRedis implements CacheAdapterInterface +class Redis extends \Phalcon\Storage\Adapter\Redis implements CacheAdapterInterface { } diff --git a/src/Phalcon/Cache/Adapter/Stream.php b/src/Phalcon/Cache/Adapter/Stream.php index 35a69e36..376e7a73 100644 --- a/src/Phalcon/Cache/Adapter/Stream.php +++ b/src/Phalcon/Cache/Adapter/Stream.php @@ -15,7 +15,7 @@ /** * Stream adapter */ -class Stream extends StorageStream implements CacheAdapterInterface +class Stream extends \Phalcon\Storage\Adapter\Stream implements CacheAdapterInterface { } diff --git a/src/Phalcon/Cache/AdapterFactory.php b/src/Phalcon/Cache/AdapterFactory.php index 98747798..0c5936a4 100644 --- a/src/Phalcon/Cache/AdapterFactory.php +++ b/src/Phalcon/Cache/AdapterFactory.php @@ -28,10 +28,10 @@ class AdapterFactory extends AbstractFactory /** * AdapterFactory constructor. * - * @param SerializerFactory $factory + * @param \Phalcon\Storage\SerializerFactory $factory * @param array $services */ - public function __construct(SerializerFactory $factory = null, array $services = array()) + public function __construct(\Phalcon\Storage\SerializerFactory $factory = null, array $services = array()) { } diff --git a/src/Phalcon/Cache/CacheFactory.php b/src/Phalcon/Cache/CacheFactory.php index 3fb89b1c..c42d1995 100644 --- a/src/Phalcon/Cache/CacheFactory.php +++ b/src/Phalcon/Cache/CacheFactory.php @@ -39,7 +39,7 @@ public function __construct(AdapterFactory $factory) /** * Factory to create an instace from a Config object * - * @param array|Config $config = [ + * @param array|\Phalcon\Config $config = [ * 'adapter' => 'apcu', * 'options' => [ * 'servers' => [ diff --git a/src/Phalcon/Cache/Exception/Exception.php b/src/Phalcon/Cache/Exception/Exception.php index 4bb6fd79..d8df7b13 100644 --- a/src/Phalcon/Cache/Exception/Exception.php +++ b/src/Phalcon/Cache/Exception/Exception.php @@ -9,12 +9,10 @@ */ namespace Phalcon\Cache\Exception; -use Psr\SimpleCache\CacheException; - /** * Exceptions thrown in Phalcon\Cache will use this class */ -class Exception extends \Phalcon\Exception implements CacheException +class Exception extends \Phalcon\Exception implements \Psr\SimpleCache\CacheException { } diff --git a/src/Phalcon/Cli/Dispatcher.php b/src/Phalcon/Cli/Dispatcher.php index f6d1ff7a..0911faae 100644 --- a/src/Phalcon/Cli/Dispatcher.php +++ b/src/Phalcon/Cli/Dispatcher.php @@ -36,7 +36,7 @@ * $handle = $dispatcher->dispatch(); * ``` */ -class Dispatcher extends CliDispatcher implements DispatcherInterface +class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phalcon\Cli\DispatcherInterface { /** * @var string diff --git a/src/Phalcon/Cli/Router.php b/src/Phalcon/Cli/Router.php index 81e6b58b..f03a0e4a 100644 --- a/src/Phalcon/Cli/Router.php +++ b/src/Phalcon/Cli/Router.php @@ -170,7 +170,7 @@ public function getRouteByName(string $name) /** * Returns all the routes defined in the router * - * @return array|Route[] + * @return array|\Phalcon\Cli\Router\Route[] */ public function getRoutes(): array { diff --git a/src/Phalcon/Cli/Router/Route.php b/src/Phalcon/Cli/Router/Route.php index 3095febe..eb98027e 100644 --- a/src/Phalcon/Cli/Router/Route.php +++ b/src/Phalcon/Cli/Router/Route.php @@ -12,7 +12,7 @@ /** * This class represents every route added to the router */ -class Route implements RouteInterface +class Route implements \Phalcon\Cli\Router\RouteInterface { const DEFAULT_DELIMITER = ' '; diff --git a/src/Phalcon/Cli/RouterInterface.php b/src/Phalcon/Cli/RouterInterface.php index b5eb5259..29f56fa8 100644 --- a/src/Phalcon/Cli/RouterInterface.php +++ b/src/Phalcon/Cli/RouterInterface.php @@ -80,7 +80,7 @@ public function getRouteByName(string $name): RouteInterface; /** * Return all the routes defined in the router * - * @return array|RouteInterface[] + * @return array|\Phalcon\Cli\Router\RouteInterface[] */ public function getRoutes(): array; diff --git a/src/Phalcon/Cli/Task.php b/src/Phalcon/Cli/Task.php index 9326ce11..c31f7a41 100644 --- a/src/Phalcon/Cli/Task.php +++ b/src/Phalcon/Cli/Task.php @@ -37,7 +37,7 @@ * } * ``` */ -class Task extends Injectable implements TaskInterface, EventsAwareInterface +class Task extends Injectable implements \Phalcon\Cli\TaskInterface, \Phalcon\Events\EventsAwareInterface { protected $eventsManager; @@ -62,10 +62,10 @@ public function getEventsManager(): ?ManagerInterface /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } } diff --git a/src/Phalcon/Collection.php b/src/Phalcon/Collection.php index 0644597a..eb097141 100644 --- a/src/Phalcon/Collection.php +++ b/src/Phalcon/Collection.php @@ -30,7 +30,7 @@ * Such implementations are for instance accessing globals `$_GET`, `$_POST` * etc. */ -class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSerializable, Serializable +class Collection implements \ArrayAccess, \Countable, \IteratorAggregate, \JsonSerializable, \Serializable { /** * @var array diff --git a/src/Phalcon/Collection/Exception.php b/src/Phalcon/Collection/Exception.php index 2c431167..badabd18 100644 --- a/src/Phalcon/Collection/Exception.php +++ b/src/Phalcon/Collection/Exception.php @@ -14,7 +14,7 @@ /** * Exceptions for the Collection object */ -class Exception extends \Phalcon\Exception implements Throwable +class Exception extends \Phalcon\Exception implements \Throwable { } diff --git a/src/Phalcon/Config/Adapter/Json.php b/src/Phalcon/Config/Adapter/Json.php index 4c4b1e3f..f3595078 100644 --- a/src/Phalcon/Config/Adapter/Json.php +++ b/src/Phalcon/Config/Adapter/Json.php @@ -10,6 +10,7 @@ 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/ConfigFactory.php b/src/Phalcon/Config/ConfigFactory.php index 2cb7faea..882f6235 100644 --- a/src/Phalcon/Config/ConfigFactory.php +++ b/src/Phalcon/Config/ConfigFactory.php @@ -49,7 +49,7 @@ public function __construct(array $services = array()) /** * Load a config to create a new instance * - * @param string|array|Config $config = [ + * @param string|array|\Phalcon\Config $config = [ * 'adapter' => 'ini', * 'filePath' => 'config.ini', * 'mode' => null, diff --git a/src/Phalcon/Container.php b/src/Phalcon/Container.php index 964b1cf8..1ecadfe3 100644 --- a/src/Phalcon/Container.php +++ b/src/Phalcon/Container.php @@ -15,7 +15,7 @@ /** * PSR-11 Wrapper for `Phalcon\Di` */ -class Container implements ContainerInterface +class Container implements \Psr\Container\ContainerInterface { /** * @var DiInterface @@ -26,9 +26,9 @@ class Container implements ContainerInterface /** * Phalcon\Container constructor * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function __construct(DiInterface $container) + public function __construct(\Phalcon\Di\DiInterface $container) { } diff --git a/src/Phalcon/Crypt.php b/src/Phalcon/Crypt.php index 36bb07c6..d6c6a494 100644 --- a/src/Phalcon/Crypt.php +++ b/src/Phalcon/Crypt.php @@ -31,7 +31,7 @@ * echo $crypt->decrypt($encrypted, $key); * ``` */ -class Crypt implements CryptInterface +class Crypt implements \Phalcon\Crypt\CryptInterface { const PADDING_ANSI_X_923 = 1; @@ -165,7 +165,7 @@ public function decrypt(string $text, string $key = null): string /** * Decrypt a text that is coded as a base64 string. * - * @throws Mismatch + * @throws \Phalcon\Crypt\Mismatch * @param string $text * @param mixed $key * @param bool $safe @@ -293,7 +293,7 @@ public function setCipher(string $cipher): CryptInterface /** * Set the name of hashing algorithm. * - * @throws Exception + * @throws \Phalcon\Crypt\Exception * @param string $hashAlgo * @return CryptInterface */ diff --git a/src/Phalcon/Crypt/Mismatch.php b/src/Phalcon/Crypt/Mismatch.php index f5f2f7c1..e747b732 100644 --- a/src/Phalcon/Crypt/Mismatch.php +++ b/src/Phalcon/Crypt/Mismatch.php @@ -12,7 +12,7 @@ /** * Exceptions thrown in Phalcon\Crypt will use this class. */ -class Mismatch extends Exception +class Mismatch extends \Phalcon\Crypt\Exception { } diff --git a/src/Phalcon/Db/Adapter/AbstractAdapter.php b/src/Phalcon/Db/Adapter/AbstractAdapter.php index 7e259dee..52f31074 100644 --- a/src/Phalcon/Db/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Db/Adapter/AbstractAdapter.php @@ -24,7 +24,7 @@ /** * Base class for Phalcon\Db adapters */ -abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface +abstract class AbstractAdapter implements \Phalcon\Db\Adapter\AdapterInterface, \Phalcon\Events\EventsAwareInterface { /** * Connection ID @@ -152,10 +152,10 @@ public function __construct(array $descriptor) * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return bool */ - public function addColumn(string $tableName, string $schemaName, ColumnInterface $column): bool + public function addColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column): bool { } @@ -164,10 +164,10 @@ public function addColumn(string $tableName, string $schemaName, ColumnInterface * * @param string $tableName * @param string $schemaName - * @param ReferenceInterface $reference + * @param \Phalcon\Db\ReferenceInterface $reference * @return bool */ - public function addForeignKey(string $tableName, string $schemaName, ReferenceInterface $reference): bool + public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db\ReferenceInterface $reference): bool { } @@ -176,10 +176,10 @@ public function addForeignKey(string $tableName, string $schemaName, ReferenceIn * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return bool */ - public function addIndex(string $tableName, string $schemaName, IndexInterface $index): bool + public function addIndex(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): bool { } @@ -188,10 +188,10 @@ public function addIndex(string $tableName, string $schemaName, IndexInterface $ * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return bool */ - public function addPrimaryKey(string $tableName, string $schemaName, IndexInterface $index): bool + public function addPrimaryKey(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): bool { } @@ -264,7 +264,7 @@ public function delete($table, $whereCondition = null, $placeholders = null, $da * * @param string $table * @param string $schema - * @return array|IndexInterface[] + * @return array|\Phalcon\Db\IndexInterface[] */ public function describeIndexes(string $table, string $schema = null): array { @@ -281,7 +281,7 @@ public function describeIndexes(string $table, string $schema = null): array * * @param string $table * @param string $schema - * @return array|ReferenceInterface[] + * @return array|\Phalcon\Db\ReferenceInterface[] */ public function describeReferences(string $table, string $schema = null): array { @@ -482,10 +482,10 @@ public function forUpdate(string $sqlQuery): string /** * Returns the SQL column definition from a column * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function getColumnDefinition(ColumnInterface $column): string + public function getColumnDefinition(\Phalcon\Db\ColumnInterface $column): string { } @@ -734,11 +734,11 @@ public function listViews(string $schemaName = null): array * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column - * @param ColumnInterface $currentColumn + * @param \Phalcon\Db\ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $currentColumn * @return bool */ - public function modifyColumn(string $tableName, string $schemaName, ColumnInterface $column, ColumnInterface $currentColumn = null): bool + public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column, \Phalcon\Db\ColumnInterface $currentColumn = null): bool { } @@ -765,19 +765,19 @@ public function rollbackSavepoint(string $name): bool /** * Sets the event manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } /** * Sets the dialect used to produce the SQL * - * @param DialectInterface $dialect + * @param \Phalcon\Db\DialectInterface $dialect */ - public function setDialect(DialectInterface $dialect) + public function setDialect(\Phalcon\Db\DialectInterface $dialect) { } diff --git a/src/Phalcon/Db/Adapter/AdapterInterface.php b/src/Phalcon/Db/Adapter/AdapterInterface.php index 933abe71..9e4b21ea 100644 --- a/src/Phalcon/Db/Adapter/AdapterInterface.php +++ b/src/Phalcon/Db/Adapter/AdapterInterface.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Db\Adapter; -use PDO; use Phalcon\Db\DialectInterface; use Phalcon\Db\ResultInterface; use Phalcon\Db\ColumnInterface; @@ -28,40 +27,40 @@ interface AdapterInterface * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return bool */ - public function addColumn(string $tableName, string $schemaName, ColumnInterface $column): bool; + public function addColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column): bool; /** * Adds an index to a table * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return bool */ - public function addIndex(string $tableName, string $schemaName, IndexInterface $index): bool; + public function addIndex(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): bool; /** * Adds a foreign key to a table * * @param string $tableName * @param string $schemaName - * @param ReferenceInterface $reference + * @param \Phalcon\Db\ReferenceInterface $reference * @return bool */ - public function addForeignKey(string $tableName, string $schemaName, ReferenceInterface $reference): bool; + public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db\ReferenceInterface $reference): bool; /** * Adds a primary key to a table * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return bool */ - public function addPrimaryKey(string $tableName, string $schemaName, IndexInterface $index): bool; + public function addPrimaryKey(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): bool; /** * Returns the number of affected rows by the last INSERT/UPDATE/DELETE @@ -148,7 +147,7 @@ public function delete($table, $whereCondition = null, $placeholders = null, $da * * @param string $table * @param string $schema - * @return array|ColumnInterface[] + * @return array|\Phalcon\Db\ColumnInterface[] */ public function describeColumns(string $table, string $schema = null): array; @@ -157,7 +156,7 @@ public function describeColumns(string $table, string $schema = null): array; * * @param string $table * @param string $schema - * @return array|IndexInterface[] + * @return array|\Phalcon\Db\IndexInterface[] */ public function describeIndexes(string $table, string $schema = null): array; @@ -166,7 +165,7 @@ public function describeIndexes(string $table, string $schema = null): array; * * @param string $table * @param string $schema - * @return array|ReferenceInterface[] + * @return array|\Phalcon\Db\ReferenceInterface[] */ public function describeReferences(string $table, string $schema = null): array; @@ -311,10 +310,10 @@ public function forUpdate(string $sqlQuery): string; /** * Returns the SQL column definition from a column * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function getColumnDefinition(ColumnInterface $column): string; + public function getColumnDefinition(\Phalcon\Db\ColumnInterface $column): string; /** * Gets a list of columns @@ -362,9 +361,9 @@ public function getDefaultIdValue(): RawValue; /** * Return internal PDO handler * - * @return PDO + * @return \PDO */ - public function getInternalHandler(): PDO; + public function getInternalHandler(): \PDO; /** * Returns the savepoint name to use for nested transactions @@ -495,11 +494,11 @@ public function listViews(string $schemaName = null): array; * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column - * @param ColumnInterface $currentColumn + * @param \Phalcon\Db\ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $currentColumn * @return bool */ - public function modifyColumn(string $tableName, string $schemaName, ColumnInterface $column, ColumnInterface $currentColumn = null): bool; + public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column, \Phalcon\Db\ColumnInterface $currentColumn = null): bool; /** * Sends SQL statements to the database server returning the success state. diff --git a/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php b/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php index 23ee630f..fb228e73 100644 --- a/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php +++ b/src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php @@ -9,9 +9,6 @@ */ namespace Phalcon\Db\Adapter\Pdo; -use PDO; -use PDOStatement; -use Phalcon\Config; use Phalcon\Db\Adapter\AbstractAdapter; use Phalcon\Db\Column; use Phalcon\Db\Exception; @@ -47,7 +44,7 @@ abstract class AbstractPdo extends AbstractAdapter /** * PDO Handler * - * @var PDO + * @var \PDO */ protected $pdo; @@ -55,7 +52,7 @@ abstract class AbstractPdo extends AbstractAdapter /** * Constructor for Phalcon\Db\Adapter\Pdo * - * @param array|Config $descriptor = [ + * @param array|\Phalcon\Config $descriptor = [ * 'host' => 'localhost', * 'port' => '3306', * 'dbname' => 'blog', @@ -238,12 +235,12 @@ public function execute(string $sqlStatement, $bindParams = null, $bindTypes = n * ); * ``` * - * @param PDOStatement $statement + * @param \PDOStatement $statement * @param array $placeholders * @param mixed $dataTypes - * @return PDOStatement + * @return \PDOStatement */ - public function executePrepared(PDOStatement $statement, array $placeholders, $dataTypes): PDOStatement + public function executePrepared(\PDOStatement $statement, array $placeholders, $dataTypes): \PDOStatement { } @@ -257,9 +254,9 @@ public function getErrorInfo() /** * Return internal PDO handler * - * @return PDO + * @return \PDO */ - public function getInternalHandler(): PDO + public function getInternalHandler(): \PDO { } @@ -341,9 +338,9 @@ public function lastInsertId($sequenceName = null) * ``` * * @param string $sqlStatement - * @return PDOStatement + * @return \PDOStatement */ - public function prepare(string $sqlStatement): PDOStatement + public function prepare(string $sqlStatement): \PDOStatement { } diff --git a/src/Phalcon/Db/Adapter/Pdo/Mysql.php b/src/Phalcon/Db/Adapter/Pdo/Mysql.php index 5910e30f..fe71fcbb 100644 --- a/src/Phalcon/Db/Adapter/Pdo/Mysql.php +++ b/src/Phalcon/Db/Adapter/Pdo/Mysql.php @@ -36,7 +36,7 @@ * $connection = new Mysql($config); * ``` */ -class Mysql extends AbstractPdo +class Mysql extends \Phalcon\Db\Adapter\Pdo\AbstractPdo { /** * @var string @@ -54,10 +54,10 @@ class Mysql extends AbstractPdo * * @param string $tableName * @param string $schemaName - * @param ReferenceInterface $reference + * @param \Phalcon\Db\ReferenceInterface $reference * @return bool */ - public function addForeignKey(string $tableName, string $schemaName, ReferenceInterface $reference): bool + public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db\ReferenceInterface $reference): bool { } @@ -72,7 +72,7 @@ public function addForeignKey(string $tableName, string $schemaName, ReferenceIn * * @param string $table * @param string $schema - * @return array|ColumnInterface[] + * @return array|\Phalcon\Db\ColumnInterface[] */ public function describeColumns(string $table, string $schema = null): array { @@ -89,7 +89,7 @@ public function describeColumns(string $table, string $schema = null): array * * @param string $table * @param string $schema - * @return array|IndexInterface[] + * @return array|\Phalcon\Db\IndexInterface[] */ public function describeIndexes(string $table, string $schema = null): array { @@ -106,7 +106,7 @@ public function describeIndexes(string $table, string $schema = null): array * * @param string $table * @param string $schema - * @return array|ReferenceInterface[] + * @return array|\Phalcon\Db\ReferenceInterface[] */ public function describeReferences(string $table, string $schema = null): array { diff --git a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php index f3d4e642..86819e61 100644 --- a/src/Phalcon/Db/Adapter/Pdo/Postgresql.php +++ b/src/Phalcon/Db/Adapter/Pdo/Postgresql.php @@ -36,7 +36,7 @@ * $connection = new Postgresql($config); * ``` */ -class Postgresql extends AbstractPdo +class Postgresql extends \Phalcon\Db\Adapter\Pdo\AbstractPdo { /** * @var string @@ -92,7 +92,7 @@ public function createTable(string $tableName, string $schemaName, array $defini * * @param string $table * @param string $schema - * @return array|ColumnInterface[] + * @return array|\Phalcon\Db\ColumnInterface[] */ public function describeColumns(string $table, string $schema = null): array { @@ -109,7 +109,7 @@ public function describeColumns(string $table, string $schema = null): array * * @param string $table * @param string $schema - * @return array|ReferenceInterface[] + * @return array|\Phalcon\Db\ReferenceInterface[] */ public function describeReferences(string $table, string $schema = null): array { @@ -146,11 +146,11 @@ public function getDefaultIdValue(): RawValue * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column - * @param ColumnInterface $currentColumn + * @param \Phalcon\Db\ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $currentColumn * @return bool */ - public function modifyColumn(string $tableName, string $schemaName, ColumnInterface $column, ColumnInterface $currentColumn = null): bool + public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column, \Phalcon\Db\ColumnInterface $currentColumn = null): bool { } diff --git a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php index 36b46bab..8eea1183 100644 --- a/src/Phalcon/Db/Adapter/Pdo/Sqlite.php +++ b/src/Phalcon/Db/Adapter/Pdo/Sqlite.php @@ -33,7 +33,7 @@ * ); * ``` */ -class Sqlite extends AbstractPdo +class Sqlite extends \Phalcon\Db\Adapter\Pdo\AbstractPdo { /** * @var string @@ -77,7 +77,7 @@ public function connect(array $descriptor = null): bool * * @param string $table * @param string $schema - * @return array|ColumnInterface[] + * @return array|\Phalcon\Db\ColumnInterface[] */ public function describeColumns(string $table, string $schema = null): array { @@ -94,7 +94,7 @@ public function describeColumns(string $table, string $schema = null): array * * @param string $table * @param string $schema - * @return array|IndexInterface[] + * @return array|\Phalcon\Db\IndexInterface[] */ public function describeIndexes(string $table, string $schema = null): array { @@ -105,7 +105,7 @@ public function describeIndexes(string $table, string $schema = null): array * * @param string $table * @param string $schema - * @return array|ReferenceInterface[] + * @return array|\Phalcon\Db\ReferenceInterface[] */ public function describeReferences(string $table, string $schema = null): array { diff --git a/src/Phalcon/Db/Adapter/PdoFactory.php b/src/Phalcon/Db/Adapter/PdoFactory.php index 56c90600..ad5d9c62 100644 --- a/src/Phalcon/Db/Adapter/PdoFactory.php +++ b/src/Phalcon/Db/Adapter/PdoFactory.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Db\Adapter; -use Phalcon\Config; use Phalcon\Factory\AbstractFactory; use Phalcon\Helper\Arr; @@ -36,7 +35,7 @@ public function __construct(array $services = array()) /** * Factory to create an instace from a Config object * - * @param array|Config $config = [ + * @param array|\Phalcon\Config $config = [ * 'adapter' => 'mysql', * 'options' => [ * 'host' => 'localhost', diff --git a/src/Phalcon/Db/Column.php b/src/Phalcon/Db/Column.php index f42f9b8b..bfadbc3e 100644 --- a/src/Phalcon/Db/Column.php +++ b/src/Phalcon/Db/Column.php @@ -32,7 +32,7 @@ * $connection->addColumn("robots", null, $column); * ``` */ -class Column implements ColumnInterface +class Column implements \Phalcon\Db\ColumnInterface { /** * Bind Type Blob diff --git a/src/Phalcon/Db/Dialect.php b/src/Phalcon/Db/Dialect.php index cb647536..63bd2a63 100644 --- a/src/Phalcon/Db/Dialect.php +++ b/src/Phalcon/Db/Dialect.php @@ -13,7 +13,7 @@ * This is the base class to each database dialect. This implements * common methods to transform intermediate code into its RDBMS related syntax */ -abstract class Dialect implements DialectInterface +abstract class Dialect implements \Phalcon\Db\DialectInterface { protected $escapeChar; diff --git a/src/Phalcon/Db/Dialect/Mysql.php b/src/Phalcon/Db/Dialect/Mysql.php index b310d2de..91c6265c 100644 --- a/src/Phalcon/Db/Dialect/Mysql.php +++ b/src/Phalcon/Db/Dialect/Mysql.php @@ -33,10 +33,10 @@ class Mysql extends Dialect * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function addColumn(string $tableName, string $schemaName, ColumnInterface $column): string + public function addColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column): string { } @@ -45,10 +45,10 @@ public function addColumn(string $tableName, string $schemaName, ColumnInterface * * @param string $tableName * @param string $schemaName - * @param ReferenceInterface $reference + * @param \Phalcon\Db\ReferenceInterface $reference * @return string */ - public function addForeignKey(string $tableName, string $schemaName, ReferenceInterface $reference): string + public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db\ReferenceInterface $reference): string { } @@ -57,10 +57,10 @@ public function addForeignKey(string $tableName, string $schemaName, ReferenceIn * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return string */ - public function addIndex(string $tableName, string $schemaName, IndexInterface $index): string + public function addIndex(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): string { } @@ -69,10 +69,10 @@ public function addIndex(string $tableName, string $schemaName, IndexInterface $ * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return string */ - public function addPrimaryKey(string $tableName, string $schemaName, IndexInterface $index): string + public function addPrimaryKey(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): string { } @@ -213,10 +213,10 @@ public function dropView(string $viewName, string $schemaName = null, bool $ifEx /** * Gets the column name in MySQL * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function getColumnDefinition(ColumnInterface $column): string + public function getColumnDefinition(\Phalcon\Db\ColumnInterface $column): string { } @@ -260,11 +260,11 @@ public function listViews(string $schemaName = null): string * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column - * @param ColumnInterface $currentColumn + * @param \Phalcon\Db\ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $currentColumn * @return string */ - public function modifyColumn(string $tableName, string $schemaName, ColumnInterface $column, ColumnInterface $currentColumn = null): string + public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column, \Phalcon\Db\ColumnInterface $currentColumn = null): string { } @@ -348,20 +348,20 @@ protected function getTableOptions(array $definition): string * Checks if the size and/or scale are present and encloses those values * in parentheses if need be * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - private function checkColumnSizeAndScale(ColumnInterface $column): string + private function checkColumnSizeAndScale(\Phalcon\Db\ColumnInterface $column): string { } /** * Checks if a column is unsigned or not and returns the relevant SQL syntax * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - private function checkColumnUnsigned(ColumnInterface $column): string + private function checkColumnUnsigned(\Phalcon\Db\ColumnInterface $column): string { } } diff --git a/src/Phalcon/Db/Dialect/Postgresql.php b/src/Phalcon/Db/Dialect/Postgresql.php index eb705684..25783793 100644 --- a/src/Phalcon/Db/Dialect/Postgresql.php +++ b/src/Phalcon/Db/Dialect/Postgresql.php @@ -33,10 +33,10 @@ class Postgresql extends Dialect * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function addColumn(string $tableName, string $schemaName, ColumnInterface $column): string + public function addColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column): string { } @@ -45,10 +45,10 @@ public function addColumn(string $tableName, string $schemaName, ColumnInterface * * @param string $tableName * @param string $schemaName - * @param ReferenceInterface $reference + * @param \Phalcon\Db\ReferenceInterface $reference * @return string */ - public function addForeignKey(string $tableName, string $schemaName, ReferenceInterface $reference): string + public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db\ReferenceInterface $reference): string { } @@ -57,10 +57,10 @@ public function addForeignKey(string $tableName, string $schemaName, ReferenceIn * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return string */ - public function addIndex(string $tableName, string $schemaName, IndexInterface $index): string + public function addIndex(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): string { } @@ -69,10 +69,10 @@ public function addIndex(string $tableName, string $schemaName, IndexInterface $ * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return string */ - public function addPrimaryKey(string $tableName, string $schemaName, IndexInterface $index): string + public function addPrimaryKey(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): string { } @@ -213,10 +213,10 @@ public function dropView(string $viewName, string $schemaName = null, bool $ifEx /** * Gets the column name in PostgreSQL * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function getColumnDefinition(ColumnInterface $column): string + public function getColumnDefinition(\Phalcon\Db\ColumnInterface $column): string { } @@ -251,11 +251,11 @@ public function listViews(string $schemaName = null): string * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column - * @param ColumnInterface $currentColumn + * @param \Phalcon\Db\ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $currentColumn * @return string */ - public function modifyColumn(string $tableName, string $schemaName, ColumnInterface $column, ColumnInterface $currentColumn = null): string + public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column, \Phalcon\Db\ColumnInterface $currentColumn = null): string { } @@ -321,10 +321,10 @@ public function viewExists(string $viewName, string $schemaName = null): string } /** - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - protected function castDefault(ColumnInterface $column): string + protected function castDefault(\Phalcon\Db\ColumnInterface $column): string { } diff --git a/src/Phalcon/Db/Dialect/Sqlite.php b/src/Phalcon/Db/Dialect/Sqlite.php index 06cc8f10..c4e4393f 100644 --- a/src/Phalcon/Db/Dialect/Sqlite.php +++ b/src/Phalcon/Db/Dialect/Sqlite.php @@ -33,10 +33,10 @@ class Sqlite extends Dialect * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function addColumn(string $tableName, string $schemaName, ColumnInterface $column): string + public function addColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column): string { } @@ -45,10 +45,10 @@ public function addColumn(string $tableName, string $schemaName, ColumnInterface * * @param string $tableName * @param string $schemaName - * @param ReferenceInterface $reference + * @param \Phalcon\Db\ReferenceInterface $reference * @return string */ - public function addForeignKey(string $tableName, string $schemaName, ReferenceInterface $reference): string + public function addForeignKey(string $tableName, string $schemaName, \Phalcon\Db\ReferenceInterface $reference): string { } @@ -57,10 +57,10 @@ public function addForeignKey(string $tableName, string $schemaName, ReferenceIn * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return string */ - public function addIndex(string $tableName, string $schemaName, IndexInterface $index): string + public function addIndex(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): string { } @@ -69,10 +69,10 @@ public function addIndex(string $tableName, string $schemaName, IndexInterface $ * * @param string $tableName * @param string $schemaName - * @param IndexInterface $index + * @param \Phalcon\Db\IndexInterface $index * @return string */ - public function addPrimaryKey(string $tableName, string $schemaName, IndexInterface $index): string + public function addPrimaryKey(string $tableName, string $schemaName, \Phalcon\Db\IndexInterface $index): string { } @@ -234,10 +234,10 @@ public function forUpdate(string $sqlQuery): string /** * Gets the column name in SQLite * - * @param ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $column * @return string */ - public function getColumnDefinition(ColumnInterface $column): string + public function getColumnDefinition(\Phalcon\Db\ColumnInterface $column): string { } @@ -290,11 +290,11 @@ public function listViews(string $schemaName = null): string * * @param string $tableName * @param string $schemaName - * @param ColumnInterface $column - * @param ColumnInterface $currentColumn + * @param \Phalcon\Db\ColumnInterface $column + * @param \Phalcon\Db\ColumnInterface $currentColumn * @return string */ - public function modifyColumn(string $tableName, string $schemaName, ColumnInterface $column, ColumnInterface $currentColumn = null): string + public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\ColumnInterface $column, \Phalcon\Db\ColumnInterface $currentColumn = null): string { } diff --git a/src/Phalcon/Db/Index.php b/src/Phalcon/Db/Index.php index 90806b07..1832a2f8 100644 --- a/src/Phalcon/Db/Index.php +++ b/src/Phalcon/Db/Index.php @@ -38,7 +38,7 @@ * $connection->addIndex("robots", null, $index_primary); * ``` */ -class Index implements IndexInterface +class Index implements \Phalcon\Db\IndexInterface { /** * Index columns diff --git a/src/Phalcon/Db/Profiler.php b/src/Phalcon/Db/Profiler.php index 686eb278..5aee40ff 100644 --- a/src/Phalcon/Db/Profiler.php +++ b/src/Phalcon/Db/Profiler.php @@ -73,7 +73,7 @@ class Profiler /** * All the Phalcon\Db\Profiler\Item in the active profile * - * @var Item[] + * @var \Phalcon\Db\Profiler\Item[] */ protected $allProfiles; @@ -115,7 +115,7 @@ public function getTotalElapsedSeconds(): float /** * Returns all the processed profiles * - * @return array|Item[] + * @return array|\Phalcon\Db\Profiler\Item[] */ public function getProfiles(): array { diff --git a/src/Phalcon/Db/Reference.php b/src/Phalcon/Db/Reference.php index 001779a0..04964948 100644 --- a/src/Phalcon/Db/Reference.php +++ b/src/Phalcon/Db/Reference.php @@ -30,7 +30,7 @@ * ); * ``` */ -class Reference implements ReferenceInterface +class Reference implements \Phalcon\Db\ReferenceInterface { /** * Local reference columns diff --git a/src/Phalcon/Db/Result/Pdo.php b/src/Phalcon/Db/Result/Pdo.php index 12f0e9d2..4ffb8fd2 100644 --- a/src/Phalcon/Db/Result/Pdo.php +++ b/src/Phalcon/Db/Result/Pdo.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Db\Result; -use PDOStatement; use Phalcon\Db\Enum; use Phalcon\Db\ResultInterface; use Phalcon\Db\Adapter\AdapterInterface; @@ -29,7 +28,7 @@ * } * ``` */ -class Pdo implements ResultInterface +class Pdo implements \Phalcon\Db\ResultInterface { protected $bindParams; @@ -48,7 +47,7 @@ class Pdo implements ResultInterface /** * Internal resultset * - * @var PDOStatement + * @var \PDOStatement */ protected $pdoStatement; @@ -65,13 +64,13 @@ class Pdo implements ResultInterface /** * Phalcon\Db\Result\Pdo constructor * - * @param AdapterInterface $connection - * @param PDOStatement $result + * @param \Phalcon\Db\Adapter\AdapterInterface $connection + * @param \PDOStatement $result * @param mixed $sqlStatement * @param mixed $bindParams * @param mixed $bindTypes */ - public function __construct(AdapterInterface $connection, PDOStatement $result, $sqlStatement = null, $bindParams = null, $bindTypes = null) + public function __construct(\Phalcon\Db\Adapter\AdapterInterface $connection, \PDOStatement $result, $sqlStatement = null, $bindParams = null, $bindTypes = null) { } @@ -180,9 +179,9 @@ public function fetchArray() /** * Gets the internal PDO result object * - * @return PDOStatement + * @return \PDOStatement */ - public function getInternalResult(): PDOStatement + public function getInternalResult(): \PDOStatement { } diff --git a/src/Phalcon/Db/ResultInterface.php b/src/Phalcon/Db/ResultInterface.php index 40a9f1c3..5f7abd5c 100644 --- a/src/Phalcon/Db/ResultInterface.php +++ b/src/Phalcon/Db/ResultInterface.php @@ -9,8 +9,6 @@ */ namespace Phalcon\Db; -use PDOStatement; - /** * Interface for Phalcon\Db\Result objects */ @@ -64,9 +62,9 @@ public function fetchArray(); /** * Gets the internal PDO result object * - * @return PDOStatement + * @return \PDOStatement */ - public function getInternalResult(): PDOStatement; + public function getInternalResult(): \PDOStatement; /** * Gets number of rows returned by a resultset diff --git a/src/Phalcon/Di.php b/src/Phalcon/Di.php index b10115ab..555170ff 100644 --- a/src/Phalcon/Di.php +++ b/src/Phalcon/Di.php @@ -58,7 +58,7 @@ * $request = $di->getRequest(); * ``` */ -class Di implements DiInterface +class Di implements \Phalcon\Di\DiInterface { /** * List of registered services @@ -167,7 +167,7 @@ public function getService(string $name): ServiceInterface /** * Return the services registered in the DI * - * @return array|ServiceInterface[] + * @return array|\Phalcon\Di\ServiceInterface[] */ public function getServices(): array { @@ -353,10 +353,10 @@ public function offsetUnset($name) * } * ``` * - * @param ServiceProviderInterface $provider + * @param \Phalcon\Di\ServiceProviderInterface $provider * @return void */ - public function register(ServiceProviderInterface $provider) + public function register(\Phalcon\Di\ServiceProviderInterface $provider) { } @@ -396,19 +396,19 @@ public function set(string $name, $definition, bool $shared = false): ServiceInt * Set a default dependency injection container to be obtained into static * methods * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public static function setDefault(DiInterface $container) + public static function setDefault(\Phalcon\Di\DiInterface $container) { } /** * Sets the internal event manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager */ - public function setInternalEventsManager(ManagerInterface $eventsManager) + public function setInternalEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } @@ -416,10 +416,10 @@ public function setInternalEventsManager(ManagerInterface $eventsManager) * Sets a service using a raw Phalcon\Di\Service definition * * @param string $name - * @param ServiceInterface $rawDefinition + * @param \Phalcon\Di\ServiceInterface $rawDefinition * @return ServiceInterface */ - public function setService(string $name, ServiceInterface $rawDefinition): ServiceInterface + public function setService(string $name, \Phalcon\Di\ServiceInterface $rawDefinition): ServiceInterface { } diff --git a/src/Phalcon/Di/AbstractInjectionAware.php b/src/Phalcon/Di/AbstractInjectionAware.php index cf7102d0..d9f43b71 100644 --- a/src/Phalcon/Di/AbstractInjectionAware.php +++ b/src/Phalcon/Di/AbstractInjectionAware.php @@ -12,7 +12,7 @@ /** * This abstract class offers common access to the DI in a class */ -abstract class AbstractInjectionAware implements InjectionAwareInterface +abstract class AbstractInjectionAware implements \Phalcon\Di\InjectionAwareInterface { /** * Dependency Injector diff --git a/src/Phalcon/Di/DiInterface.php b/src/Phalcon/Di/DiInterface.php index ae11f4be..157d3394 100644 --- a/src/Phalcon/Di/DiInterface.php +++ b/src/Phalcon/Di/DiInterface.php @@ -14,7 +14,7 @@ /** * Interface for Phalcon\Di */ -interface DiInterface extends ArrayAccess +interface DiInterface extends \ArrayAccess { /** diff --git a/src/Phalcon/Di/Exception/ServiceResolutionException.php b/src/Phalcon/Di/Exception/ServiceResolutionException.php index fe817007..bee2d1e1 100644 --- a/src/Phalcon/Di/Exception/ServiceResolutionException.php +++ b/src/Phalcon/Di/Exception/ServiceResolutionException.php @@ -9,12 +9,10 @@ */ namespace Phalcon\Di\Exception; -use Phalcon\Di\Exception; - /** * Phalcon\Di\Exception\ServiceResolutionException */ -class ServiceResolutionException extends Exception +class ServiceResolutionException extends \Phalcon\Di\Exception { } diff --git a/src/Phalcon/Di/FactoryDefault.php b/src/Phalcon/Di/FactoryDefault.php index 1c58c161..4f151e00 100644 --- a/src/Phalcon/Di/FactoryDefault.php +++ b/src/Phalcon/Di/FactoryDefault.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Di; -use Phalcon\Di; use Phalcon\Filter\FilterFactory; /** @@ -18,7 +17,7 @@ * developer does not need to register each service individually providing a * full stack framework */ -class FactoryDefault extends Di +class FactoryDefault extends \Phalcon\Di { /** diff --git a/src/Phalcon/Di/Injectable.php b/src/Phalcon/Di/Injectable.php index 7981d759..f206dc2a 100644 --- a/src/Phalcon/Di/Injectable.php +++ b/src/Phalcon/Di/Injectable.php @@ -9,69 +9,39 @@ */ namespace Phalcon\Di; -use Phalcon\Annotations\Adapter; -use Phalcon\Assets\Manager; -use Phalcon\Crypt; -use Phalcon\CryptInterface; -use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Di; -use Phalcon\Escaper; -use Phalcon\Escaper\EscaperInterface; -use Phalcon\Filter; -use Phalcon\Flash\Direct; -use Phalcon\Flash\Session; -use Phalcon\Http\Request; -use Phalcon\Http\RequestInterface; -use Phalcon\Http\Response; -use Phalcon\Http\Response\Cookies; -use Phalcon\Http\Response\CookiesInterface; -use Phalcon\Http\ResponseInterface; -use Phalcon\Mvc\Dispatcher; -use Phalcon\Mvc\DispatcherInterface; -use Phalcon\Mvc\Model\MetaData\Memory; -use Phalcon\Mvc\Model\MetadataInterface; -use Phalcon\Mvc\Model\Transaction\ManagerInterface; -use Phalcon\Mvc\Router; -use Phalcon\Mvc\RouterInterface; -use Phalcon\Mvc\View; -use Phalcon\Mvc\ViewInterface; -use Phalcon\Security; -use Phalcon\Session\Bag; use Phalcon\Session\BagInterface; -use Phalcon\Tag; -use Phalcon\Url; -use Phalcon\Url\UrlInterface; /** * This class allows to access services in the services container by just only * accessing a public property with the same name of a registered service * - * @property Dispatcher|DispatcherInterface $dispatcher - * @property Router|RouterInterface $router - * @property Url|UrlInterface $url - * @property Request|RequestInterface $request - * @property Response|ResponseInterface $response - * @property Cookies|CookiesInterface $cookies - * @property Filter $filter - * @property Direct $flash - * @property Session $flashSession + * @property \Phalcon\Mvc\Dispatcher|\Phalcon\Mvc\DispatcherInterface $dispatcher + * @property \Phalcon\Mvc\Router|\Phalcon\Mvc\RouterInterface $router + * @property \Phalcon\Url|\Phalcon\Url\UrlInterface $url + * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request + * @property \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface $response + * @property \Phalcon\Http\Response\Cookies|\Phalcon\Http\Response\CookiesInterface $cookies + * @property \Phalcon\Filter $filter + * @property \Phalcon\Flash\Direct $flash + * @property \Phalcon\Flash\Session $flashSession * @property \Phalcon\Session\ManagerInterface $session * @property \Phalcon\Events\Manager|\Phalcon\Events\ManagerInterface $eventsManager - * @property AdapterInterface $db - * @property Security $security - * @property Crypt|CryptInterface $crypt - * @property Tag $tag - * @property Escaper|EscaperInterface $escaper - * @property \Phalcon\Annotations\Adapter\Memory|Adapter $annotations + * @property \Phalcon\Db\Adapter\AdapterInterface $db + * @property \Phalcon\Security $security + * @property \Phalcon\Crypt|\Phalcon\CryptInterface $crypt + * @property \Phalcon\Tag $tag + * @property \Phalcon\Escaper|\Phalcon\Escaper\EscaperInterface $escaper + * @property \Phalcon\Annotations\Adapter\Memory|\Phalcon\Annotations\Adapter $annotations * @property \Phalcon\Mvc\Model\Manager|\Phalcon\Mvc\Model\ManagerInterface $modelsManager - * @property Memory|MetadataInterface $modelsMetadata - * @property \Phalcon\Mvc\Model\Transaction\Manager|ManagerInterface $transactionManager - * @property Manager $assets - * @property Di|DiInterface $di - * @property Bag|BagInterface $persistent - * @property View|ViewInterface $view + * @property \Phalcon\Mvc\Model\MetaData\Memory|\Phalcon\Mvc\Model\MetadataInterface $modelsMetadata + * @property \Phalcon\Mvc\Model\Transaction\Manager|\Phalcon\Mvc\Model\Transaction\ManagerInterface $transactionManager + * @property \Phalcon\Assets\Manager $assets + * @property \Phalcon\Di|\Phalcon\Di\DiInterface $di + * @property \Phalcon\Session\Bag|\Phalcon\Session\BagInterface $persistent + * @property \Phalcon\Mvc\View|\Phalcon\Mvc\ViewInterface $view */ -abstract class Injectable implements InjectionAwareInterface +abstract class Injectable implements \Phalcon\Di\InjectionAwareInterface { /** * Dependency Injector diff --git a/src/Phalcon/Di/Service.php b/src/Phalcon/Di/Service.php index 55c9b180..924e992d 100644 --- a/src/Phalcon/Di/Service.php +++ b/src/Phalcon/Di/Service.php @@ -25,7 +25,7 @@ * $request = service->resolve(); * ``` */ -class Service implements ServiceInterface +class Service implements \Phalcon\Di\ServiceInterface { protected $definition; diff --git a/src/Phalcon/Di/Service/Builder.php b/src/Phalcon/Di/Service/Builder.php index e90e2d9a..36e6d6d7 100644 --- a/src/Phalcon/Di/Service/Builder.php +++ b/src/Phalcon/Di/Service/Builder.php @@ -24,34 +24,34 @@ class Builder * Builds a service using a complex service definition * * @param array $parameters - * @param DiInterface $container + * @return mixed + * @param \Phalcon\Di\DiInterface $container * @param array $definition - *@return mixed */ - public function build(DiInterface $container, array $definition, $parameters = null) + public function build(\Phalcon\Di\DiInterface $container, array $definition, $parameters = null) { } /** * Resolves a constructor/call parameter * - * @param DiInterface $container + * @return mixed + * @param \Phalcon\Di\DiInterface $container * @param int $position * @param array $argument - *@return mixed */ - private function buildParameter(DiInterface $container, int $position, array $argument) + private function buildParameter(\Phalcon\Di\DiInterface $container, int $position, array $argument) { } /** * Resolves an array of parameters * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @param array $arguments * @return array */ - private function buildParameters(DiInterface $container, array $arguments): array + private function buildParameters(\Phalcon\Di\DiInterface $container, array $arguments): array { } } diff --git a/src/Phalcon/Dispatcher/AbstractDispatcher.php b/src/Phalcon/Dispatcher/AbstractDispatcher.php index 81f8895e..25c3893a 100644 --- a/src/Phalcon/Dispatcher/AbstractDispatcher.php +++ b/src/Phalcon/Dispatcher/AbstractDispatcher.php @@ -24,7 +24,7 @@ * This class can't be instantiated directly, you can use it to create your own * dispatchers. */ -abstract class AbstractDispatcher extends AbstractInjectionAware implements DispatcherInterface, EventsAwareInterface +abstract class AbstractDispatcher extends AbstractInjectionAware implements \Phalcon\Dispatcher\DispatcherInterface, \Phalcon\Events\EventsAwareInterface { protected $activeHandler; @@ -141,7 +141,7 @@ public function callActionMethod($handler, string $actionMethod, array $params = * for CLI dispatching) or false if an exception occurred and the operation was * stopped by returning false in the exception handler. * - * @throws Exception if any uncaught or unhandled exception occurs during the dispatcher process. + * @throws \Exception if any uncaught or unhandled exception occurs during the dispatcher process. */ public function dispatch(): bool { @@ -392,10 +392,10 @@ public function setActionSuffix(string $actionSuffix) /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } @@ -428,11 +428,11 @@ public function setHandlerSuffix(string $handlerSuffix) * ); * ``` * - * @param BinderInterface $modelBinder + * @param \Phalcon\Mvc\Model\BinderInterface $modelBinder * @param mixed $cache * @return DispatcherInterface */ - public function setModelBinder(BinderInterface $modelBinder, $cache = null): DispatcherInterface + public function setModelBinder(\Phalcon\Mvc\Model\BinderInterface $modelBinder, $cache = null): DispatcherInterface { } diff --git a/src/Phalcon/Domain/Payload/Payload.php b/src/Phalcon/Domain/Payload/Payload.php index 04a459ab..aa69fc5b 100644 --- a/src/Phalcon/Domain/Payload/Payload.php +++ b/src/Phalcon/Domain/Payload/Payload.php @@ -14,7 +14,7 @@ /** * Holds the payload */ -class Payload implements PayloadInterface +class Payload implements \Phalcon\Domain\Payload\PayloadInterface { /** * Exception if any @@ -120,7 +120,7 @@ public function getException(): ?Throwable * * @return PayloadInterface */ - public function setException(Throwable $exception): PayloadInterface + public function setException(\Throwable $exception): PayloadInterface { } diff --git a/src/Phalcon/Domain/Payload/PayloadInterface.php b/src/Phalcon/Domain/Payload/PayloadInterface.php index 1d85a732..a96ecd8e 100644 --- a/src/Phalcon/Domain/Payload/PayloadInterface.php +++ b/src/Phalcon/Domain/Payload/PayloadInterface.php @@ -12,7 +12,7 @@ /** * This interface is used for consumers */ -interface PayloadInterface extends ReadableInterface, WriteableInterface +interface PayloadInterface extends \Phalcon\Domain\Payload\ReadableInterface, \Phalcon\Domain\Payload\WriteableInterface { } diff --git a/src/Phalcon/Domain/Payload/WriteableInterface.php b/src/Phalcon/Domain/Payload/WriteableInterface.php index 010c28cb..f8e01c70 100644 --- a/src/Phalcon/Domain/Payload/WriteableInterface.php +++ b/src/Phalcon/Domain/Payload/WriteableInterface.php @@ -24,7 +24,7 @@ interface WriteableInterface * * @return PayloadInterface */ - public function setException(Throwable $exception): PayloadInterface; + public function setException(\Throwable $exception): PayloadInterface; /** * Sets arbitrary extra values produced by the domain layer. diff --git a/src/Phalcon/Escaper.php b/src/Phalcon/Escaper.php index 5cc4b544..19cba442 100644 --- a/src/Phalcon/Escaper.php +++ b/src/Phalcon/Escaper.php @@ -30,7 +30,7 @@ * echo $escaped; // font\2D family\3A \20 \3C Verdana\3E * ``` */ -class Escaper implements EscaperInterface +class Escaper implements \Phalcon\Escaper\EscaperInterface { /** * @var bool diff --git a/src/Phalcon/Events/Event.php b/src/Phalcon/Events/Event.php index 05f50a15..a2c97950 100644 --- a/src/Phalcon/Events/Event.php +++ b/src/Phalcon/Events/Event.php @@ -24,7 +24,7 @@ * } * ``` */ -class Event implements EventInterface +class Event implements \Phalcon\Events\EventInterface { /** * Is event cancelable? diff --git a/src/Phalcon/Events/Manager.php b/src/Phalcon/Events/Manager.php index a08e356c..ebcfeb66 100644 --- a/src/Phalcon/Events/Manager.php +++ b/src/Phalcon/Events/Manager.php @@ -20,7 +20,7 @@ * can create hooks or plugins that will offer monitoring of data, manipulation, * conditional execution and much more. */ -class Manager implements ManagerInterface +class Manager implements \Phalcon\Events\ManagerInterface { const DEFAULT_PRIORITY = 100; @@ -126,11 +126,11 @@ public function fire(string $eventType, $source, $data = null, bool $cancelable /** * Internal handler to call a queue of events * - * @param SplPriorityQueue $queue + * @return mixed + * @param \SplPriorityQueue $queue * @param EventInterface $event - *@return mixed */ - final public function fireQueue(SplPriorityQueue $queue, EventInterface $event) + final public function fireQueue(\SplPriorityQueue $queue, EventInterface $event) { } diff --git a/src/Phalcon/Exception.php b/src/Phalcon/Exception.php index 6d87ecbb..09a741b3 100644 --- a/src/Phalcon/Exception.php +++ b/src/Phalcon/Exception.php @@ -9,14 +9,12 @@ */ namespace Phalcon; -use Throwable; - /** * Phalcon\Exception * * All framework exceptions should use or extend this exception */ -class Exception extends \Exception implements Throwable +class Exception extends \Exception implements \Throwable { /** diff --git a/src/Phalcon/Filter.php b/src/Phalcon/Filter.php index 64416762..5f305fa2 100644 --- a/src/Phalcon/Filter.php +++ b/src/Phalcon/Filter.php @@ -16,7 +16,7 @@ /** * Lazy loads, stores and exposes sanitizer objects */ -class Filter implements FilterInterface +class Filter implements \Phalcon\Filter\FilterInterface { const FILTER_ABSINT = 'absint'; diff --git a/src/Phalcon/Flash/AbstractFlash.php b/src/Phalcon/Flash/AbstractFlash.php index 03f20ae9..1b10e461 100644 --- a/src/Phalcon/Flash/AbstractFlash.php +++ b/src/Phalcon/Flash/AbstractFlash.php @@ -24,7 +24,7 @@ * $flash->error("Cannot open the file"); * ``` */ -abstract class AbstractFlash extends AbstractInjectionAware implements FlashInterface +abstract class AbstractFlash extends AbstractInjectionAware implements \Phalcon\Flash\FlashInterface { /** * @var bool @@ -91,10 +91,10 @@ public function getCustomTemplate(): string /** * Phalcon\Flash constructor * - * @param EscaperInterface $escaper - * @param SessionInterface $session + * @param \Phalcon\Escaper\EscaperInterface $escaper + * @param \Phalcon\Session\ManagerInterface $session */ - public function __construct(EscaperInterface $escaper = null, SessionInterface $session = null) + public function __construct(\Phalcon\Escaper\EscaperInterface $escaper = null, \Phalcon\Session\ManagerInterface $session = null) { } @@ -187,10 +187,10 @@ public function setCustomTemplate(string $customTemplate): FlashInterface /** * Sets the Escaper Service * - * @param EscaperInterface $escaperService + * @param \Phalcon\Escaper\EscaperInterface $escaperService * @return FlashInterface */ - public function setEscaperService(EscaperInterface $escaperService): FlashInterface + public function setEscaperService(\Phalcon\Escaper\EscaperInterface $escaperService): FlashInterface { } diff --git a/src/Phalcon/Flash/Direct.php b/src/Phalcon/Flash/Direct.php index 6291d331..e4a809ee 100644 --- a/src/Phalcon/Flash/Direct.php +++ b/src/Phalcon/Flash/Direct.php @@ -13,7 +13,7 @@ * This is a variant of the Phalcon\Flash that immediately outputs any message * passed to it */ -class Direct extends AbstractFlash +class Direct extends \Phalcon\Flash\AbstractFlash { /** diff --git a/src/Phalcon/Flash/Session.php b/src/Phalcon/Flash/Session.php index 12ef6ba9..63883d67 100644 --- a/src/Phalcon/Flash/Session.php +++ b/src/Phalcon/Flash/Session.php @@ -16,7 +16,7 @@ * Temporarily stores the messages in session, then messages can be printed in * the next request */ -class Session extends AbstractFlash +class Session extends \Phalcon\Flash\AbstractFlash { /** diff --git a/src/Phalcon/Forms/Element/AbstractElement.php b/src/Phalcon/Forms/Element/AbstractElement.php index 9a1943fd..2ca9ed18 100644 --- a/src/Phalcon/Forms/Element/AbstractElement.php +++ b/src/Phalcon/Forms/Element/AbstractElement.php @@ -20,7 +20,7 @@ /** * This is a base class for form elements */ -abstract class AbstractElement implements ElementInterface +abstract class AbstractElement implements \Phalcon\Forms\Element\ElementInterface { protected $attributes; @@ -84,20 +84,20 @@ public function addFilter(string $filter): ElementInterface /** * Adds a validator to the element * - * @param ValidatorInterface $validator + * @param \Phalcon\Validation\ValidatorInterface $validator * @return ElementInterface */ - public function addValidator(ValidatorInterface $validator): ElementInterface + public function addValidator(\Phalcon\Validation\ValidatorInterface $validator): ElementInterface { } /** * Adds a group of validators * - * @param ValidatorInterface[] validators + * @param \Phalcon\Validation\ValidatorInterface[] validators * @param bool $merge * @param array $validators - * @param ValidatorInterface[] validators + * @param \Phalcon\Validation\ValidatorInterface [] validators * @return ElementInterface */ public function addValidators(array $validators, bool $merge = true): ElementInterface @@ -107,10 +107,10 @@ public function addValidators(array $validators, bool $merge = true): ElementInt /** * Appends a message to the internal message list * - * @param MessageInterface $message + * @param \Phalcon\Messages\MessageInterface $message * @return ElementInterface */ - public function appendMessage(MessageInterface $message): ElementInterface + public function appendMessage(\Phalcon\Messages\MessageInterface $message): ElementInterface { } @@ -221,7 +221,7 @@ public function getUserOptions(): array /** * Returns the validators registered for the element * - * @return array|ValidatorInterface[] + * @return array|\Phalcon\Validation\ValidatorInterface[] */ public function getValidators(): array { @@ -312,10 +312,10 @@ public function setFilters($filters): ElementInterface /** * Sets the parent form to the element * - * @param Form $form + * @param \Phalcon\Forms\Form $form * @return ElementInterface */ - public function setForm(Form $form): ElementInterface + public function setForm(\Phalcon\Forms\Form $form): ElementInterface { } @@ -332,10 +332,10 @@ public function setLabel(string $label): ElementInterface /** * Sets the validation messages related to the element * - * @param Messages $messages + * @param \Phalcon\Messages\Messages $messages * @return ElementInterface */ - public function setMessages(Messages $messages): ElementInterface + public function setMessages(\Phalcon\Messages\Messages $messages): ElementInterface { } diff --git a/src/Phalcon/Forms/Element/Check.php b/src/Phalcon/Forms/Element/Check.php index 9ce32d61..63630147 100644 --- a/src/Phalcon/Forms/Element/Check.php +++ b/src/Phalcon/Forms/Element/Check.php @@ -16,7 +16,7 @@ * * Component INPUT[type=check] for forms */ -class Check extends AbstractElement +class Check extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Date.php b/src/Phalcon/Forms/Element/Date.php index 40333ec2..76ba07f9 100644 --- a/src/Phalcon/Forms/Element/Date.php +++ b/src/Phalcon/Forms/Element/Date.php @@ -14,7 +14,7 @@ /** * Component INPUT[type=date] for forms */ -class Date extends AbstractElement +class Date extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/ElementInterface.php b/src/Phalcon/Forms/Element/ElementInterface.php index 9c4a2407..6031abf4 100644 --- a/src/Phalcon/Forms/Element/ElementInterface.php +++ b/src/Phalcon/Forms/Element/ElementInterface.php @@ -31,18 +31,18 @@ public function addFilter(string $filter): ElementInterface; /** * Adds a validator to the element * - * @param ValidatorInterface $validator + * @param \Phalcon\Validation\ValidatorInterface $validator * @return ElementInterface */ - public function addValidator(ValidatorInterface $validator): ElementInterface; + public function addValidator(\Phalcon\Validation\ValidatorInterface $validator): ElementInterface; /** * Adds a group of validators * - * @param ValidatorInterface[] + * @param \Phalcon\Validation\ValidatorInterface[] * @param array $validators * @param bool $merge - * @param ValidatorInterface[] + * @param \Phalcon\Validation\ValidatorInterface [] * @return ElementInterface */ public function addValidators(array $validators, bool $merge = true): ElementInterface; @@ -50,10 +50,10 @@ public function addValidators(array $validators, bool $merge = true): ElementInt /** * Appends a message to the internal message list * - * @param MessageInterface $message + * @param \Phalcon\Messages\MessageInterface $message * @return ElementInterface */ - public function appendMessage(MessageInterface $message): ElementInterface; + public function appendMessage(\Phalcon\Messages\MessageInterface $message): ElementInterface; /** * Clears every element in the form to its default value @@ -140,7 +140,7 @@ public function getUserOptions(): array; /** * Returns the validators registered for the element * - * @return array|ValidatorInterface[] + * @return array|\Phalcon\Validation\ValidatorInterface[] */ public function getValidators(): array; @@ -220,10 +220,10 @@ public function setFilters($filters): ElementInterface; /** * Sets the parent form to the element * - * @param Form $form + * @param \Phalcon\Forms\Form $form * @return ElementInterface */ - public function setForm(Form $form): ElementInterface; + public function setForm(\Phalcon\Forms\Form $form): ElementInterface; /** * Sets the element label @@ -236,10 +236,10 @@ public function setLabel(string $label): ElementInterface; /** * Sets the validation messages related to the element * - * @param Messages $messages + * @param \Phalcon\Messages\Messages $messages * @return ElementInterface */ - public function setMessages(Messages $messages): ElementInterface; + public function setMessages(\Phalcon\Messages\Messages $messages): ElementInterface; /** * Sets the element's name diff --git a/src/Phalcon/Forms/Element/Email.php b/src/Phalcon/Forms/Element/Email.php index 7a58ffa6..c6e051f4 100644 --- a/src/Phalcon/Forms/Element/Email.php +++ b/src/Phalcon/Forms/Element/Email.php @@ -16,7 +16,7 @@ * * Component INPUT[type=email] for forms */ -class Email extends AbstractElement +class Email extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/File.php b/src/Phalcon/Forms/Element/File.php index 6dd55786..d40ca6e8 100644 --- a/src/Phalcon/Forms/Element/File.php +++ b/src/Phalcon/Forms/Element/File.php @@ -14,7 +14,7 @@ /** * Component INPUT[type=file] for forms */ -class File extends AbstractElement +class File extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Hidden.php b/src/Phalcon/Forms/Element/Hidden.php index 8d9c5427..3357ded8 100644 --- a/src/Phalcon/Forms/Element/Hidden.php +++ b/src/Phalcon/Forms/Element/Hidden.php @@ -16,7 +16,7 @@ * * Component INPUT[type=hidden] for forms */ -class Hidden extends AbstractElement +class Hidden extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Numeric.php b/src/Phalcon/Forms/Element/Numeric.php index df7c8601..1e72b598 100644 --- a/src/Phalcon/Forms/Element/Numeric.php +++ b/src/Phalcon/Forms/Element/Numeric.php @@ -16,7 +16,7 @@ * * Component INPUT[type=number] for forms */ -class Numeric extends AbstractElement +class Numeric extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Password.php b/src/Phalcon/Forms/Element/Password.php index 6babba80..af663d86 100644 --- a/src/Phalcon/Forms/Element/Password.php +++ b/src/Phalcon/Forms/Element/Password.php @@ -16,7 +16,7 @@ * * Component INPUT[type=password] for forms */ -class Password extends AbstractElement +class Password extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Radio.php b/src/Phalcon/Forms/Element/Radio.php index 253a5c17..ef3b2ed1 100644 --- a/src/Phalcon/Forms/Element/Radio.php +++ b/src/Phalcon/Forms/Element/Radio.php @@ -16,7 +16,7 @@ * * Component INPUT[type=radio] for forms */ -class Radio extends AbstractElement +class Radio extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Select.php b/src/Phalcon/Forms/Element/Select.php index df267de8..0a2c78c7 100644 --- a/src/Phalcon/Forms/Element/Select.php +++ b/src/Phalcon/Forms/Element/Select.php @@ -16,7 +16,7 @@ * * Component SELECT (choice) for forms */ -class Select extends AbstractElement +class Select extends \Phalcon\Forms\Element\AbstractElement { protected $optionsValues; diff --git a/src/Phalcon/Forms/Element/Submit.php b/src/Phalcon/Forms/Element/Submit.php index 276ff6d2..7b4052fa 100644 --- a/src/Phalcon/Forms/Element/Submit.php +++ b/src/Phalcon/Forms/Element/Submit.php @@ -14,7 +14,7 @@ /** * Component INPUT[type=submit] for forms */ -class Submit extends AbstractElement +class Submit extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/Text.php b/src/Phalcon/Forms/Element/Text.php index 70d25940..ff3a434d 100644 --- a/src/Phalcon/Forms/Element/Text.php +++ b/src/Phalcon/Forms/Element/Text.php @@ -16,7 +16,7 @@ * * Component INPUT[type=text] for forms */ -class Text extends AbstractElement +class Text extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Element/TextArea.php b/src/Phalcon/Forms/Element/TextArea.php index 3d256b98..f7885541 100644 --- a/src/Phalcon/Forms/Element/TextArea.php +++ b/src/Phalcon/Forms/Element/TextArea.php @@ -14,7 +14,7 @@ /** * Component TEXTAREA for forms */ -class TextArea extends AbstractElement +class TextArea extends \Phalcon\Forms\Element\AbstractElement { /** diff --git a/src/Phalcon/Forms/Form.php b/src/Phalcon/Forms/Form.php index e36e9013..1ac7c1b0 100644 --- a/src/Phalcon/Forms/Form.php +++ b/src/Phalcon/Forms/Form.php @@ -25,7 +25,7 @@ /** * This component allows to build forms using an object-oriented interface */ -class Form extends Injectable implements Countable, Iterator, AttributesInterface +class Form extends Injectable implements \Countable, \Iterator, \Phalcon\Html\Attributes\AttributesInterface { /** * @var Attributes | null @@ -82,12 +82,12 @@ public function __construct($entity = null, array $userOptions = array()) /** * Adds an element to the form * - * @param ElementInterface $element + * @param \Phalcon\Forms\Element\ElementInterface $element * @param string $position * @param bool $type * @return Form */ - public function add(ElementInterface $element, string $position = null, bool $type = null): Form + public function add(\Phalcon\Forms\Element\ElementInterface $element, string $position = null, bool $type = null): Form { } @@ -162,7 +162,7 @@ public function getAttributes(): Attributes /** * Returns the form elements added to the form * - * @return array|ElementInterface[] + * @return array|\Phalcon\Forms\Element\ElementInterface[] */ public function getElements(): array { @@ -359,10 +359,10 @@ public function setEntity($entity): Form /** * Set form attributes collection * - * @param Attributes $attributes + * @param \Phalcon\Html\Attributes $attributes * @return AttributesInterface */ - public function setAttributes(Attributes $attributes): AttributesInterface + public function setAttributes(\Phalcon\Html\Attributes $attributes): AttributesInterface { } diff --git a/src/Phalcon/Helper/Json.php b/src/Phalcon/Helper/Json.php index 26699f9e..caab0ece 100644 --- a/src/Phalcon/Helper/Json.php +++ b/src/Phalcon/Helper/Json.php @@ -40,7 +40,7 @@ class Json * * @return mixed * - * @throws InvalidArgumentException if the JSON cannot be decoded. + * @throws \InvalidArgumentException if the JSON cannot be decoded. * @link http://www.php.net/manual/en/function.json-decode.php */ final public static function decode(string $data, bool $associative = false, int $depth = 512, int $options = 0) @@ -69,7 +69,7 @@ final public static function decode(string $data, bool $associative = false, int * * @return mixed * - * @throws InvalidArgumentException if the JSON cannot be encoded. + * @throws \InvalidArgumentException if the JSON cannot be encoded. * @link http://www.php.net/manual/en/function.json-encode.php */ final public static function encode($data, int $options = 0, int $depth = 512): string diff --git a/src/Phalcon/Html/Attributes.php b/src/Phalcon/Html/Attributes.php index b7053c2c..3f4148c6 100644 --- a/src/Phalcon/Html/Attributes.php +++ b/src/Phalcon/Html/Attributes.php @@ -16,7 +16,7 @@ /** * This class helps to work with HTML Attributes */ -class Attributes extends Collection implements RenderInterface +class Attributes extends Collection implements \Phalcon\Html\Attributes\RenderInterface { /** diff --git a/src/Phalcon/Html/Attributes/AttributesInterface.php b/src/Phalcon/Html/Attributes/AttributesInterface.php index c5a8cc33..8d5a50e0 100644 --- a/src/Phalcon/Html/Attributes/AttributesInterface.php +++ b/src/Phalcon/Html/Attributes/AttributesInterface.php @@ -29,8 +29,8 @@ public function getAttributes(): Attributes; /** * Set Attributes * - * @param Attributes $attributes + * @param \Phalcon\Html\Attributes $attributes * @return AttributesInterface */ - public function setAttributes(Attributes $attributes): AttributesInterface; + public function setAttributes(\Phalcon\Html\Attributes $attributes): AttributesInterface; } diff --git a/src/Phalcon/Html/Helper/AbstractHelper.php b/src/Phalcon/Html/Helper/AbstractHelper.php index 9acb013a..6e927824 100644 --- a/src/Phalcon/Html/Helper/AbstractHelper.php +++ b/src/Phalcon/Html/Helper/AbstractHelper.php @@ -28,9 +28,9 @@ abstract class AbstractHelper /** * Constructor * - * @param EscaperInterface $escaper + * @param \Phalcon\Escaper\EscaperInterface $escaper */ - public function __construct(EscaperInterface $escaper) + public function __construct(\Phalcon\Escaper\EscaperInterface $escaper) { } diff --git a/src/Phalcon/Html/Helper/Anchor.php b/src/Phalcon/Html/Helper/Anchor.php index f4cebb00..2624e59f 100644 --- a/src/Phalcon/Html/Helper/Anchor.php +++ b/src/Phalcon/Html/Helper/Anchor.php @@ -14,7 +14,7 @@ * * Creates an anchor */ -class Anchor extends AbstractHelper +class Anchor extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/AnchorRaw.php b/src/Phalcon/Html/Helper/AnchorRaw.php index 190b1631..402f7bde 100644 --- a/src/Phalcon/Html/Helper/AnchorRaw.php +++ b/src/Phalcon/Html/Helper/AnchorRaw.php @@ -14,7 +14,7 @@ * * Creates a raw anchor */ -class AnchorRaw extends AbstractHelper +class AnchorRaw extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Body.php b/src/Phalcon/Html/Helper/Body.php index c5d75d52..6584697d 100644 --- a/src/Phalcon/Html/Helper/Body.php +++ b/src/Phalcon/Html/Helper/Body.php @@ -14,7 +14,7 @@ * * Creates a body tag */ -class Body extends AbstractHelper +class Body extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Button.php b/src/Phalcon/Html/Helper/Button.php index d777d6aa..75de0d32 100644 --- a/src/Phalcon/Html/Helper/Button.php +++ b/src/Phalcon/Html/Helper/Button.php @@ -14,7 +14,7 @@ * * Creates a button tag */ -class Button extends AbstractHelper +class Button extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Close.php b/src/Phalcon/Html/Helper/Close.php index 1cfd1b89..3077a9fc 100644 --- a/src/Phalcon/Html/Helper/Close.php +++ b/src/Phalcon/Html/Helper/Close.php @@ -14,7 +14,7 @@ * * Creates a closing tag */ -class Close extends AbstractHelper +class Close extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Element.php b/src/Phalcon/Html/Helper/Element.php index d7e41795..ec33c18b 100644 --- a/src/Phalcon/Html/Helper/Element.php +++ b/src/Phalcon/Html/Helper/Element.php @@ -14,7 +14,7 @@ * * Creates an element */ -class Element extends AbstractHelper +class Element extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/ElementRaw.php b/src/Phalcon/Html/Helper/ElementRaw.php index 3131133f..e59e6900 100644 --- a/src/Phalcon/Html/Helper/ElementRaw.php +++ b/src/Phalcon/Html/Helper/ElementRaw.php @@ -16,7 +16,7 @@ * * Creates an element raw */ -class ElementRaw extends AbstractHelper +class ElementRaw extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Form.php b/src/Phalcon/Html/Helper/Form.php index 7962f26d..41e5fd76 100644 --- a/src/Phalcon/Html/Helper/Form.php +++ b/src/Phalcon/Html/Helper/Form.php @@ -14,7 +14,7 @@ * * Creates a form opening tag */ -class Form extends AbstractHelper +class Form extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Img.php b/src/Phalcon/Html/Helper/Img.php index e13cbc34..1ae6623c 100644 --- a/src/Phalcon/Html/Helper/Img.php +++ b/src/Phalcon/Html/Helper/Img.php @@ -16,7 +16,7 @@ * * Creates am img tag */ -class Img extends AbstractHelper +class Img extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/Label.php b/src/Phalcon/Html/Helper/Label.php index 646521a6..cf170cb5 100644 --- a/src/Phalcon/Html/Helper/Label.php +++ b/src/Phalcon/Html/Helper/Label.php @@ -16,7 +16,7 @@ * * Creates a label */ -class Label extends AbstractHelper +class Label extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Helper/TextArea.php b/src/Phalcon/Html/Helper/TextArea.php index fdc0460c..63fe97a0 100644 --- a/src/Phalcon/Html/Helper/TextArea.php +++ b/src/Phalcon/Html/Helper/TextArea.php @@ -14,7 +14,7 @@ * * Creates a textarea tag */ -class TextArea extends AbstractHelper +class TextArea extends \Phalcon\Html\Helper\AbstractHelper { /** diff --git a/src/Phalcon/Html/Link/EvolvableLink.php b/src/Phalcon/Html/Link/EvolvableLink.php index 7c7021be..36576364 100644 --- a/src/Phalcon/Html/Link/EvolvableLink.php +++ b/src/Phalcon/Html/Link/EvolvableLink.php @@ -19,7 +19,7 @@ * @property array rels * @property bool templated */ -class EvolvableLink extends Link implements EvolvableLinkInterface +class EvolvableLink extends \Phalcon\Html\Link\Link implements \Psr\Link\EvolvableLinkInterface { /** diff --git a/src/Phalcon/Html/Link/EvolvableLinkProvider.php b/src/Phalcon/Html/Link/EvolvableLinkProvider.php index b71635a0..46df0820 100644 --- a/src/Phalcon/Html/Link/EvolvableLinkProvider.php +++ b/src/Phalcon/Html/Link/EvolvableLinkProvider.php @@ -17,7 +17,7 @@ * * @property LinkInterface[] links */ -class EvolvableLinkProvider extends LinkProvider implements EvolvableLinkProviderInterface +class EvolvableLinkProvider extends \Phalcon\Html\Link\LinkProvider implements \Psr\Link\EvolvableLinkProviderInterface { /** @@ -31,7 +31,7 @@ class EvolvableLinkProvider extends LinkProvider implements EvolvableLinkProvide * * @return static */ - public function withLink(LinkInterface $link) + public function withLink(\Psr\Link\LinkInterface $link) { } @@ -46,7 +46,7 @@ public function withLink(LinkInterface $link) * * @return static */ - public function withoutLink(LinkInterface $link) + public function withoutLink(\Psr\Link\LinkInterface $link) { } } diff --git a/src/Phalcon/Html/Link/Link.php b/src/Phalcon/Html/Link/Link.php index cd43bba5..96a73caa 100644 --- a/src/Phalcon/Html/Link/Link.php +++ b/src/Phalcon/Html/Link/Link.php @@ -20,7 +20,7 @@ * @property array rels * @property bool templated */ -class Link implements LinkInterface +class Link implements \Psr\Link\LinkInterface { /** * @var Collection diff --git a/src/Phalcon/Html/Link/LinkProvider.php b/src/Phalcon/Html/Link/LinkProvider.php index 8628404d..a7829ba5 100644 --- a/src/Phalcon/Html/Link/LinkProvider.php +++ b/src/Phalcon/Html/Link/LinkProvider.php @@ -11,14 +11,13 @@ use Psr\Link\LinkInterface; use Psr\Link\LinkProviderInterface; -use Traversable; /** * Class Phalcon\Http\Link\LinkProvider * * @property LinkInterface[] links */ -class LinkProvider implements LinkProviderInterface +class LinkProvider implements \Psr\Link\LinkProviderInterface { /** * @var LinkInterface[] @@ -41,7 +40,7 @@ public function __construct(array $links = array()) * The iterable may be an array or any PHP \Traversable object. If no links * are available, an empty array or \Traversable MUST be returned. * - * @return LinkInterface[]|Traversable + * @return LinkInterface[]|\Traversable */ public function getLinks() { @@ -68,7 +67,7 @@ public function getLinksByRel($rel) * @param LinkInterface $link * * @return string */ - protected function getKey(LinkInterface $link): string + protected function getKey(\Psr\Link\LinkInterface $link): string { } } diff --git a/src/Phalcon/Html/Link/Serializer/Header.php b/src/Phalcon/Html/Link/Serializer/Header.php index 91576e35..cd9f5957 100644 --- a/src/Phalcon/Html/Link/Serializer/Header.php +++ b/src/Phalcon/Html/Link/Serializer/Header.php @@ -14,7 +14,7 @@ /** * Class Phalcon\Http\Link\Serializer\Header */ -class Header implements SerializerInterface +class Header implements \Phalcon\Html\Link\Serializer\SerializerInterface { /** diff --git a/src/Phalcon/Html/TagFactory.php b/src/Phalcon/Html/TagFactory.php index e58eae95..a492e0de 100644 --- a/src/Phalcon/Html/TagFactory.php +++ b/src/Phalcon/Html/TagFactory.php @@ -27,10 +27,10 @@ class TagFactory extends AbstractFactory /** * TagFactory constructor. * - * @param EscaperInterface $escaper + * @param \Phalcon\Escaper\EscaperInterface $escaper * @param array $services */ - public function __construct(EscaperInterface $escaper, array $services = array()) + public function __construct(\Phalcon\Escaper\EscaperInterface $escaper, array $services = array()) { } diff --git a/src/Phalcon/Http/Cookie.php b/src/Phalcon/Http/Cookie.php index e1bc8f3c..74b700f3 100644 --- a/src/Phalcon/Http/Cookie.php +++ b/src/Phalcon/Http/Cookie.php @@ -14,6 +14,7 @@ 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; @@ -22,7 +23,7 @@ /** * Provide OO wrappers to manage a HTTP cookie. */ -class Cookie extends AbstractInjectionAware implements CookieInterface +class Cookie extends AbstractInjectionAware implements \Phalcon\Http\Cookie\CookieInterface { /** * @var string @@ -298,10 +299,10 @@ public function setSecure(bool $secure): CookieInterface * * Use NULL to disable cookie signing. * + * @see \Phalcon\Security\Random + * @throws \Phalcon\Http\Cookie\Exception * @param string $signKey * @return CookieInterface - *@throws CookieException - * @see \Phalcon\Security\Random */ public function setSignKey(string $signKey = null): CookieInterface { @@ -330,9 +331,9 @@ public function useEncryption(bool $useEncryption): CookieInterface /** * Assert the cookie's key is enough long. * + * @throws \Phalcon\Http\Cookie\Exception * @param string $signKey * @return void - *@throws CookieException */ protected function assertSignKeyIsLongEnough(string $signKey) { diff --git a/src/Phalcon/Http/Message/AbstractMessage.php b/src/Phalcon/Http/Message/AbstractMessage.php index 51d055ff..8073f424 100644 --- a/src/Phalcon/Http/Message/AbstractMessage.php +++ b/src/Phalcon/Http/Message/AbstractMessage.php @@ -17,7 +17,7 @@ /** * Message methods */ -abstract class AbstractMessage extends AbstractCommon +abstract class AbstractMessage extends \Phalcon\Http\Message\AbstractCommon { /** * Gets the body of the message. @@ -203,7 +203,7 @@ public function withAddedHeader($name, $value) * @throws InvalidArgumentException When the body is not valid. * */ - public function withBody(StreamInterface $body) + public function withBody(\Psr\Http\Message\StreamInterface $body) { } @@ -276,7 +276,7 @@ public function withoutHeader($name) * * @return Collection */ - final protected function checkHeaderHost(Collection $collection): Collection + final protected function checkHeaderHost(\Phalcon\Collection $collection): Collection { } @@ -359,7 +359,7 @@ final protected function getHeaderValue($values): array * * @return string */ - final protected function getUriHost(UriInterface $uri): string + final protected function getUriHost(\Psr\Http\Message\UriInterface $uri): string { } diff --git a/src/Phalcon/Http/Message/AbstractRequest.php b/src/Phalcon/Http/Message/AbstractRequest.php index 7d34aff6..518d3c3c 100644 --- a/src/Phalcon/Http/Message/AbstractRequest.php +++ b/src/Phalcon/Http/Message/AbstractRequest.php @@ -16,7 +16,7 @@ /** * Request methods */ -abstract class AbstractRequest extends AbstractMessage +abstract class AbstractRequest extends \Phalcon\Http\Message\AbstractMessage { /** * Retrieves the HTTP method of the request. @@ -158,7 +158,7 @@ public function withRequestTarget($requestTarget) * * @return object */ - public function withUri(UriInterface $uri, $preserveHost = false) + public function withUri(\Psr\Http\Message\UriInterface $uri, $preserveHost = false) { } diff --git a/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php b/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php index 22146596..9ceabc76 100644 --- a/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php +++ b/src/Phalcon/Http/Message/Exception/InvalidArgumentException.php @@ -19,7 +19,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class InvalidArgumentException extends \InvalidArgumentException implements Throwable +class InvalidArgumentException extends \InvalidArgumentException implements \Throwable { } diff --git a/src/Phalcon/Http/Message/Request.php b/src/Phalcon/Http/Message/Request.php index e74d9cc2..ec21b4b3 100644 --- a/src/Phalcon/Http/Message/Request.php +++ b/src/Phalcon/Http/Message/Request.php @@ -18,7 +18,7 @@ /** * PSR-7 Request */ -final class Request extends AbstractRequest implements RequestInterface +final class Request extends AbstractRequest implements \Psr\Http\Message\RequestInterface { /** diff --git a/src/Phalcon/Http/Message/RequestFactory.php b/src/Phalcon/Http/Message/RequestFactory.php index f4afc838..10fa956d 100644 --- a/src/Phalcon/Http/Message/RequestFactory.php +++ b/src/Phalcon/Http/Message/RequestFactory.php @@ -16,7 +16,7 @@ /** * PSR-17 RequestFactory */ -final class RequestFactory implements RequestFactoryInterface +final class RequestFactory implements \Psr\Http\Message\RequestFactoryInterface { /** diff --git a/src/Phalcon/Http/Message/Response.php b/src/Phalcon/Http/Message/Response.php index 260d8a0a..4a3a56c6 100644 --- a/src/Phalcon/Http/Message/Response.php +++ b/src/Phalcon/Http/Message/Response.php @@ -17,7 +17,7 @@ /** * PSR-7 Response */ -final class Response extends AbstractMessage implements ResponseInterface +final class Response extends AbstractMessage implements \Psr\Http\Message\ResponseInterface { /** * Gets the response reason phrase associated with the status code. diff --git a/src/Phalcon/Http/Message/ResponseFactory.php b/src/Phalcon/Http/Message/ResponseFactory.php index f3339e3e..44d9504c 100644 --- a/src/Phalcon/Http/Message/ResponseFactory.php +++ b/src/Phalcon/Http/Message/ResponseFactory.php @@ -15,7 +15,7 @@ /** * PSR-17 ResponseFactory */ -final class ResponseFactory implements ResponseFactoryInterface +final class ResponseFactory implements \Psr\Http\Message\ResponseFactoryInterface { /** diff --git a/src/Phalcon/Http/Message/ServerRequest.php b/src/Phalcon/Http/Message/ServerRequest.php index d8241d01..ea5bf989 100644 --- a/src/Phalcon/Http/Message/ServerRequest.php +++ b/src/Phalcon/Http/Message/ServerRequest.php @@ -20,7 +20,7 @@ /** * PSR-7 ServerRequest */ -final class ServerRequest extends AbstractRequest implements ServerRequestInterface +final class ServerRequest extends \Phalcon\Http\Message\AbstractRequest implements \Psr\Http\Message\ServerRequestInterface { /** * @var Collection diff --git a/src/Phalcon/Http/Message/ServerRequestFactory.php b/src/Phalcon/Http/Message/ServerRequestFactory.php index 6e028873..d224212d 100644 --- a/src/Phalcon/Http/Message/ServerRequestFactory.php +++ b/src/Phalcon/Http/Message/ServerRequestFactory.php @@ -20,7 +20,7 @@ /** * PSR-17 ServerRequestFactory */ -class ServerRequestFactory implements ServerRequestFactoryInterface +class ServerRequestFactory implements \Psr\Http\Message\ServerRequestFactoryInterface { /** @@ -84,7 +84,7 @@ protected function getHeaders() * * @return array */ - private function calculateUriHost(Collection $server, Collection $headers): array + private function calculateUriHost(\Phalcon\Collection $server, \Phalcon\Collection $headers): array { } @@ -107,7 +107,7 @@ private function calculateUriHostFromHeader(string $host): array * * @return string */ - private function calculateUriPath(Collection $server): string + private function calculateUriPath(\Phalcon\Collection $server): string { } @@ -118,7 +118,7 @@ private function calculateUriPath(Collection $server): string * * @return string */ - private function calculateUriQuery(Collection $server): string + private function calculateUriQuery(\Phalcon\Collection $server): string { } @@ -130,7 +130,7 @@ private function calculateUriQuery(Collection $server): string * * @return string */ - private function calculateUriScheme(Collection $server, Collection $headers): string + private function calculateUriScheme(\Phalcon\Collection $server, \Phalcon\Collection $headers): string { } @@ -168,7 +168,7 @@ private function createUploadedFile(array $file): UploadedFile * * @return mixed|string */ - private function getHeader(Collection $headers, string $name, $defaultValue = null) + private function getHeader(\Phalcon\Collection $headers, string $name, $defaultValue = null) { } @@ -191,7 +191,7 @@ private function parseCookieHeader(string $cookieHeader): array * * @return Collection */ - private function parseHeaders(Collection $server): Collection + private function parseHeaders(\Phalcon\Collection $server): Collection { } @@ -202,7 +202,7 @@ private function parseHeaders(Collection $server): Collection * * @return string */ - private function parseProtocol(Collection $server): string + private function parseProtocol(\Phalcon\Collection $server): string { } @@ -239,7 +239,7 @@ private function parseUploadedFiles(array $files): Collection * * @return Uri */ - private function parseUri(Collection $server, Collection $headers): Uri + private function parseUri(\Phalcon\Collection $server, \Phalcon\Collection $headers): Uri { } } diff --git a/src/Phalcon/Http/Message/Stream.php b/src/Phalcon/Http/Message/Stream.php index 147729bb..285e05ba 100644 --- a/src/Phalcon/Http/Message/Stream.php +++ b/src/Phalcon/Http/Message/Stream.php @@ -17,7 +17,7 @@ /** * PSR-7 Stream */ -class Stream implements StreamInterface +class Stream implements \Psr\Http\Message\StreamInterface { /** * @var resource | null diff --git a/src/Phalcon/Http/Message/StreamFactory.php b/src/Phalcon/Http/Message/StreamFactory.php index ed5c5f7e..9a1c4b9f 100644 --- a/src/Phalcon/Http/Message/StreamFactory.php +++ b/src/Phalcon/Http/Message/StreamFactory.php @@ -16,7 +16,7 @@ /** * PSR-17 StreamFactory */ -final class StreamFactory implements StreamFactoryInterface +final class StreamFactory implements \Psr\Http\Message\StreamFactoryInterface { /** diff --git a/src/Phalcon/Http/Message/UploadedFile.php b/src/Phalcon/Http/Message/UploadedFile.php index 7f76ed9c..89c07508 100644 --- a/src/Phalcon/Http/Message/UploadedFile.php +++ b/src/Phalcon/Http/Message/UploadedFile.php @@ -20,7 +20,7 @@ /** * PSR-7 UploadedFile */ -final class UploadedFile implements UploadedFileInterface +final class UploadedFile implements \Psr\Http\Message\UploadedFileInterface { /** * If the file has already been moved, we hold that status here diff --git a/src/Phalcon/Http/Message/UploadedFileFactory.php b/src/Phalcon/Http/Message/UploadedFileFactory.php index 8d9f9bc6..a8c31f4e 100644 --- a/src/Phalcon/Http/Message/UploadedFileFactory.php +++ b/src/Phalcon/Http/Message/UploadedFileFactory.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Http\Message; -use InvalidArgumentException; use Psr\Http\Message\StreamInterface; use Psr\Http\Message\UploadedFileInterface; use Psr\Http\Message\UploadedFileFactoryInterface; @@ -17,7 +16,7 @@ /** * PSR-17 UploadedFileFactory */ -final class UploadedFileFactory implements UploadedFileFactoryInterface +final class UploadedFileFactory implements \Psr\Http\Message\UploadedFileFactoryInterface { /** @@ -36,10 +35,10 @@ final class UploadedFileFactory implements UploadedFileFactoryInterface * @param string $clientFilename The filename as provided by the client, if any. * @param string $clientMediaType The media type as provided by the client, if any. * - * @throws InvalidArgumentException If the file resource is not readable. + * @throws \InvalidArgumentException If the file resource is not readable. * @return UploadedFileInterface */ - public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = 0, string $clientFilename = null, string $clientMediaType = null): UploadedFileInterface + public function createUploadedFile(\Psr\Http\Message\StreamInterface $stream, int $size = null, int $error = 0, string $clientFilename = null, string $clientMediaType = null): UploadedFileInterface { } } diff --git a/src/Phalcon/Http/Message/Uri.php b/src/Phalcon/Http/Message/Uri.php index 8b8351c3..2f912be5 100644 --- a/src/Phalcon/Http/Message/Uri.php +++ b/src/Phalcon/Http/Message/Uri.php @@ -17,7 +17,7 @@ /** * PSR-7 Uri */ -final class Uri extends AbstractCommon implements UriInterface +final class Uri extends \Phalcon\Http\Message\AbstractCommon implements \Psr\Http\Message\UriInterface { /** * Returns the fragment of the URL diff --git a/src/Phalcon/Http/Message/UriFactory.php b/src/Phalcon/Http/Message/UriFactory.php index ba42c217..221ceffd 100644 --- a/src/Phalcon/Http/Message/UriFactory.php +++ b/src/Phalcon/Http/Message/UriFactory.php @@ -15,7 +15,7 @@ /** * PSR-17 UriFactory */ -final class UriFactory implements UriFactoryInterface +final class UriFactory implements \Psr\Http\Message\UriFactoryInterface { /** diff --git a/src/Phalcon/Http/Request.php b/src/Phalcon/Http/Request.php index 0031f311..bb38b85a 100644 --- a/src/Phalcon/Http/Request.php +++ b/src/Phalcon/Http/Request.php @@ -46,7 +46,7 @@ * $request->getLanguages(); * ``` */ -class Request extends AbstractInjectionAware implements RequestInterface +class Request extends AbstractInjectionAware implements \Phalcon\Http\RequestInterface { private $filterService; @@ -487,7 +487,7 @@ public function getServerName(): string * * @param bool $onlySuccessful * @param bool $namedKeys - * @return array|FileInterface[] + * @return array|\Phalcon\Http\Request\FileInterface[] */ public function getUploadedFiles(bool $onlySuccessful = false, bool $namedKeys = false): array { diff --git a/src/Phalcon/Http/Request/File.php b/src/Phalcon/Http/Request/File.php index 63bfbd7a..eb3c6500 100644 --- a/src/Phalcon/Http/Request/File.php +++ b/src/Phalcon/Http/Request/File.php @@ -32,7 +32,7 @@ * } * ``` */ -class File implements FileInterface +class File implements \Phalcon\Http\Request\FileInterface { /** * @var string|null diff --git a/src/Phalcon/Http/RequestInterface.php b/src/Phalcon/Http/RequestInterface.php index 58a3a666..38efd689 100644 --- a/src/Phalcon/Http/RequestInterface.php +++ b/src/Phalcon/Http/RequestInterface.php @@ -344,7 +344,7 @@ public function getServerName(): string; * * @param bool $onlySuccessful * @param bool $namedKeys - * @return array|FileInterface[] + * @return array|\Phalcon\Http\Request\FileInterface[] */ public function getUploadedFiles(bool $onlySuccessful = false, bool $namedKeys = false): array; diff --git a/src/Phalcon/Http/Response.php b/src/Phalcon/Http/Response.php index d2e3b6fe..e16a08d3 100644 --- a/src/Phalcon/Http/Response.php +++ b/src/Phalcon/Http/Response.php @@ -39,7 +39,7 @@ * $response->send(); * ``` */ -class Response implements ResponseInterface, InjectionAwareInterface, EventsAwareInterface +class Response implements \Phalcon\Http\ResponseInterface, \Phalcon\Di\InjectionAwareInterface, \Phalcon\Events\EventsAwareInterface { protected $container; @@ -322,20 +322,20 @@ public function setContentType(string $contentType, $charset = null): ResponseIn /** * Sets a cookies bag for the response externally * - * @param CookiesInterface $cookies + * @param \Phalcon\Http\Response\CookiesInterface $cookies * @return ResponseInterface */ - public function setCookies(CookiesInterface $cookies): ResponseInterface + public function setCookies(\Phalcon\Http\Response\CookiesInterface $cookies): ResponseInterface { } /** * Sets the dependency injector * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } @@ -366,20 +366,20 @@ public function setEtag(string $etag): ResponseInterface * ); * ``` * - * @param DateTime $datetime + * @param \DateTime $datetime * @return ResponseInterface */ - public function setExpires(DateTime $datetime): ResponseInterface + public function setExpires(\DateTime $datetime): ResponseInterface { } /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } @@ -413,10 +413,10 @@ public function setHeader(string $name, $value): ResponseInterface /** * Sets a headers bag for the response externally * - * @param HeadersInterface $headers + * @param \Phalcon\Http\Response\HeadersInterface $headers * @return ResponseInterface */ - public function setHeaders(HeadersInterface $headers): ResponseInterface + public function setHeaders(\Phalcon\Http\Response\HeadersInterface $headers): ResponseInterface { } @@ -450,10 +450,10 @@ public function setJsonContent($content, int $jsonOptions = 0, int $depth = 512) * ); * ``` * - * @param DateTime $datetime + * @param \DateTime $datetime * @return ResponseInterface */ - public function setLastModified(DateTime $datetime): ResponseInterface + public function setLastModified(\DateTime $datetime): ResponseInterface { } diff --git a/src/Phalcon/Http/Response/Cookies.php b/src/Phalcon/Http/Response/Cookies.php index 881cbda8..c3eaf31d 100644 --- a/src/Phalcon/Http/Response/Cookies.php +++ b/src/Phalcon/Http/Response/Cookies.php @@ -62,7 +62,7 @@ * ); * ``` */ -class Cookies extends AbstractInjectionAware implements CookiesInterface +class Cookies extends AbstractInjectionAware implements \Phalcon\Http\Response\CookiesInterface { protected $cookies = array(); diff --git a/src/Phalcon/Http/Response/Headers.php b/src/Phalcon/Http/Response/Headers.php index 707b88a6..4104cfdd 100644 --- a/src/Phalcon/Http/Response/Headers.php +++ b/src/Phalcon/Http/Response/Headers.php @@ -14,7 +14,7 @@ * * This class is a bag to manage the response headers */ -class Headers implements HeadersInterface +class Headers implements \Phalcon\Http\Response\HeadersInterface { protected $headers = array(); diff --git a/src/Phalcon/Http/ResponseInterface.php b/src/Phalcon/Http/ResponseInterface.php index 3ac6e603..935ced0c 100644 --- a/src/Phalcon/Http/ResponseInterface.php +++ b/src/Phalcon/Http/ResponseInterface.php @@ -109,10 +109,10 @@ public function setContentType(string $contentType, $charset = null): ResponseIn /** * Sets output expire time header * - * @param DateTime $datetime + * @param \DateTime $datetime * @return ResponseInterface */ - public function setExpires(DateTime $datetime): ResponseInterface; + public function setExpires(\DateTime $datetime): ResponseInterface; /** * Sets an attached file to be sent at the end of the request diff --git a/src/Phalcon/Http/Server/AbstractMiddleware.php b/src/Phalcon/Http/Server/AbstractMiddleware.php index b3a2593b..2727615d 100644 --- a/src/Phalcon/Http/Server/AbstractMiddleware.php +++ b/src/Phalcon/Http/Server/AbstractMiddleware.php @@ -21,7 +21,7 @@ * by acting on the request, generating the response, or forwarding the * request to a subsequent middleware and possibly acting on its response. */ -abstract class AbstractMiddleware implements MiddlewareInterface +abstract class AbstractMiddleware implements \Psr\Http\Server\MiddlewareInterface { /** @@ -31,9 +31,9 @@ abstract class AbstractMiddleware implements MiddlewareInterface * If unable to produce the response itself, it may delegate to the provided * request handler to do so. * - * @param ServerRequestInterface $request - * @param RequestHandlerInterface $handler + * @param \Psr\Http\Message\ServerRequestInterface $request + * @param \Psr\Http\Server\RequestHandlerInterface $handler * @return ResponseInterface */ - abstract public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface; + abstract public function process(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Server\RequestHandlerInterface $handler): ResponseInterface; } diff --git a/src/Phalcon/Http/Server/AbstractRequestHandler.php b/src/Phalcon/Http/Server/AbstractRequestHandler.php index a8361e2d..a272d8ae 100644 --- a/src/Phalcon/Http/Server/AbstractRequestHandler.php +++ b/src/Phalcon/Http/Server/AbstractRequestHandler.php @@ -19,7 +19,7 @@ * An HTTP request handler process an HTTP request in order to produce an * HTTP response. */ -abstract class AbstractRequestHandler implements RequestHandlerInterface +abstract class AbstractRequestHandler implements \Psr\Http\Server\RequestHandlerInterface { /** @@ -27,8 +27,8 @@ abstract class AbstractRequestHandler implements RequestHandlerInterface * * May call other collaborating code to generate the response. * - * @param ServerRequestInterface $request + * @param \Psr\Http\Message\ServerRequestInterface $request * @return ResponseInterface */ - abstract public function handle(ServerRequestInterface $request): ResponseInterface; + abstract public function handle(\Psr\Http\Message\ServerRequestInterface $request): ResponseInterface; } diff --git a/src/Phalcon/Image/Adapter/AbstractAdapter.php b/src/Phalcon/Image/Adapter/AbstractAdapter.php index e6047746..5ce3da90 100644 --- a/src/Phalcon/Image/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Image/Adapter/AbstractAdapter.php @@ -17,7 +17,7 @@ * * All image adapters must use this class */ -abstract class AbstractAdapter implements AdapterInterface +abstract class AbstractAdapter implements \Phalcon\Image\Adapter\AdapterInterface { protected static $checked = false; diff --git a/src/Phalcon/Image/Adapter/Gd.php b/src/Phalcon/Image/Adapter/Gd.php index cd1a006b..a413f2ba 100644 --- a/src/Phalcon/Image/Adapter/Gd.php +++ b/src/Phalcon/Image/Adapter/Gd.php @@ -20,7 +20,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Gd extends AbstractAdapter +class Gd extends \Phalcon\Image\Adapter\AbstractAdapter { protected static $checked = false; diff --git a/src/Phalcon/Image/Adapter/Imagick.php b/src/Phalcon/Image/Adapter/Imagick.php index 347aee06..9b28643d 100644 --- a/src/Phalcon/Image/Adapter/Imagick.php +++ b/src/Phalcon/Image/Adapter/Imagick.php @@ -28,7 +28,7 @@ * } * ``` */ -class Imagick extends AbstractAdapter +class Imagick extends \Phalcon\Image\Adapter\AbstractAdapter { protected static $checked = false; diff --git a/src/Phalcon/Image/ImageFactory.php b/src/Phalcon/Image/ImageFactory.php index 2627333d..f25b6d72 100644 --- a/src/Phalcon/Image/ImageFactory.php +++ b/src/Phalcon/Image/ImageFactory.php @@ -32,7 +32,7 @@ public function __construct(array $services = array()) /** * Factory to create an instace from a Config object * - * @param array|Config $config = [ + * @param array|\Phalcon\Config $config = [ * 'adapter' => 'gd', * 'file' => 'image.jpg', * 'height' => null, diff --git a/src/Phalcon/Loader.php b/src/Phalcon/Loader.php index fe9ab626..bbc1a30b 100644 --- a/src/Phalcon/Loader.php +++ b/src/Phalcon/Loader.php @@ -39,7 +39,7 @@ * $adapter = new \Example\Adapter\Some(); * ``` */ -class Loader implements EventsAwareInterface +class Loader implements \Phalcon\Events\EventsAwareInterface { protected $checkedPath = null; @@ -235,10 +235,10 @@ public function registerNamespaces(array $namespaces, bool $merge = false): Load /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } diff --git a/src/Phalcon/Logger.php b/src/Phalcon/Logger.php index 30f1ba4e..fe36aa37 100644 --- a/src/Phalcon/Logger.php +++ b/src/Phalcon/Logger.php @@ -47,7 +47,7 @@ * ->info('This does not go to the "manager" logger); * ``` */ -class Logger implements LoggerInterface +class Logger implements \Psr\Log\LoggerInterface { const ALERT = 2; @@ -129,7 +129,7 @@ public function __construct(string $name, array $adapters = array()) * @param AdapterInterface $adapter The adapter to add to the stack * @return Logger */ - public function addAdapter(string $name, AdapterInterface $adapter): Logger + public function addAdapter(string $name, \Phalcon\Logger\Adapter\AdapterInterface $adapter): Logger { } diff --git a/src/Phalcon/Logger/Adapter/AbstractAdapter.php b/src/Phalcon/Logger/Adapter/AbstractAdapter.php index 88133dda..aaea892c 100644 --- a/src/Phalcon/Logger/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Logger/Adapter/AbstractAdapter.php @@ -22,7 +22,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -abstract class AbstractAdapter implements AdapterInterface +abstract class AbstractAdapter implements \Phalcon\Logger\Adapter\AdapterInterface { /** * Name of the default formatter class @@ -63,10 +63,10 @@ public function __destruct() /** * Adds a message to the queue * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return AdapterInterface */ - public function add(Item $item): AdapterInterface + public function add(\Phalcon\Logger\Item $item): AdapterInterface { } @@ -107,10 +107,10 @@ public function inTransaction(): bool /** * Processes the message in the adapter * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return void */ - abstract public function process(Item $item); + abstract public function process(\Phalcon\Logger\Item $item); /** * Rollbacks the internal transaction @@ -124,10 +124,10 @@ public function rollback(): AdapterInterface /** * Sets the message formatter * - * @param FormatterInterface $formatter + * @param \Phalcon\Logger\Formatter\FormatterInterface $formatter * @return AdapterInterface */ - public function setFormatter(FormatterInterface $formatter): AdapterInterface + public function setFormatter(\Phalcon\Logger\Formatter\FormatterInterface $formatter): AdapterInterface { } } diff --git a/src/Phalcon/Logger/Adapter/AdapterInterface.php b/src/Phalcon/Logger/Adapter/AdapterInterface.php index 2be6ec31..5ae0cab3 100644 --- a/src/Phalcon/Logger/Adapter/AdapterInterface.php +++ b/src/Phalcon/Logger/Adapter/AdapterInterface.php @@ -23,10 +23,10 @@ interface AdapterInterface /** * Adds a message in the queue * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return AdapterInterface */ - public function add(Item $item): AdapterInterface; + public function add(\Phalcon\Logger\Item $item): AdapterInterface; /** * Starts a transaction @@ -67,10 +67,10 @@ public function inTransaction(): bool; /** * Processes the message in the adapter * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return void */ - public function process(Item $item); + public function process(\Phalcon\Logger\Item $item); /** * Rollbacks the internal transaction @@ -82,8 +82,8 @@ public function rollback(): AdapterInterface; /** * Sets the message formatter * - * @param FormatterInterface $formatter + * @param \Phalcon\Logger\Formatter\FormatterInterface $formatter * @return AdapterInterface */ - public function setFormatter(FormatterInterface $formatter): AdapterInterface; + public function setFormatter(\Phalcon\Logger\Formatter\FormatterInterface $formatter): AdapterInterface; } diff --git a/src/Phalcon/Logger/Adapter/Noop.php b/src/Phalcon/Logger/Adapter/Noop.php index e65bdb56..582a0261 100644 --- a/src/Phalcon/Logger/Adapter/Noop.php +++ b/src/Phalcon/Logger/Adapter/Noop.php @@ -25,7 +25,7 @@ * $logger->close(); * ``` */ -class Noop extends AbstractAdapter +class Noop extends \Phalcon\Logger\Adapter\AbstractAdapter { /** @@ -40,10 +40,10 @@ public function close(): bool /** * Processes the message i.e. writes it to the file * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return void */ - public function process(Item $item) + public function process(\Phalcon\Logger\Item $item) { } } diff --git a/src/Phalcon/Logger/Adapter/Stream.php b/src/Phalcon/Logger/Adapter/Stream.php index ddaa147f..c55dc795 100644 --- a/src/Phalcon/Logger/Adapter/Stream.php +++ b/src/Phalcon/Logger/Adapter/Stream.php @@ -30,7 +30,7 @@ * $logger->close(); * ``` */ -class Stream extends AbstractAdapter +class Stream extends \Phalcon\Logger\Adapter\AbstractAdapter { /** * Stream handler resource @@ -94,10 +94,10 @@ public function close(): bool /** * Processes the message i.e. writes it to the file * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return void */ - public function process(Item $item) + public function process(\Phalcon\Logger\Item $item) { } } diff --git a/src/Phalcon/Logger/Adapter/Syslog.php b/src/Phalcon/Logger/Adapter/Syslog.php index 03d4d8c9..603557a6 100644 --- a/src/Phalcon/Logger/Adapter/Syslog.php +++ b/src/Phalcon/Logger/Adapter/Syslog.php @@ -40,7 +40,7 @@ * $logger->error("This is another error"); * ``` */ -class Syslog extends AbstractAdapter +class Syslog extends \Phalcon\Logger\Adapter\AbstractAdapter { /** * Name of the default formatter class @@ -95,10 +95,10 @@ public function close(): bool /** * Processes the message i.e. writes it to the syslog * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return void */ - public function process(Item $item) + public function process(\Phalcon\Logger\Item $item) { } diff --git a/src/Phalcon/Logger/Formatter/AbstractFormatter.php b/src/Phalcon/Logger/Formatter/AbstractFormatter.php index 7486fbc6..cf2f0288 100644 --- a/src/Phalcon/Logger/Formatter/AbstractFormatter.php +++ b/src/Phalcon/Logger/Formatter/AbstractFormatter.php @@ -9,7 +9,10 @@ */ namespace Phalcon\Logger\Formatter; +use DateTimeImmutable; +use DateTimeZone; use Phalcon\Logger; +use Phalcon\Logger\Item; /** * This file is part of the Phalcon Framework. @@ -19,8 +22,33 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -abstract class AbstractFormatter implements FormatterInterface +abstract class AbstractFormatter implements \Phalcon\Logger\Formatter\FormatterInterface { + /** + * Default date format + * + * @var string + */ + protected $dateFormat; + + + /** + * Default date format + * + * @return string + */ + public function getDateFormat(): string + { + } + + /** + * Default date format + * + * @param string $dateFormat + */ + public function setDateFormat(string $dateFormat) + { + } /** * Interpolates context values into the message placeholders @@ -32,4 +60,15 @@ abstract class AbstractFormatter implements FormatterInterface public function interpolate(string $message, $context = null) { } + + /** + * Returns the date formatted for the logger. + * + * @todo Not using the set time from the Item since we have interface + * misalignment which will break semver This will change in the future + * @return string + */ + protected function getFormattedDate(): string + { + } } diff --git a/src/Phalcon/Logger/Formatter/FormatterInterface.php b/src/Phalcon/Logger/Formatter/FormatterInterface.php index e8d2a123..84ee5d55 100644 --- a/src/Phalcon/Logger/Formatter/FormatterInterface.php +++ b/src/Phalcon/Logger/Formatter/FormatterInterface.php @@ -22,8 +22,8 @@ interface FormatterInterface /** * Applies a format to an item * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return string|array */ - public function format(Item $item); + public function format(\Phalcon\Logger\Item $item); } diff --git a/src/Phalcon/Logger/Formatter/Json.php b/src/Phalcon/Logger/Formatter/Json.php index e1abb40e..d1a65d25 100644 --- a/src/Phalcon/Logger/Formatter/Json.php +++ b/src/Phalcon/Logger/Formatter/Json.php @@ -9,6 +9,7 @@ */ namespace Phalcon\Logger\Formatter; +use Phalcon\Helper\Json as JsonHelper; use Phalcon\Logger\Item; /** @@ -16,33 +17,8 @@ * * Formats messages using JSON encoding */ -class Json extends AbstractFormatter +class Json extends \Phalcon\Logger\Formatter\AbstractFormatter { - /** - * Default date format - * - * @var string - */ - protected $dateFormat; - - - /** - * Default date format - * - * @return string - */ - public function getDateFormat(): string - { - } - - /** - * Default date format - * - * @param string $dateFormat - */ - public function setDateFormat(string $dateFormat) - { - } /** * Phalcon\Logger\Formatter\Json construct @@ -56,10 +32,10 @@ public function __construct(string $dateFormat = 'c') /** * Applies a format to a message before sent it to the internal log * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return string */ - public function format(Item $item): string + public function format(\Phalcon\Logger\Item $item): string { } } diff --git a/src/Phalcon/Logger/Formatter/Line.php b/src/Phalcon/Logger/Formatter/Line.php index cc870f29..173aec9b 100644 --- a/src/Phalcon/Logger/Formatter/Line.php +++ b/src/Phalcon/Logger/Formatter/Line.php @@ -9,6 +9,7 @@ */ namespace Phalcon\Logger\Formatter; +use DateTime; use Phalcon\Logger\Item; /** @@ -16,15 +17,8 @@ * * Formats messages using an one-line string */ -class Line extends AbstractFormatter +class Line extends \Phalcon\Logger\Formatter\AbstractFormatter { - /** - * Default date format - * - * @var string - */ - protected $dateFormat; - /** * Format applied to each message * @@ -33,24 +27,6 @@ class Line extends AbstractFormatter protected $format; - /** - * Default date format - * - * @return string - */ - public function getDateFormat(): string - { - } - - /** - * Default date format - * - * @param string $dateFormat - */ - public function setDateFormat(string $dateFormat) - { - } - /** * Format applied to each message * @@ -82,10 +58,10 @@ public function __construct(string $format = '[%date%][%type%] %message%', strin /** * Applies a format to a message before sent it to the internal log * - * @param Item $item + * @param \Phalcon\Logger\Item $item * @return string */ - public function format(Item $item): string + public function format(\Phalcon\Logger\Item $item): string { } } diff --git a/src/Phalcon/Logger/Item.php b/src/Phalcon/Logger/Item.php index 015de099..63e11af8 100644 --- a/src/Phalcon/Logger/Item.php +++ b/src/Phalcon/Logger/Item.php @@ -92,6 +92,7 @@ public function getType() /** * Phalcon\Logger\Item constructor * + * @todo Remove the time or change the signature to an array * @param string $message * @param string $name * @param int $type diff --git a/src/Phalcon/Logger/LoggerFactory.php b/src/Phalcon/Logger/LoggerFactory.php index b03dc06f..fa56692f 100644 --- a/src/Phalcon/Logger/LoggerFactory.php +++ b/src/Phalcon/Logger/LoggerFactory.php @@ -36,7 +36,7 @@ public function __construct(AdapterFactory $factory) /** * Factory to create an instace from a Config object * - * @param array|Config $config = [ + * @param array|\Phalcon\Config $config = [ * 'name' => 'messages', * 'adapters' => [ * 'adapter' => 'stream', diff --git a/src/Phalcon/Messages/Message.php b/src/Phalcon/Messages/Message.php index f05af7af..c0c64851 100644 --- a/src/Phalcon/Messages/Message.php +++ b/src/Phalcon/Messages/Message.php @@ -16,7 +16,7 @@ * * Stores a message from various components */ -class Message implements MessageInterface, JsonSerializable +class Message implements \Phalcon\Messages\MessageInterface, \JsonSerializable { /** * @var int diff --git a/src/Phalcon/Messages/Messages.php b/src/Phalcon/Messages/Messages.php index 5135e8b0..54d8d33b 100644 --- a/src/Phalcon/Messages/Messages.php +++ b/src/Phalcon/Messages/Messages.php @@ -17,7 +17,7 @@ /** * Represents a collection of messages */ -class Messages implements ArrayAccess, Countable, Iterator, JsonSerializable +class Messages implements \ArrayAccess, \Countable, \Iterator, \JsonSerializable { /** * @var int @@ -61,9 +61,9 @@ public function appendMessage(MessageInterface $message) * $messages->appendMessages($messagesArray); * ``` * - * @param MessageInterface[] messages + * @param \Phalcon\Messages\MessageInterface[] messages * @param mixed $messages - * @param MessageInterface[] messages + * @param \Phalcon\Messages\MessageInterface [] messages */ public function appendMessages($messages) { @@ -169,7 +169,7 @@ public function offsetGet($index) * $messages[0] = new \Phalcon\Messages\Message("This is a message"); * ``` * - * @param Message $message + * @param \Phalcon\Messages\Message $message * @param mixed $index * @return void */ diff --git a/src/Phalcon/Mvc/Controller.php b/src/Phalcon/Mvc/Controller.php index 42f6e959..c5bfda01 100644 --- a/src/Phalcon/Mvc/Controller.php +++ b/src/Phalcon/Mvc/Controller.php @@ -51,7 +51,7 @@ * } * ``` */ -abstract class Controller extends Injectable implements ControllerInterface +abstract class Controller extends Injectable implements \Phalcon\Mvc\ControllerInterface { /** diff --git a/src/Phalcon/Mvc/Dispatcher.php b/src/Phalcon/Mvc/Dispatcher.php index f41a590b..6347a0c9 100644 --- a/src/Phalcon/Mvc/Dispatcher.php +++ b/src/Phalcon/Mvc/Dispatcher.php @@ -34,7 +34,7 @@ * $controller = $dispatcher->dispatch(); * ``` */ -class Dispatcher extends BaseDispatcher implements DispatcherInterface +class Dispatcher extends \Phalcon\Dispatcher\AbstractDispatcher implements \Phalcon\Mvc\DispatcherInterface { protected $defaultAction = 'index'; diff --git a/src/Phalcon/Mvc/Micro.php b/src/Phalcon/Mvc/Micro.php index b942e0ed..fc3115ff 100644 --- a/src/Phalcon/Mvc/Micro.php +++ b/src/Phalcon/Mvc/Micro.php @@ -48,7 +48,7 @@ * $app->handle("/say/welcome/Phalcon"); * ``` */ -class Micro extends Injectable implements ArrayAccess, EventsAwareInterface +class Micro extends Injectable implements \ArrayAccess, \Phalcon\Events\EventsAwareInterface { protected $activeHandler; @@ -99,9 +99,9 @@ class Micro extends Injectable implements ArrayAccess, EventsAwareInterface /** * Phalcon\Mvc\Micro constructor * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function __construct(DiInterface $container = null) + public function __construct(\Phalcon\Di\DiInterface $container = null) { } @@ -208,10 +208,10 @@ public function getEventsManager(): ?ManagerInterface /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } @@ -316,10 +316,10 @@ public function map(string $routePattern, $handler): RouteInterface /** * Mounts a collection of handlers * - * @param CollectionInterface $collection + * @param \Phalcon\Mvc\Micro\CollectionInterface $collection * @return Micro */ - public function mount(CollectionInterface $collection): Micro + public function mount(\Phalcon\Mvc\Micro\CollectionInterface $collection): Micro { } @@ -445,10 +445,10 @@ public function setActiveHandler($activeHandler) /** * Sets the DependencyInjector container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } @@ -464,11 +464,11 @@ public function setDI(DiInterface $container) * ); * ``` * - * @param BinderInterface $modelBinder + * @param \Phalcon\Mvc\Model\BinderInterface $modelBinder * @param mixed $cache * @return Micro */ - public function setModelBinder(BinderInterface $modelBinder, $cache = null): Micro + public function setModelBinder(\Phalcon\Mvc\Model\BinderInterface $modelBinder, $cache = null): Micro { } diff --git a/src/Phalcon/Mvc/Micro/Collection.php b/src/Phalcon/Mvc/Micro/Collection.php index 9abf0dd5..8479ed72 100644 --- a/src/Phalcon/Mvc/Micro/Collection.php +++ b/src/Phalcon/Mvc/Micro/Collection.php @@ -28,7 +28,7 @@ * $app->mount($collection); * ``` */ -class Collection implements CollectionInterface +class Collection implements \Phalcon\Mvc\Micro\CollectionInterface { protected $handler; diff --git a/src/Phalcon/Mvc/Micro/LazyLoader.php b/src/Phalcon/Mvc/Micro/LazyLoader.php index 3a9d5baf..4ce54ae6 100644 --- a/src/Phalcon/Mvc/Micro/LazyLoader.php +++ b/src/Phalcon/Mvc/Micro/LazyLoader.php @@ -43,11 +43,11 @@ public function __construct(string $definition) * Calling __call method * * @param array $arguments - * @param string $method - * @param BinderInterface $modelBinder * @return mixed + * @param string $method + * @param \Phalcon\Mvc\Model\BinderInterface $modelBinder */ - public function callMethod(string $method, $arguments, BinderInterface $modelBinder = null) + public function callMethod(string $method, $arguments, \Phalcon\Mvc\Model\BinderInterface $modelBinder = null) { } } diff --git a/src/Phalcon/Mvc/Micro/MiddlewareInterface.php b/src/Phalcon/Mvc/Micro/MiddlewareInterface.php index 0e6d47f6..3b5de100 100644 --- a/src/Phalcon/Mvc/Micro/MiddlewareInterface.php +++ b/src/Phalcon/Mvc/Micro/MiddlewareInterface.php @@ -20,7 +20,7 @@ interface MiddlewareInterface /** * Calls the middleware * - * @param Micro $application + * @param \Phalcon\Mvc\Micro $application */ - public function call(Micro $application); + public function call(\Phalcon\Mvc\Micro $application); } diff --git a/src/Phalcon/Mvc/Model.php b/src/Phalcon/Mvc/Model.php index 3d3e38ab..60991170 100644 --- a/src/Phalcon/Mvc/Model.php +++ b/src/Phalcon/Mvc/Model.php @@ -34,11 +34,9 @@ use Phalcon\Mvc\Model\QueryInterface; use Phalcon\Mvc\Model\ResultInterface; use Phalcon\Mvc\Model\Resultset; -use Phalcon\Mvc\Model\Resultset\Simple; use Phalcon\Mvc\Model\ResultsetInterface; use Phalcon\Mvc\Model\Relation; use Phalcon\Mvc\Model\RelationInterface; -use Phalcon\Mvc\Model\Row; use Phalcon\Mvc\Model\TransactionInterface; use Phalcon\Mvc\Model\ValidationFailed; use Phalcon\Mvc\ModelInterface; @@ -82,7 +80,7 @@ * } * ``` */ -abstract class Model extends AbstractInjectionAware implements EntityInterface, \Phalcon\Mvc\ModelInterface, ResultInterface, Serializable, JsonSerializable +abstract class Model extends AbstractInjectionAware implements \Phalcon\Mvc\EntityInterface, \Phalcon\Mvc\ModelInterface, \Phalcon\Mvc\Model\ResultInterface, \Serializable, \JsonSerializable { const DIRTY_STATE_DETACHED = 2; @@ -168,20 +166,20 @@ public function getTransaction() * Phalcon\Mvc\Model constructor * * @param mixed $data - * @param DiInterface $container - * @param ManagerInterface $modelsManager + * @param \Phalcon\Di\DiInterface $container + * @param \Phalcon\Mvc\Model\ManagerInterface $modelsManager */ - final public function __construct($data = null, DiInterface $container = null, ManagerInterface $modelsManager = null) + final public function __construct($data = null, \Phalcon\Di\DiInterface $container = null, \Phalcon\Mvc\Model\ManagerInterface $modelsManager = null) { } /** * Handles method calls when a method is not implemented * + * @return mixed + * @throws \Phalcon\Mvc\Model\Exception If the method doesn't exist * @param string $method * @param array $arguments - *@return mixed - * @throws Exception If the method doesn't exist */ public function __call(string $method, array $arguments) { @@ -190,10 +188,10 @@ public function __call(string $method, array $arguments) /** * Handles method calls when a static method is not implemented * + * @return mixed + * @throws \Phalcon\Mvc\Model\Exception If the method doesn't exist * @param string $method * @param array $arguments - *@return mixed - * @throws Exception If the method doesn't exist */ public static function __callStatic(string $method, array $arguments) { @@ -255,10 +253,10 @@ public function __set(string $property, $value) * } * ``` * - * @param BehaviorInterface $behavior + * @param \Phalcon\Mvc\Model\BehaviorInterface $behavior * @return void */ - public function addBehavior(BehaviorInterface $behavior) + public function addBehavior(\Phalcon\Mvc\Model\BehaviorInterface $behavior) { } @@ -284,10 +282,10 @@ public function addBehavior(BehaviorInterface $behavior) * } * ``` * - * @param MessageInterface $message + * @param \Phalcon\Messages\MessageInterface $message * @return ModelInterface */ - public function appendMessage(MessageInterface $message): ModelInterface + public function appendMessage(\Phalcon\Messages\MessageInterface $message): ModelInterface { } @@ -413,7 +411,7 @@ public static function cloneResult(\Phalcon\Mvc\ModelInterface $base, array $dat * ); * ``` * - * @param \Phalcon\Mvc\ModelInterface|Row $base + * @param \Phalcon\Mvc\ModelInterface|\Phalcon\Mvc\Model\Row $base * @param array $columnMap * @param array $data * @param int $dirtyState @@ -886,7 +884,7 @@ public function getEventsManager(): EventsManagerInterface * ``` * * @param mixed $filter - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getMessages($filter = null): array { @@ -952,7 +950,7 @@ final public function getReadConnectionService(): string * Returns related records based on defined relations * * @param array $arguments - * @return Simple|Phalcon\Mvc\Model\Resultset\Simple|false + * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|false * @param string $alias */ public function getRelated(string $alias, $arguments = null) @@ -1183,10 +1181,10 @@ public static function minimum($parameters = null) /** * Create a criteria for a specific model * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return CriteriaInterface */ - public static function query(DiInterface $container = null): CriteriaInterface + public static function query(\Phalcon\Di\DiInterface $container = null): CriteriaInterface { } @@ -1283,9 +1281,9 @@ public function setDirtyState(int $dirtyState) /** * Sets a custom events manager * - * @param EventsManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager */ - public function setEventsManager(EventsManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } @@ -1363,10 +1361,10 @@ public function setSnapshotData(array $data, $columnMap = null) * } * ``` * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return ModelInterface */ - public function setTransaction(TransactionInterface $transaction): ModelInterface + public function setTransaction(\Phalcon\Mvc\Model\TransactionInterface $transaction): ModelInterface { } @@ -1519,11 +1517,11 @@ final protected function _checkForeignKeysReverseRestrict(): bool * * @param string|array $table * @param bool|string $identityField - * @param MetaDataInterface $metaData - * @param AdapterInterface $connection + * @param \Phalcon\Mvc\Model\MetaDataInterface $metaData + * @param \Phalcon\Db\Adapter\AdapterInterface $connection * @return bool */ - protected function _doLowInsert(MetaDataInterface $metaData, AdapterInterface $connection, $table, $identityField): bool + protected function _doLowInsert(\Phalcon\Mvc\Model\MetaDataInterface $metaData, \Phalcon\Db\Adapter\AdapterInterface $connection, $table, $identityField): bool { } @@ -1531,22 +1529,22 @@ protected function _doLowInsert(MetaDataInterface $metaData, AdapterInterface $c * Sends a pre-build UPDATE SQL statement to the relational database system * * @param string|array $table - * @param MetaDataInterface $metaData - * @param AdapterInterface $connection + * @param \Phalcon\Mvc\Model\MetaDataInterface $metaData + * @param \Phalcon\Db\Adapter\AdapterInterface $connection * @return bool */ - protected function _doLowUpdate(MetaDataInterface $metaData, AdapterInterface $connection, $table): bool + protected function _doLowUpdate(\Phalcon\Mvc\Model\MetaDataInterface $metaData, \Phalcon\Db\Adapter\AdapterInterface $connection, $table): bool { } /** * Checks whether the current record already exists * - * @param MetaDataInterface $metaData - * @param AdapterInterface $connection + * @param \Phalcon\Mvc\Model\MetaDataInterface $metaData + * @param \Phalcon\Db\Adapter\AdapterInterface $connection * @return bool */ - protected function _exists(MetaDataInterface $metaData, AdapterInterface $connection): bool + protected function _exists(\Phalcon\Mvc\Model\MetaDataInterface $metaData, \Phalcon\Db\Adapter\AdapterInterface $connection): bool { } @@ -1600,12 +1598,12 @@ final protected function _possibleSetter(string $property, $value): bool /** * Executes internal hooks before save a record * - * @param MetaDataInterface $metaData + * @param \Phalcon\Mvc\Model\MetaDataInterface $metaData * @param bool $exists * @param mixed $identityField * @return bool */ - protected function _preSave(MetaDataInterface $metaData, bool $exists, $identityField): bool + protected function _preSave(\Phalcon\Mvc\Model\MetaDataInterface $metaData, bool $exists, $identityField): bool { } @@ -1613,12 +1611,12 @@ protected function _preSave(MetaDataInterface $metaData, bool $exists, $identity * Saves related records that must be stored prior to save the master record * * @param \Phalcon\Mvc\ModelInterface[] related - * @param AdapterInterface $connection + * @param \Phalcon\Db\Adapter\AdapterInterface $connection * @param mixed $related * @param \Phalcon\Mvc\ModelInterface [] related * @return bool */ - protected function _preSaveRelatedRecords(AdapterInterface $connection, $related): bool + protected function _preSaveRelatedRecords(\Phalcon\Db\Adapter\AdapterInterface $connection, $related): bool { } @@ -1637,12 +1635,12 @@ protected function _postSave(bool $success, bool $exists): bool * Save the related records assigned in the has-one/has-many relations * * @param Phalcon\Mvc\ModelInterface[] related - * @param AdapterInterface $connection + * @param \Phalcon\Db\Adapter\AdapterInterface $connection * @param mixed $related * @param Phalcon\Mvc\ModelInterface [] related * @return bool */ - protected function _postSaveRelatedRecords(AdapterInterface $connection, $related): bool + protected function _postSaveRelatedRecords(\Phalcon\Db\Adapter\AdapterInterface $connection, $related): bool { } @@ -2110,10 +2108,10 @@ protected function useDynamicUpdate(bool $dynamicUpdate) * } * ``` * - * @param ValidationInterface $validator + * @param \Phalcon\Validation\ValidationInterface $validator * @return bool */ - protected function validate(ValidationInterface $validator): bool + protected function validate(\Phalcon\Validation\ValidationInterface $validator): bool { } diff --git a/src/Phalcon/Mvc/Model/Behavior.php b/src/Phalcon/Mvc/Model/Behavior.php index 6ff5733d..301149cc 100644 --- a/src/Phalcon/Mvc/Model/Behavior.php +++ b/src/Phalcon/Mvc/Model/Behavior.php @@ -16,7 +16,7 @@ * * This is an optional base class for ORM behaviors */ -abstract class Behavior implements BehaviorInterface +abstract class Behavior implements \Phalcon\Mvc\Model\BehaviorInterface { /** * @var array @@ -46,11 +46,11 @@ protected function getOptions(string $eventName = null) /** * Acts as fallbacks when a missing method is called on the model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $method * @param array $arguments */ - public function missingMethod(ModelInterface $model, string $method, array $arguments = array()) + public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $method, array $arguments = array()) { } @@ -68,9 +68,9 @@ protected function mustTakeAction(string $eventName): bool * This method receives the notifications from the EventsManager * * @param string $type - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function notify(string $type, ModelInterface $model) + public function notify(string $type, \Phalcon\Mvc\ModelInterface $model) { } } diff --git a/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php b/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php index b57dc36a..9b9ee263 100644 --- a/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php +++ b/src/Phalcon/Mvc/Model/Behavior/SoftDelete.php @@ -26,9 +26,9 @@ class SoftDelete extends Behavior * Listens for notifications from the models manager * * @param string $type - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function notify(string $type, ModelInterface $model) + public function notify(string $type, \Phalcon\Mvc\ModelInterface $model) { } } diff --git a/src/Phalcon/Mvc/Model/Behavior/Timestampable.php b/src/Phalcon/Mvc/Model/Behavior/Timestampable.php index 72bdae2b..455eaba4 100644 --- a/src/Phalcon/Mvc/Model/Behavior/Timestampable.php +++ b/src/Phalcon/Mvc/Model/Behavior/Timestampable.php @@ -27,9 +27,9 @@ class Timestampable extends Behavior * Listens for notifications from the models manager * * @param string $type - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function notify(string $type, ModelInterface $model) + public function notify(string $type, \Phalcon\Mvc\ModelInterface $model) { } diff --git a/src/Phalcon/Mvc/Model/BehaviorInterface.php b/src/Phalcon/Mvc/Model/BehaviorInterface.php index 76cae412..b923b5f5 100644 --- a/src/Phalcon/Mvc/Model/BehaviorInterface.php +++ b/src/Phalcon/Mvc/Model/BehaviorInterface.php @@ -22,17 +22,17 @@ interface BehaviorInterface /** * Calls a method when it's missing in the model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $method * @param array $arguments */ - public function missingMethod(ModelInterface $model, string $method, array $arguments = array()); + public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $method, array $arguments = array()); /** * This method receives the notifications from the EventsManager * * @param string $type - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function notify(string $type, ModelInterface $model); + public function notify(string $type, \Phalcon\Mvc\ModelInterface $model); } diff --git a/src/Phalcon/Mvc/Model/Binder.php b/src/Phalcon/Mvc/Model/Binder.php index c4344ea6..30abd4a0 100644 --- a/src/Phalcon/Mvc/Model/Binder.php +++ b/src/Phalcon/Mvc/Model/Binder.php @@ -21,7 +21,7 @@ * * This is an class for binding models into params for handler */ -class Binder implements BinderInterface +class Binder implements \Phalcon\Mvc\Model\BinderInterface { /** * Array for storing active bound models @@ -65,9 +65,9 @@ public function getOriginalValues() /** * Phalcon\Mvc\Model\Binder constructor * - * @param AdapterInterface $cache + * @param \Phalcon\Cache\Adapter\AdapterInterface $cache */ - public function __construct(AdapterInterface $cache = null) + public function __construct(\Phalcon\Cache\Adapter\AdapterInterface $cache = null) { } @@ -130,10 +130,10 @@ protected function getParamsFromReflection($handler, array $params, string $cach /** * Gets cache instance * - * @param AdapterInterface $cache + * @param \Phalcon\Cache\Adapter\AdapterInterface $cache * @return BinderInterface */ - public function setCache(AdapterInterface $cache): BinderInterface + public function setCache(\Phalcon\Cache\Adapter\AdapterInterface $cache): BinderInterface { } } diff --git a/src/Phalcon/Mvc/Model/BinderInterface.php b/src/Phalcon/Mvc/Model/BinderInterface.php index 7c0ee131..8963d43c 100644 --- a/src/Phalcon/Mvc/Model/BinderInterface.php +++ b/src/Phalcon/Mvc/Model/BinderInterface.php @@ -47,8 +47,8 @@ public function getCache(): AdapterInterface; /** * Sets cache instance * - * @param AdapterInterface $cache + * @param \Phalcon\Cache\Adapter\AdapterInterface $cache * @return BinderInterface */ - public function setCache(AdapterInterface $cache): BinderInterface; + public function setCache(\Phalcon\Cache\Adapter\AdapterInterface $cache): BinderInterface; } diff --git a/src/Phalcon/Mvc/Model/Criteria.php b/src/Phalcon/Mvc/Model/Criteria.php index d5d1dcd4..fbf3a7d6 100644 --- a/src/Phalcon/Mvc/Model/Criteria.php +++ b/src/Phalcon/Mvc/Model/Criteria.php @@ -32,7 +32,7 @@ * ->execute(); * ``` */ -class Criteria implements CriteriaInterface, InjectionAwareInterface +class Criteria implements \Phalcon\Mvc\Model\CriteriaInterface, \Phalcon\Di\InjectionAwareInterface { protected $bindParams; @@ -53,10 +53,10 @@ class Criteria implements CriteriaInterface, InjectionAwareInterface /** * Sets the DependencyInjector container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } @@ -505,13 +505,13 @@ public function getParams(): array /** * Builds a Phalcon\Mvc\Model\Criteria based on an input array like $_POST * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @param string $modelName * @param array $data * @param string $operator * @return CriteriaInterface */ - public static function fromInput(DiInterface $container, string $modelName, array $data, string $operator = 'AND'): CriteriaInterface + public static function fromInput(\Phalcon\Di\DiInterface $container, string $modelName, array $data, string $operator = 'AND'): CriteriaInterface { } diff --git a/src/Phalcon/Mvc/Model/Manager.php b/src/Phalcon/Mvc/Model/Manager.php index c85e9682..7b11b5d0 100644 --- a/src/Phalcon/Mvc/Model/Manager.php +++ b/src/Phalcon/Mvc/Model/Manager.php @@ -48,7 +48,7 @@ * $robot = new Robots($di); * ``` */ -class Manager implements \Phalcon\Mvc\Model\ManagerInterface, InjectionAwareInterface, EventsAwareInterface +class Manager implements \Phalcon\Mvc\Model\ManagerInterface, \Phalcon\Di\InjectionAwareInterface, \Phalcon\Events\EventsAwareInterface { protected $aliases = array(); @@ -167,10 +167,10 @@ class Manager implements \Phalcon\Mvc\Model\ManagerInterface, InjectionAwareInte /** * Sets the DependencyInjector container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } @@ -186,10 +186,10 @@ public function getDI(): DiInterface /** * Sets a global events manager * - * @param EventsManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(EventsManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } @@ -205,31 +205,31 @@ public function getEventsManager(): EventsManagerInterface /** * Sets a custom events manager for a specific model * - * @param ModelInterface $model - * @param EventsManagerInterface $eventsManager + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setCustomEventsManager(ModelInterface $model, EventsManagerInterface $eventsManager) + public function setCustomEventsManager(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Events\ManagerInterface $eventsManager) { } /** * Returns a custom events manager related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return mixed */ - public function getCustomEventsManager(ModelInterface $model) + public function getCustomEventsManager(\Phalcon\Mvc\ModelInterface $model) { } /** * Initializes a model in the model manager * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return bool */ - public function initialize(ModelInterface $model): bool + public function initialize(\Phalcon\Mvc\ModelInterface $model): bool { } @@ -303,11 +303,11 @@ public function getModelPrefix(): string /** * Sets the mapped source for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $source * @return void */ - public function setModelSource(ModelInterface $model, string $source) + public function setModelSource(\Phalcon\Mvc\ModelInterface $model, string $source) { } @@ -321,126 +321,126 @@ public function setModelSource(ModelInterface $model, string $source) * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $property * @return bool */ - final public function isVisibleModelProperty(ModelInterface $model, string $property): bool + final public function isVisibleModelProperty(\Phalcon\Mvc\ModelInterface $model, string $property): bool { } /** * Returns the mapped source for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getModelSource(ModelInterface $model): string + public function getModelSource(\Phalcon\Mvc\ModelInterface $model): string { } /** * Sets the mapped schema for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $schema * @return void */ - public function setModelSchema(ModelInterface $model, string $schema) + public function setModelSchema(\Phalcon\Mvc\ModelInterface $model, string $schema) { } /** * Returns the mapped schema for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getModelSchema(ModelInterface $model): string + public function getModelSchema(\Phalcon\Mvc\ModelInterface $model): string { } /** * Sets both write and read connection service for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $connectionService * @return void */ - public function setConnectionService(ModelInterface $model, string $connectionService) + public function setConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService) { } /** * Sets write connection service for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $connectionService * @return void */ - public function setWriteConnectionService(ModelInterface $model, string $connectionService) + public function setWriteConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService) { } /** * Sets read connection service for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $connectionService * @return void */ - public function setReadConnectionService(ModelInterface $model, string $connectionService) + public function setReadConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService) { } /** * Returns the connection to read data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return AdapterInterface */ - public function getReadConnection(ModelInterface $model): AdapterInterface + public function getReadConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface { } /** * Returns the connection to write data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return AdapterInterface */ - public function getWriteConnection(ModelInterface $model): AdapterInterface + public function getWriteConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface { } /** * Returns the connection to read or write data related to a model depending on the connection services. * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param mixed $connectionServices * @return AdapterInterface */ - protected function _getConnection(ModelInterface $model, $connectionServices): AdapterInterface + protected function _getConnection(\Phalcon\Mvc\ModelInterface $model, $connectionServices): AdapterInterface { } /** * Returns the connection service name used to read data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getReadConnectionService(ModelInterface $model): string + public function getReadConnectionService(\Phalcon\Mvc\ModelInterface $model): string { } /** * Returns the connection service name used to write data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getWriteConnectionService(ModelInterface $model): string + public function getWriteConnectionService(\Phalcon\Mvc\ModelInterface $model): string { } @@ -448,11 +448,11 @@ public function getWriteConnectionService(ModelInterface $model): string * Returns the connection service name used to read or write data related to * a model depending on the connection services * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param mixed $connectionServices * @return string */ - public function _getConnectionService(ModelInterface $model, $connectionServices): string + public function _getConnectionService(\Phalcon\Mvc\ModelInterface $model, $connectionServices): string { } @@ -462,9 +462,9 @@ public function _getConnectionService(ModelInterface $model, $connectionServices * the model * * @param string $eventName - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function notifyEvent(string $eventName, ModelInterface $model) + public function notifyEvent(string $eventName, \Phalcon\Mvc\ModelInterface $model) { } @@ -473,64 +473,64 @@ public function notifyEvent(string $eventName, ModelInterface $model) * This method expects that the endpoint listeners/behaviors returns true * meaning that a least one was implemented * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $eventName * @param mixed $data */ - public function missingMethod(ModelInterface $model, string $eventName, $data) + public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $eventName, $data) { } /** * Binds a behavior to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param \Phalcon\Mvc\Model\BehaviorInterface $behavior * @return void */ - public function addBehavior(ModelInterface $model, \Phalcon\Mvc\Model\BehaviorInterface $behavior) + public function addBehavior(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Mvc\Model\BehaviorInterface $behavior) { } /** * Sets if a model must keep snapshots * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param bool $keepSnapshots * @return void */ - public function keepSnapshots(ModelInterface $model, bool $keepSnapshots) + public function keepSnapshots(\Phalcon\Mvc\ModelInterface $model, bool $keepSnapshots) { } /** * Checks if a model is keeping snapshots for the queried records * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return bool */ - public function isKeepingSnapshots(ModelInterface $model): bool + public function isKeepingSnapshots(\Phalcon\Mvc\ModelInterface $model): bool { } /** * Sets if a model must use dynamic update instead of the all-field update * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param bool $dynamicUpdate * @return void */ - public function useDynamicUpdate(ModelInterface $model, bool $dynamicUpdate) + public function useDynamicUpdate(\Phalcon\Mvc\ModelInterface $model, bool $dynamicUpdate) { } /** * Checks if a model is using dynamic update instead of all-field update * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return bool */ - public function isUsingDynamicUpdate(ModelInterface $model): bool + public function isUsingDynamicUpdate(\Phalcon\Mvc\ModelInterface $model): bool { } @@ -538,13 +538,13 @@ public function isUsingDynamicUpdate(ModelInterface $model): bool * Setup a 1-1 relation between two models * * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param mixed $fields * @param string $referencedModel * @param mixed $referencedFields * @return RelationInterface */ - public function addHasOne(ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface + public function addHasOne(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface { } @@ -556,12 +556,12 @@ public function addHasOne(ModelInterface $model, $fields, string $referencedMode * @param string $intermediateReferencedFields * @param string $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $intermediateModel * @param string $referencedModel * @return RelationInterface */ - public function addHasOneThrough(ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface + public function addHasOneThrough(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface { } @@ -569,13 +569,13 @@ public function addHasOneThrough(ModelInterface $model, $fields, string $interme * Setup a relation reverse many to one between two models * * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param mixed $fields * @param string $referencedModel * @param mixed $referencedFields * @return RelationInterface */ - public function addBelongsTo(ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface + public function addBelongsTo(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface { } @@ -584,12 +584,12 @@ public function addBelongsTo(ModelInterface $model, $fields, string $referencedM * * @param mixed $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param mixed $fields * @param string $referencedModel * @return RelationInterface */ - public function addHasMany(ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface + public function addHasMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface { } @@ -601,12 +601,12 @@ public function addHasMany(ModelInterface $model, $fields, string $referencedMod * @param string $intermediateReferencedFields * @param string $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $intermediateModel * @param string $referencedModel * @return RelationInterface */ - public function addHasManyToMany(ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface + public function addHasManyToMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface { } @@ -690,13 +690,13 @@ final protected function _mergeFindParameters($findParamsOne, $findParamsTwo): a /** * Helper method to query records based on a relation definition * + * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|int|false * @param RelationInterface $relation - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @param mixed $parameters * @param string $method - *@return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|int|false */ - public function getRelationRecords(RelationInterface $relation, ModelInterface $record, $parameters = null, string $method = null) + public function getRelationRecords(RelationInterface $relation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null) { } @@ -736,12 +736,12 @@ public function clearReusableObjects() * * @param string $modelName * @param string $modelRelation - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @param mixed $parameters * @param string $method * @return mixed */ - public function getBelongsToRecords(string $modelName, string $modelRelation, ModelInterface $record, $parameters = null, string $method = null) + public function getBelongsToRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null) { } @@ -750,12 +750,12 @@ public function getBelongsToRecords(string $modelName, string $modelRelation, Mo * * @param string $modelName * @param string $modelRelation - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @param mixed $parameters * @param string $method * @return mixed */ - public function getHasManyRecords(string $modelName, string $modelRelation, ModelInterface $record, $parameters = null, string $method = null) + public function getHasManyRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null) { } @@ -764,12 +764,12 @@ public function getHasManyRecords(string $modelName, string $modelRelation, Mode * * @param string $modelName * @param string $modelRelation - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @param mixed $parameters * @param string $method * @return mixed */ - public function getHasOneRecords(string $modelName, string $modelRelation, ModelInterface $record, $parameters = null, string $method = null) + public function getHasOneRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null) { } @@ -782,60 +782,60 @@ public function getHasOneRecords(string $modelName, string $modelRelation, Model * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getBelongsTo(ModelInterface $model): array + public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array { } /** * Gets hasMany relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasMany(ModelInterface $model): array + public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array { } /** * Gets hasOne relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getHasOne(ModelInterface $model): array + public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array { } /** * Gets hasOneThrough relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasOneThrough(ModelInterface $model): array + public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array { } /** * Gets hasManyToMany relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasManyToMany(ModelInterface $model): array + public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array { } /** * Gets hasOne relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasOneAndHasMany(ModelInterface $model): array + public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array { } diff --git a/src/Phalcon/Mvc/Model/ManagerInterface.php b/src/Phalcon/Mvc/Model/ManagerInterface.php index bf520baf..039dfaae 100644 --- a/src/Phalcon/Mvc/Model/ManagerInterface.php +++ b/src/Phalcon/Mvc/Model/ManagerInterface.php @@ -25,11 +25,11 @@ interface ManagerInterface /** * Binds a behavior to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param BehaviorInterface $behavior * @return void */ - public function addBehavior(ModelInterface $model, BehaviorInterface $behavior); + public function addBehavior(\Phalcon\Mvc\ModelInterface $model, BehaviorInterface $behavior); /** * Setup a relation reverse 1-1 between two models @@ -37,11 +37,11 @@ public function addBehavior(ModelInterface $model, BehaviorInterface $behavior); * @param mixed $fields * @param mixed $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $referencedModel * @return RelationInterface */ - public function addBelongsTo(ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface; + public function addBelongsTo(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface; /** * Setup a relation 1-n between two models @@ -49,11 +49,11 @@ public function addBelongsTo(ModelInterface $model, $fields, string $referencedM * @param mixed $fields * @param mixed $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $referencedModel * @return RelationInterface */ - public function addHasMany(ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface; + public function addHasMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface; /** * Setup a 1-1 relation between two models @@ -61,11 +61,11 @@ public function addHasMany(ModelInterface $model, $fields, string $referencedMod * @param mixed $fields * @param mixed $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $referencedModel * @return RelationInterface */ - public function addHasOne(ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface; + public function addHasOne(\Phalcon\Mvc\ModelInterface $model, $fields, string $referencedModel, $referencedFields, $options = null): RelationInterface; /** * Setups a 1-1 relation between two models using an intermediate table @@ -75,12 +75,12 @@ public function addHasOne(ModelInterface $model, $fields, string $referencedMode * @param string $intermediateReferencedFields * @param string $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $intermediateModel * @param string $referencedModel * @return RelationInterface */ - public function addHasOneThrough(ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface; + public function addHasOneThrough(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface; /** * Setups a relation n-m between two models @@ -90,12 +90,12 @@ public function addHasOneThrough(ModelInterface $model, $fields, string $interme * @param string $intermediateReferencedFields * @param string $referencedFields * @param array $options - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $intermediateModel * @param string $referencedModel * @return RelationInterface */ - public function addHasManyToMany(ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface; + public function addHasManyToMany(\Phalcon\Mvc\ModelInterface $model, $fields, string $intermediateModel, $intermediateFields, $intermediateReferencedFields, string $referencedModel, $referencedFields, $options = null): RelationInterface; /** * Creates a Phalcon\Mvc\Model\Query\Builder @@ -170,10 +170,10 @@ public function existsHasManyToMany(string $modelName, string $modelRelation): b /** * Gets belongsTo relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getBelongsTo(ModelInterface $model): array; + public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array; /** * Gets belongsTo related records from a model @@ -185,15 +185,15 @@ public function getBelongsTo(ModelInterface $model): array; * @param string|null $method * @return mixed */ - public function getBelongsToRecords(string $modelName, string $modelRelation, ModelInterface $record, $parameters = null, string $method = null); + public function getBelongsToRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null); /** * Gets hasMany relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasMany(ModelInterface $model): array; + public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array; /** * Gets hasMany related records from a model @@ -205,39 +205,39 @@ public function getHasMany(ModelInterface $model): array; * @param string|null $method * @return mixed */ - public function getHasManyRecords(string $modelName, string $modelRelation, ModelInterface $record, $parameters = null, string $method = null); + public function getHasManyRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null); /** * Gets hasManyToMany relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasManyToMany(ModelInterface $model): array; + public function getHasManyToMany(\Phalcon\Mvc\ModelInterface $model): array; /** * Gets hasOne relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasOne(ModelInterface $model): array; + public function getHasOne(\Phalcon\Mvc\ModelInterface $model): array; /** * Gets hasOneThrough relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasOneThrough(ModelInterface $model): array; + public function getHasOneThrough(\Phalcon\Mvc\ModelInterface $model): array; /** * Gets hasOne relations defined on a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|RelationInterface[] */ - public function getHasOneAndHasMany(ModelInterface $model): array; + public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array; /** * Gets hasOne related records from a model @@ -249,7 +249,7 @@ public function getHasOneAndHasMany(ModelInterface $model): array; * @param string|null $method * @return mixed */ - public function getHasOneRecords(string $modelName, string $modelRelation, ModelInterface $record, $parameters = null, string $method = null); + public function getHasOneRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null); /** * Get last initialized model @@ -268,34 +268,34 @@ public function getLastQuery(): QueryInterface; /** * Returns the mapped schema for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getModelSchema(ModelInterface $model): string; + public function getModelSchema(\Phalcon\Mvc\ModelInterface $model): string; /** * Returns the mapped source for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getModelSource(ModelInterface $model): string; + public function getModelSource(\Phalcon\Mvc\ModelInterface $model): string; /** * Returns the connection to read data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return AdapterInterface */ - public function getReadConnection(ModelInterface $model): AdapterInterface; + public function getReadConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface; /** * Returns the connection service name used to read data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getReadConnectionService(ModelInterface $model): string; + public function getReadConnectionService(\Phalcon\Mvc\ModelInterface $model): string; /** * Returns a relation by its alias @@ -309,13 +309,13 @@ public function getRelationByAlias(string $modelName, string $alias); /** * Helper method to query records based on a relation definition * + * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|int|false * @param RelationInterface $relation - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @param mixed $parameters * @param string $method - *@return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|int|false */ - public function getRelationRecords(RelationInterface $relation, ModelInterface $record, $parameters = null, string $method = null); + public function getRelationRecords(RelationInterface $relation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null); /** * Query all the relationships defined on a model @@ -337,18 +337,18 @@ public function getRelationsBetween(string $first, string $second); /** * Returns the connection to write data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return AdapterInterface */ - public function getWriteConnection(ModelInterface $model): AdapterInterface; + public function getWriteConnection(\Phalcon\Mvc\ModelInterface $model): AdapterInterface; /** * Returns the connection service name used to write data related to a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string */ - public function getWriteConnectionService(ModelInterface $model): string; + public function getWriteConnectionService(\Phalcon\Mvc\ModelInterface $model): string; /** * Loads a model throwing an exception if it doesn't exist @@ -361,9 +361,9 @@ public function load(string $modelName): ModelInterface; /** * Initializes a model in the model manager * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function initialize(ModelInterface $model); + public function initialize(\Phalcon\Mvc\ModelInterface $model); /** * Check of a model is already initialized @@ -376,18 +376,18 @@ public function isInitialized(string $className): bool; /** * Checks if a model is keeping snapshots for the queried records * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return bool */ - public function isKeepingSnapshots(ModelInterface $model): bool; + public function isKeepingSnapshots(\Phalcon\Mvc\ModelInterface $model): bool; /** * Checks if a model is using dynamic update instead of all-field update * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return bool */ - public function isUsingDynamicUpdate(ModelInterface $model): bool; + public function isUsingDynamicUpdate(\Phalcon\Mvc\ModelInterface $model): bool; /** * Check whether a model property is declared as public. @@ -399,20 +399,20 @@ public function isUsingDynamicUpdate(ModelInterface $model): bool; * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $property * @return bool */ - public function isVisibleModelProperty(ModelInterface $model, string $property): bool; + public function isVisibleModelProperty(\Phalcon\Mvc\ModelInterface $model, string $property): bool; /** * Sets if a model must keep snapshots * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param bool $keepSnapshots * @return void */ - public function keepSnapshots(ModelInterface $model, bool $keepSnapshots); + public function keepSnapshots(\Phalcon\Mvc\ModelInterface $model, bool $keepSnapshots); /** * Dispatch an event to the listeners and behaviors @@ -420,71 +420,71 @@ public function keepSnapshots(ModelInterface $model, bool $keepSnapshots); * meaning that a least one is implemented * * @param array $data - * @param ModelInterface $model + * @return bool + * @param \Phalcon\Mvc\ModelInterface $model * @param string $eventName - *@return bool */ - public function missingMethod(ModelInterface $model, string $eventName, $data); + public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $eventName, $data); /** * Receives events generated in the models and dispatches them to an events-manager if available * Notify the behaviors that are listening in the model * * @param string $eventName - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function notifyEvent(string $eventName, ModelInterface $model); + public function notifyEvent(string $eventName, \Phalcon\Mvc\ModelInterface $model); /** * Sets both write and read connection service for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $connectionService * @return void */ - public function setConnectionService(ModelInterface $model, string $connectionService); + public function setConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService); /** * Sets read connection service for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $connectionService * @return void */ - public function setReadConnectionService(ModelInterface $model, string $connectionService); + public function setReadConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService); /** * Sets the mapped schema for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $schema * @return void */ - public function setModelSchema(ModelInterface $model, string $schema); + public function setModelSchema(\Phalcon\Mvc\ModelInterface $model, string $schema); /** * Sets the mapped source for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $source * @return void */ - public function setModelSource(ModelInterface $model, string $source); + public function setModelSource(\Phalcon\Mvc\ModelInterface $model, string $source); /** * Sets write connection service for a model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $connectionService */ - public function setWriteConnectionService(ModelInterface $model, string $connectionService); + public function setWriteConnectionService(\Phalcon\Mvc\ModelInterface $model, string $connectionService); /** * Sets if a model must use dynamic update instead of the all-field update * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param bool $dynamicUpdate * @return void */ - public function useDynamicUpdate(ModelInterface $model, bool $dynamicUpdate); + public function useDynamicUpdate(\Phalcon\Mvc\ModelInterface $model, bool $dynamicUpdate); } diff --git a/src/Phalcon/Mvc/Model/MetaData.php b/src/Phalcon/Mvc/Model/MetaData.php index 0a1a2c5d..3d48ffd2 100644 --- a/src/Phalcon/Mvc/Model/MetaData.php +++ b/src/Phalcon/Mvc/Model/MetaData.php @@ -36,7 +36,7 @@ * print_r($attributes); * ``` */ -abstract class MetaData implements InjectionAwareInterface, MetaDataInterface +abstract class MetaData implements \Phalcon\Di\InjectionAwareInterface, \Phalcon\Mvc\Model\MetaDataInterface { const MODELS_ATTRIBUTES = 0; @@ -115,10 +115,10 @@ abstract class MetaData implements InjectionAwareInterface, MetaDataInterface * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getAttributes(ModelInterface $model): array + public function getAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -133,10 +133,10 @@ public function getAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getAutomaticCreateAttributes(ModelInterface $model): array + public function getAutomaticCreateAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -151,10 +151,10 @@ public function getAutomaticCreateAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getAutomaticUpdateAttributes(ModelInterface $model): array + public function getAutomaticUpdateAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -169,10 +169,10 @@ public function getAutomaticUpdateAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getBindTypes(ModelInterface $model): array + public function getBindTypes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -187,10 +187,10 @@ public function getBindTypes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getColumnMap(ModelInterface $model): array + public function getColumnMap(\Phalcon\Mvc\ModelInterface $model): array { } @@ -205,10 +205,10 @@ public function getColumnMap(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getDefaultValues(ModelInterface $model): array + public function getDefaultValues(\Phalcon\Mvc\ModelInterface $model): array { } @@ -223,10 +223,10 @@ public function getDefaultValues(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getDataTypes(ModelInterface $model): array + public function getDataTypes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -241,10 +241,10 @@ public function getDataTypes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getDataTypesNumeric(ModelInterface $model): array + public function getDataTypesNumeric(\Phalcon\Mvc\ModelInterface $model): array { } @@ -268,10 +268,10 @@ public function getDI(): DiInterface * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getEmptyStringAttributes(ModelInterface $model): array + public function getEmptyStringAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -286,10 +286,10 @@ public function getEmptyStringAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string|null */ - public function getIdentityField(ModelInterface $model): ?string + public function getIdentityField(\Phalcon\Mvc\ModelInterface $model): ?string { } @@ -304,10 +304,10 @@ public function getIdentityField(ModelInterface $model): ?string * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getNonPrimaryKeyAttributes(ModelInterface $model): array + public function getNonPrimaryKeyAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -322,10 +322,10 @@ public function getNonPrimaryKeyAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getNotNullAttributes(ModelInterface $model): array + public function getNotNullAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -340,10 +340,10 @@ public function getNotNullAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getPrimaryKeyAttributes(ModelInterface $model): array + public function getPrimaryKeyAttributes(\Phalcon\Mvc\ModelInterface $model): array { } @@ -358,10 +358,10 @@ public function getPrimaryKeyAttributes(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getReverseColumnMap(ModelInterface $model): array + public function getReverseColumnMap(\Phalcon\Mvc\ModelInterface $model): array { } @@ -386,11 +386,11 @@ public function getStrategy(): StrategyInterface * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $attribute * @return bool */ - public function hasAttribute(ModelInterface $model, string $attribute): bool + public function hasAttribute(\Phalcon\Mvc\ModelInterface $model, string $attribute): bool { } @@ -430,10 +430,10 @@ public function read(string $key): ?array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|null */ - final public function readColumnMap(ModelInterface $model): ?array + final public function readColumnMap(\Phalcon\Mvc\ModelInterface $model): ?array { } @@ -449,10 +449,10 @@ final public function readColumnMap(ModelInterface $model): ?array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param int $index */ - final public function readColumnMapIndex(ModelInterface $model, int $index) + final public function readColumnMapIndex(\Phalcon\Mvc\ModelInterface $model, int $index) { } @@ -467,10 +467,10 @@ final public function readColumnMapIndex(ModelInterface $model, int $index) * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - final public function readMetaData(ModelInterface $model): array + final public function readMetaData(\Phalcon\Mvc\ModelInterface $model): array { } @@ -486,10 +486,10 @@ final public function readMetaData(ModelInterface $model): array * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param int $index */ - final public function readMetaDataIndex(ModelInterface $model, int $index) + final public function readMetaDataIndex(\Phalcon\Mvc\ModelInterface $model, int $index) { } @@ -518,11 +518,11 @@ public function reset() * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $attributes * @return void */ - public function setAutomaticCreateAttributes(ModelInterface $model, array $attributes) + public function setAutomaticCreateAttributes(\Phalcon\Mvc\ModelInterface $model, array $attributes) { } @@ -538,11 +538,11 @@ public function setAutomaticCreateAttributes(ModelInterface $model, array $attri * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $attributes * @return void */ - public function setAutomaticUpdateAttributes(ModelInterface $model, array $attributes) + public function setAutomaticUpdateAttributes(\Phalcon\Mvc\ModelInterface $model, array $attributes) { } @@ -558,31 +558,31 @@ public function setAutomaticUpdateAttributes(ModelInterface $model, array $attri * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $attributes * @return void */ - public function setEmptyStringAttributes(ModelInterface $model, array $attributes) + public function setEmptyStringAttributes(\Phalcon\Mvc\ModelInterface $model, array $attributes) { } /** * Sets the DependencyInjector container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } /** * Set the meta-data extraction strategy * - * @param StrategyInterface $strategy + * @param \Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface $strategy * @return void */ - public function setStrategy(StrategyInterface $strategy) + public function setStrategy(\Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface $strategy) { } @@ -612,24 +612,24 @@ public function write(string $key, array $data) * ); * ``` * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param int $index * @param mixed $data * @return void */ - final public function writeMetaDataIndex(ModelInterface $model, int $index, $data) + final public function writeMetaDataIndex(\Phalcon\Mvc\ModelInterface $model, int $index, $data) { } /** * Initialize the metadata for certain table * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param mixed $key * @param mixed $table * @param mixed $schema */ - final protected function initialize(ModelInterface $model, $key, $table, $schema) + final protected function initialize(\Phalcon\Mvc\ModelInterface $model, $key, $table, $schema) { } diff --git a/src/Phalcon/Mvc/Model/MetaData/Apcu.php b/src/Phalcon/Mvc/Model/MetaData/Apcu.php index 3ef7370f..27cb4644 100644 --- a/src/Phalcon/Mvc/Model/MetaData/Apcu.php +++ b/src/Phalcon/Mvc/Model/MetaData/Apcu.php @@ -39,9 +39,9 @@ class Apcu extends MetaData * Phalcon\Mvc\Model\MetaData\Apcu constructor * * @param array $options - * @param AdapterFactory $factory + * @param \Phalcon\Cache\AdapterFactory $factory */ - public function __construct(AdapterFactory $factory, array $options = null) + public function __construct(\Phalcon\Cache\AdapterFactory $factory, array $options = null) { } } diff --git a/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php b/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php index 61352d2e..295ae497 100644 --- a/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php +++ b/src/Phalcon/Mvc/Model/MetaData/Libmemcached.php @@ -28,9 +28,9 @@ class Libmemcached extends MetaData * Phalcon\Mvc\Model\MetaData\Libmemcached constructor * * @param array $options - * @param AdapterFactory $factory + * @param \Phalcon\Cache\AdapterFactory $factory */ - public function __construct(AdapterFactory $factory, array $options = array()) + public function __construct(\Phalcon\Cache\AdapterFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Mvc/Model/MetaData/Redis.php b/src/Phalcon/Mvc/Model/MetaData/Redis.php index fee61ff1..579b0502 100644 --- a/src/Phalcon/Mvc/Model/MetaData/Redis.php +++ b/src/Phalcon/Mvc/Model/MetaData/Redis.php @@ -41,9 +41,9 @@ class Redis extends MetaData * Phalcon\Mvc\Model\MetaData\Redis constructor * * @param array $options - * @param AdapterFactory $factory + * @param \Phalcon\Cache\AdapterFactory $factory */ - public function __construct(AdapterFactory $factory, array $options = array()) + public function __construct(\Phalcon\Cache\AdapterFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php b/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php index a5b20c91..116e86f8 100644 --- a/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php +++ b/src/Phalcon/Mvc/Model/MetaData/Strategy/Annotations.php @@ -23,28 +23,28 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Annotations implements StrategyInterface +class Annotations implements \Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface { /** * Read the model's column map, this can't be inferred * - * @param ModelInterface $model - * @param DiInterface $container + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Di\DiInterface $container * @return array */ - final public function getColumnMaps(ModelInterface $model, DiInterface $container): array + final public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array { } /** * The meta-data is obtained by reading the column descriptions from the database information schema * - * @param ModelInterface $model - * @param DiInterface $container + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Di\DiInterface $container * @return array */ - final public function getMetaData(ModelInterface $model, DiInterface $container): array + final public function getMetaData(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array { } } diff --git a/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php b/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php index 3f98780f..5f07f3c3 100644 --- a/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php +++ b/src/Phalcon/Mvc/Model/MetaData/Strategy/Introspection.php @@ -21,28 +21,28 @@ * * Queries the table meta-data in order to introspect the model's metadata */ -class Introspection implements StrategyInterface +class Introspection implements \Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface { /** * Read the model's column map, this can't be inferred * - * @param ModelInterface $model - * @param DiInterface $container + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Di\DiInterface $container * @return array */ - final public function getColumnMaps(ModelInterface $model, DiInterface $container): array + final public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array { } /** * The meta-data is obtained by reading the column descriptions from the database information schema * - * @param ModelInterface $model - * @param DiInterface $container + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Di\DiInterface $container * @return array */ - final public function getMetaData(ModelInterface $model, DiInterface $container): array + final public function getMetaData(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array { } } diff --git a/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php b/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php index 865b6996..37c512ec 100644 --- a/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php +++ b/src/Phalcon/Mvc/Model/MetaData/Strategy/StrategyInterface.php @@ -26,19 +26,19 @@ interface StrategyInterface /** * Read the model's column map, this can't be inferred * - * @param ModelInterface $model - * @param DiInterface $container + * @todo Not implemented + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Di\DiInterface $container * @return array - *@todo Not implemented */ - public function getColumnMaps(ModelInterface $model, DiInterface $container): array; + public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array; /** * The meta-data is obtained by reading the column descriptions from the database information schema * - * @param ModelInterface $model - * @param DiInterface $container + * @param \Phalcon\Mvc\ModelInterface $model + * @param \Phalcon\Di\DiInterface $container * @return array */ - public function getMetaData(ModelInterface $model, DiInterface $container): array; + public function getMetaData(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array; } diff --git a/src/Phalcon/Mvc/Model/MetaDataInterface.php b/src/Phalcon/Mvc/Model/MetaDataInterface.php index c4551619..2f5baa76 100644 --- a/src/Phalcon/Mvc/Model/MetaDataInterface.php +++ b/src/Phalcon/Mvc/Model/MetaDataInterface.php @@ -23,114 +23,114 @@ interface MetaDataInterface /** * Returns table attributes names (fields) * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getAttributes(ModelInterface $model): array; + public function getAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes that must be ignored from the INSERT SQL generation * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getAutomaticCreateAttributes(ModelInterface $model): array; + public function getAutomaticCreateAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes that must be ignored from the UPDATE SQL generation * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getAutomaticUpdateAttributes(ModelInterface $model): array; + public function getAutomaticUpdateAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes and their bind data types * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getBindTypes(ModelInterface $model): array; + public function getBindTypes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns the column map if any * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getColumnMap(ModelInterface $model): array; + public function getColumnMap(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes (which have default values) and their default values * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getDefaultValues(ModelInterface $model): array; + public function getDefaultValues(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes and their data types * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getDataTypes(ModelInterface $model): array; + public function getDataTypes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes which types are numerical * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getDataTypesNumeric(ModelInterface $model): array; + public function getDataTypesNumeric(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns attributes allow empty strings * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getEmptyStringAttributes(ModelInterface $model): array; + public function getEmptyStringAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns the name of identity field (if one is present) * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return string|null */ - public function getIdentityField(ModelInterface $model): ?string; + public function getIdentityField(\Phalcon\Mvc\ModelInterface $model): ?string; /** * Returns an array of fields which are not part of the primary key * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getNonPrimaryKeyAttributes(ModelInterface $model): array; + public function getNonPrimaryKeyAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns an array of not null attributes * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getNotNullAttributes(ModelInterface $model): array; + public function getNotNullAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns an array of fields which are part of the primary key * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getPrimaryKeyAttributes(ModelInterface $model): array; + public function getPrimaryKeyAttributes(\Phalcon\Mvc\ModelInterface $model): array; /** * Returns the reverse column map if any * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function getReverseColumnMap(ModelInterface $model): array; + public function getReverseColumnMap(\Phalcon\Mvc\ModelInterface $model): array; /** * Return the strategy to obtain the meta-data @@ -142,11 +142,11 @@ public function getStrategy(): StrategyInterface; /** * Check if a model has certain attribute * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param string $attribute * @return bool */ - public function hasAttribute(ModelInterface $model, string $attribute): bool; + public function hasAttribute(\Phalcon\Mvc\ModelInterface $model, string $attribute): bool; /** * Checks if the internal meta-data container is empty @@ -166,35 +166,35 @@ public function read(string $key): ?array; /** * Reads the ordered/reversed column map for certain model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array|null */ - public function readColumnMap(ModelInterface $model): ?array; + public function readColumnMap(\Phalcon\Mvc\ModelInterface $model): ?array; /** * Reads column-map information for certain model using a MODEL_ constant * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param int $index */ - public function readColumnMapIndex(ModelInterface $model, int $index); + public function readColumnMapIndex(\Phalcon\Mvc\ModelInterface $model, int $index); /** * Reads meta-data for certain model * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @return array */ - public function readMetaData(ModelInterface $model): array; + public function readMetaData(\Phalcon\Mvc\ModelInterface $model): array; /** * Reads meta-data for certain model using a MODEL_ constant * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param int $index * @return mixed */ - public function readMetaDataIndex(ModelInterface $model, int $index); + public function readMetaDataIndex(\Phalcon\Mvc\ModelInterface $model, int $index); /** * Resets internal meta-data in order to regenerate it @@ -204,43 +204,43 @@ public function reset(); /** * Set the attributes that must be ignored from the INSERT SQL generation * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $attributes */ - public function setAutomaticCreateAttributes(ModelInterface $model, array $attributes); + public function setAutomaticCreateAttributes(\Phalcon\Mvc\ModelInterface $model, array $attributes); /** * Set the attributes that must be ignored from the UPDATE SQL generation * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $attributes */ - public function setAutomaticUpdateAttributes(ModelInterface $model, array $attributes); + public function setAutomaticUpdateAttributes(\Phalcon\Mvc\ModelInterface $model, array $attributes); /** * Set the attributes that allow empty string values * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $attributes * @return void */ - public function setEmptyStringAttributes(ModelInterface $model, array $attributes); + public function setEmptyStringAttributes(\Phalcon\Mvc\ModelInterface $model, array $attributes); /** * Writes meta-data for certain model using a MODEL_ constant * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param int $index * @param mixed $data */ - public function writeMetaDataIndex(ModelInterface $model, int $index, $data); + public function writeMetaDataIndex(\Phalcon\Mvc\ModelInterface $model, int $index, $data); /** * Set the meta-data extraction strategy * - * @param StrategyInterface $strategy + * @param \Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface $strategy */ - public function setStrategy(StrategyInterface $strategy); + public function setStrategy(\Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterface $strategy); /** * Writes meta-data to the adapter diff --git a/src/Phalcon/Mvc/Model/Query.php b/src/Phalcon/Mvc/Model/Query.php index 0056a959..f9b0a04a 100644 --- a/src/Phalcon/Mvc/Model/Query.php +++ b/src/Phalcon/Mvc/Model/Query.php @@ -75,7 +75,7 @@ * $resultWithOutEntries = $queryWithTransaction->execute(); * ``` */ -class Query implements QueryInterface, InjectionAwareInterface +class Query implements \Phalcon\Mvc\Model\QueryInterface, \Phalcon\Di\InjectionAwareInterface { const TYPE_DELETE = 303; @@ -182,20 +182,20 @@ public function getTransaction() * Phalcon\Mvc\Model\Query constructor * * @param string $phql - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @param array $options */ - public function __construct(string $phql = null, DiInterface $container = null, array $options = array()) + public function __construct(string $phql = null, \Phalcon\Di\DiInterface $container = null, array $options = array()) { } /** * Sets the dependency injection container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } @@ -510,13 +510,13 @@ final protected function _executeDelete(array $intermediate, array $bindParams, /** * Query the records on which the UPDATE/DELETE operation will be done * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $intermediate * @param array $bindParams * @param array $bindTypes * @return ResultsetInterface */ - final protected function _getRelatedRecords(ModelInterface $model, array $intermediate, array $bindParams, array $bindTypes): ResultsetInterface + final protected function _getRelatedRecords(\Phalcon\Mvc\ModelInterface $model, array $intermediate, array $bindParams, array $bindTypes): ResultsetInterface { } @@ -672,13 +672,13 @@ public static function clean() * Gets the read connection from the model if there is no transaction set * inside the query object * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $intermediate * @param array $bindParams * @param array $bindTypes * @return AdapterInterface */ - protected function getReadConnection(ModelInterface $model, array $intermediate = null, array $bindParams = array(), array $bindTypes = array()): AdapterInterface + protected function getReadConnection(\Phalcon\Mvc\ModelInterface $model, array $intermediate = null, array $bindParams = array(), array $bindTypes = array()): AdapterInterface { } @@ -686,13 +686,13 @@ protected function getReadConnection(ModelInterface $model, array $intermediate * Gets the write connection from the model if there is no transaction * inside the query object * - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $intermediate * @param array $bindParams * @param array $bindTypes * @return AdapterInterface */ - protected function getWriteConnection(ModelInterface $model, array $intermediate = null, array $bindParams = array(), array $bindTypes = array()): AdapterInterface + protected function getWriteConnection(\Phalcon\Mvc\ModelInterface $model, array $intermediate = null, array $bindParams = array(), array $bindTypes = array()): AdapterInterface { } diff --git a/src/Phalcon/Mvc/Model/Query/Builder.php b/src/Phalcon/Mvc/Model/Query/Builder.php index 715a747b..11b63604 100644 --- a/src/Phalcon/Mvc/Model/Query/Builder.php +++ b/src/Phalcon/Mvc/Model/Query/Builder.php @@ -53,7 +53,7 @@ * $queryBuilder = new \Phalcon\Mvc\Model\Query\Builder($params); * ``` */ -class Builder implements BuilderInterface, InjectionAwareInterface +class Builder implements \Phalcon\Mvc\Model\Query\BuilderInterface, \Phalcon\Di\InjectionAwareInterface { protected $bindParams; @@ -110,9 +110,9 @@ class Builder implements BuilderInterface, InjectionAwareInterface * Phalcon\Mvc\Model\Query\Builder constructor * * @param mixed $params - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function __construct($params = null, DiInterface $container = null) + public function __construct($params = null, \Phalcon\Di\DiInterface $container = null) { } @@ -836,10 +836,10 @@ public function setBindTypes(array $bindTypes, bool $merge = false): BuilderInte /** * Sets the DependencyInjector container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } diff --git a/src/Phalcon/Mvc/Model/Query/Status.php b/src/Phalcon/Mvc/Model/Query/Status.php index 24d7ec08..6c1e9a11 100644 --- a/src/Phalcon/Mvc/Model/Query/Status.php +++ b/src/Phalcon/Mvc/Model/Query/Status.php @@ -39,7 +39,7 @@ * } * ``` */ -class Status implements StatusInterface +class Status implements \Phalcon\Mvc\Model\Query\StatusInterface { protected $model; @@ -52,16 +52,16 @@ class Status implements StatusInterface * Phalcon\Mvc\Model\Query\Status * * @param bool $success - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model */ - public function __construct(bool $success, ModelInterface $model = null) + public function __construct(bool $success, \Phalcon\Mvc\ModelInterface $model = null) { } /** * Returns the messages produced because of a failed operation * - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getMessages(): array { diff --git a/src/Phalcon/Mvc/Model/Query/StatusInterface.php b/src/Phalcon/Mvc/Model/Query/StatusInterface.php index fdbdf9b3..c899514a 100644 --- a/src/Phalcon/Mvc/Model/Query/StatusInterface.php +++ b/src/Phalcon/Mvc/Model/Query/StatusInterface.php @@ -23,7 +23,7 @@ interface StatusInterface /** * Returns the messages produced by an operation failed * - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getMessages(): array; diff --git a/src/Phalcon/Mvc/Model/Relation.php b/src/Phalcon/Mvc/Model/Relation.php index 39caf395..5b0487aa 100644 --- a/src/Phalcon/Mvc/Model/Relation.php +++ b/src/Phalcon/Mvc/Model/Relation.php @@ -14,7 +14,7 @@ * * This class represents a relationship between two models */ -class Relation implements RelationInterface +class Relation implements \Phalcon\Mvc\Model\RelationInterface { const ACTION_CASCADE = 2; diff --git a/src/Phalcon/Mvc/Model/Resultset.php b/src/Phalcon/Mvc/Model/Resultset.php index ec71b0d5..aa8a4f10 100644 --- a/src/Phalcon/Mvc/Model/Resultset.php +++ b/src/Phalcon/Mvc/Model/Resultset.php @@ -64,7 +64,7 @@ * } * ``` */ -abstract class Resultset implements ResultsetInterface, Iterator, SeekableIterator, Countable, ArrayAccess, Serializable, JsonSerializable +abstract class Resultset implements \Phalcon\Mvc\Model\ResultsetInterface, \Iterator, \SeekableIterator, \Countable, \ArrayAccess, \Serializable, \JsonSerializable { const HYDRATE_ARRAYS = 1; @@ -118,9 +118,9 @@ abstract class Resultset implements ResultsetInterface, Iterator, SeekableIterat * Phalcon\Mvc\Model\Resultset constructor * * @param \Phalcon\Db\ResultInterface|false $result - * @param AdapterInterface $cache + * @param \Phalcon\Cache\Adapter\AdapterInterface $cache */ - public function __construct($result, AdapterInterface $cache = null) + public function __construct($result, \Phalcon\Cache\Adapter\AdapterInterface $cache = null) { } @@ -136,10 +136,10 @@ final public function count(): int /** * Deletes every record in the resultset * - * @param Closure $conditionCallback + * @param \Closure $conditionCallback * @return bool */ - public function delete(Closure $conditionCallback = null): bool + public function delete(\Closure $conditionCallback = null): bool { } @@ -157,7 +157,7 @@ public function delete(Closure $conditionCallback = null): bool * ``` * * @param callable $filter - * @return array|ModelInterface[] + * @return array|\Phalcon\Mvc\ModelInterface[] */ public function filter($filter): array { @@ -202,7 +202,7 @@ public function getLast(): ?ModelInterface /** * Returns the error messages produced by a batch operation * - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getMessages(): array { @@ -284,7 +284,7 @@ public function offsetExists($index): bool * Resultsets cannot be changed. It has only been implemented to meet the definition of the ArrayAccess interface * * @param int $index - * @param ModelInterface $value + * @param \Phalcon\Mvc\ModelInterface $value * @return void */ public function offsetSet($index, $value) @@ -345,10 +345,10 @@ public function setIsFresh(bool $isFresh): ResultsetInterface * Updates every record in the resultset * * @param array $data - * @param Closure $conditionCallback + * @param \Closure $conditionCallback * @return bool */ - public function update($data, Closure $conditionCallback = null): bool + public function update($data, \Closure $conditionCallback = null): bool { } diff --git a/src/Phalcon/Mvc/Model/Resultset/Complex.php b/src/Phalcon/Mvc/Model/Resultset/Complex.php index 7a2550e5..216ba78b 100644 --- a/src/Phalcon/Mvc/Model/Resultset/Complex.php +++ b/src/Phalcon/Mvc/Model/Resultset/Complex.php @@ -28,7 +28,7 @@ * Complex resultsets may include complete objects and scalar values. * This class builds every complex row as it is required */ -class Complex extends Resultset implements ResultsetInterface +class Complex extends Resultset implements \Phalcon\Mvc\Model\ResultsetInterface { protected $columnTypes; @@ -44,10 +44,10 @@ class Complex extends Resultset implements ResultsetInterface * Phalcon\Mvc\Model\Resultset\Complex constructor * * @param array $columnTypes - * @param ResultInterface $result - * @param AdapterInterface $cache + * @param \Phalcon\Db\ResultInterface $result + * @param \Phalcon\Cache\Adapter\AdapterInterface $cache */ - public function __construct($columnTypes, ResultInterface $result = null, AdapterInterface $cache = null) + public function __construct($columnTypes, \Phalcon\Db\ResultInterface $result = null, \Phalcon\Cache\Adapter\AdapterInterface $cache = null) { } diff --git a/src/Phalcon/Mvc/Model/Resultset/Simple.php b/src/Phalcon/Mvc/Model/Resultset/Simple.php index 927501b0..0622bdf2 100644 --- a/src/Phalcon/Mvc/Model/Resultset/Simple.php +++ b/src/Phalcon/Mvc/Model/Resultset/Simple.php @@ -15,6 +15,7 @@ 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; @@ -42,12 +43,12 @@ class Simple extends Resultset * Phalcon\Mvc\Model\Resultset\Simple constructor * * @param array $columnMap - * @param ModelInterface|Phalcon\Mvc\Model\Row $model + * @param \Phalcon\Mvc\ModelInterface|Phalcon\Mvc\Model\Row $model * @param mixed $result - * @param AdapterInterface $cache + * @param \Phalcon\Cache\Adapter\AdapterInterface $cache * @param bool $keepSnapshots */ - public function __construct($columnMap, $model, $result, AdapterInterface $cache = null, bool $keepSnapshots = null) + public function __construct($columnMap, $model, $result, \Phalcon\Cache\Adapter\AdapterInterface $cache = null, bool $keepSnapshots = null) { } diff --git a/src/Phalcon/Mvc/Model/ResultsetInterface.php b/src/Phalcon/Mvc/Model/ResultsetInterface.php index 77993d7c..8852a7eb 100644 --- a/src/Phalcon/Mvc/Model/ResultsetInterface.php +++ b/src/Phalcon/Mvc/Model/ResultsetInterface.php @@ -25,10 +25,10 @@ interface ResultsetInterface /** * Deletes every record in the resultset * - * @param Closure $conditionCallback + * @param \Closure $conditionCallback * @return bool */ - public function delete(Closure $conditionCallback = null): bool; + public function delete(\Closure $conditionCallback = null): bool; /** * Filters a resultset returning only those the developer requires @@ -44,7 +44,7 @@ public function delete(Closure $conditionCallback = null): bool; * ``` * * @param callable $filter - * @return array|ModelInterface[] + * @return array|\Phalcon\Mvc\ModelInterface[] */ public function filter($filter): array; @@ -79,7 +79,7 @@ public function getLast(): ?ModelInterface; /** * Returns the error messages produced by a batch operation * - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getMessages(): array; @@ -125,8 +125,8 @@ public function toArray(): array; * Updates every record in the resultset * * @param array $data - * @param Closure $conditionCallback + * @param \Closure $conditionCallback * @return bool */ - public function update($data, Closure $conditionCallback = null): bool; + public function update($data, \Closure $conditionCallback = null): bool; } diff --git a/src/Phalcon/Mvc/Model/Row.php b/src/Phalcon/Mvc/Model/Row.php index 97721568..41322110 100644 --- a/src/Phalcon/Mvc/Model/Row.php +++ b/src/Phalcon/Mvc/Model/Row.php @@ -20,7 +20,7 @@ * This component allows Phalcon\Mvc\Model to return rows without an associated entity. * This objects implements the ArrayAccess interface to allow access the object as object->x or array[x]. */ -class Row implements EntityInterface, ResultInterface, ArrayAccess, JsonSerializable +class Row implements \Phalcon\Mvc\EntityInterface, \Phalcon\Mvc\Model\ResultInterface, \ArrayAccess, \JsonSerializable { /** @@ -56,7 +56,7 @@ public function offsetExists($index): bool * Rows cannot be changed. It has only been implemented to meet the definition of the ArrayAccess interface * * @param string|int $index - * @param ModelInterface $value + * @param \Phalcon\Mvc\ModelInterface $value * @return void */ public function offsetSet($index, $value) diff --git a/src/Phalcon/Mvc/Model/Transaction.php b/src/Phalcon/Mvc/Model/Transaction.php index 20ec902d..af323b46 100644 --- a/src/Phalcon/Mvc/Model/Transaction.php +++ b/src/Phalcon/Mvc/Model/Transaction.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Mvc\Model; -use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Di\DiInterface; use Phalcon\Mvc\ModelInterface; use Phalcon\Mvc\Model\Transaction\Failed as TxFailed; @@ -90,11 +89,11 @@ class Transaction implements \Phalcon\Mvc\Model\TransactionInterface /** * Phalcon\Mvc\Model\Transaction constructor * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @param bool $autoBegin * @param string $service */ - public function __construct(DiInterface $container, bool $autoBegin = false, string $service = 'db') + public function __construct(\Phalcon\Di\DiInterface $container, bool $autoBegin = false, string $service = 'db') { } @@ -119,9 +118,9 @@ public function commit(): bool /** * Returns the connection related to transaction * - * @return AdapterInterface + * @return \Phalcon\Db\Adapter\AdapterInterface */ - public function getConnection(): AdapterInterface + public function getConnection(): \Phalcon\Db\Adapter\AdapterInterface { } @@ -156,10 +155,10 @@ public function isValid(): bool * Rollbacks the transaction * * @param string $rollbackMessage - * @param ModelInterface $rollbackRecord + * @param \Phalcon\Mvc\ModelInterface $rollbackRecord * @return bool */ - public function rollback(string $rollbackMessage = null, ModelInterface $rollbackRecord = null): bool + public function rollback(string $rollbackMessage = null, \Phalcon\Mvc\ModelInterface $rollbackRecord = null): bool { } @@ -186,20 +185,20 @@ public function setRollbackOnAbort(bool $rollbackOnAbort) /** * Sets object which generates rollback action * - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @return void */ - public function setRollbackedRecord(ModelInterface $record) + public function setRollbackedRecord(\Phalcon\Mvc\ModelInterface $record) { } /** * Sets transaction manager related to the transaction * - * @param ManagerInterface $manager + * @param \Phalcon\Mvc\Model\Transaction\ManagerInterface $manager * @return void */ - public function setTransactionManager(ManagerInterface $manager) + public function setTransactionManager(\Phalcon\Mvc\Model\Transaction\ManagerInterface $manager) { } diff --git a/src/Phalcon/Mvc/Model/Transaction/Failed.php b/src/Phalcon/Mvc/Model/Transaction/Failed.php index 6045fdf9..fe6b28a9 100644 --- a/src/Phalcon/Mvc/Model/Transaction/Failed.php +++ b/src/Phalcon/Mvc/Model/Transaction/Failed.php @@ -17,7 +17,7 @@ * * This class will be thrown to exit a try/catch block for isolated transactions */ -class Failed extends Exception +class Failed extends \Phalcon\Mvc\Model\Transaction\Exception { protected $record = null; @@ -27,9 +27,9 @@ class Failed extends Exception * Phalcon\Mvc\Model\Transaction\Failed constructor * * @param string $message - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record */ - public function __construct(string $message, ModelInterface $record = null) + public function __construct(string $message, \Phalcon\Mvc\ModelInterface $record = null) { } @@ -45,7 +45,7 @@ public function getRecord(): ModelInterface /** * Returns validation record messages which stop the transaction * - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getRecordMessages(): array { diff --git a/src/Phalcon/Mvc/Model/Transaction/Manager.php b/src/Phalcon/Mvc/Model/Transaction/Manager.php index 157ba1a1..a4d2978f 100644 --- a/src/Phalcon/Mvc/Model/Transaction/Manager.php +++ b/src/Phalcon/Mvc/Model/Transaction/Manager.php @@ -62,7 +62,7 @@ * } * ``` */ -class Manager implements ManagerInterface, InjectionAwareInterface +class Manager implements \Phalcon\Mvc\Model\Transaction\ManagerInterface, \Phalcon\Di\InjectionAwareInterface { protected $container; @@ -88,9 +88,9 @@ class Manager implements ManagerInterface, InjectionAwareInterface /** * Phalcon\Mvc\Model\Transaction\Manager constructor * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function __construct(DiInterface $container = null) + public function __construct(\Phalcon\Di\DiInterface $container = null) { } @@ -171,20 +171,20 @@ public function has(): bool /** * Notifies the manager about a committed transaction * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return void */ - public function notifyCommit(TransactionInterface $transaction) + public function notifyCommit(\Phalcon\Mvc\Model\TransactionInterface $transaction) { } /** * Notifies the manager about a rollbacked transaction * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return void */ - public function notifyRollback(TransactionInterface $transaction) + public function notifyRollback(\Phalcon\Mvc\Model\TransactionInterface $transaction) { } @@ -221,10 +221,10 @@ public function setDbService(string $service): ManagerInterface /** * Sets the dependency injection container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } @@ -242,10 +242,10 @@ public function setRollbackPendent(bool $rollbackPendent): ManagerInterface /** * Removes transactions from the TransactionManager * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return void */ - protected function collectTransaction(TransactionInterface $transaction) + protected function collectTransaction(\Phalcon\Mvc\Model\TransactionInterface $transaction) { } } diff --git a/src/Phalcon/Mvc/Model/Transaction/ManagerInterface.php b/src/Phalcon/Mvc/Model/Transaction/ManagerInterface.php index 600b3ba8..d2acfa22 100644 --- a/src/Phalcon/Mvc/Model/Transaction/ManagerInterface.php +++ b/src/Phalcon/Mvc/Model/Transaction/ManagerInterface.php @@ -63,18 +63,18 @@ public function has(): bool; /** * Notifies the manager about a committed transaction * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return void */ - public function notifyCommit(TransactionInterface $transaction); + public function notifyCommit(\Phalcon\Mvc\Model\TransactionInterface $transaction); /** * Notifies the manager about a rollbacked transaction * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return void */ - public function notifyRollback(TransactionInterface $transaction); + public function notifyRollback(\Phalcon\Mvc\Model\TransactionInterface $transaction); /** * Rollbacks active transactions within the manager diff --git a/src/Phalcon/Mvc/Model/TransactionInterface.php b/src/Phalcon/Mvc/Model/TransactionInterface.php index 01ab543a..dc112efd 100644 --- a/src/Phalcon/Mvc/Model/TransactionInterface.php +++ b/src/Phalcon/Mvc/Model/TransactionInterface.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Mvc\Model; -use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Mvc\ModelInterface; use Phalcon\Mvc\Model\Transaction\ManagerInterface; @@ -38,9 +37,9 @@ public function commit(): bool; /** * Returns connection related to transaction * - * @return AdapterInterface + * @return \Phalcon\Db\Adapter\AdapterInterface */ - public function getConnection(): AdapterInterface; + public function getConnection(): \Phalcon\Db\Adapter\AdapterInterface; /** * Returns validations messages from last save try @@ -67,10 +66,10 @@ public function isValid(): bool; * Rollbacks the transaction * * @param string $rollbackMessage - * @param ModelInterface $rollbackRecord + * @param \Phalcon\Mvc\ModelInterface $rollbackRecord * @return bool */ - public function rollback(string $rollbackMessage = null, ModelInterface $rollbackRecord = null): bool; + public function rollback(string $rollbackMessage = null, \Phalcon\Mvc\ModelInterface $rollbackRecord = null): bool; /** * Sets if is a reused transaction or new once @@ -91,18 +90,18 @@ public function setRollbackOnAbort(bool $rollbackOnAbort); /** * Sets object which generates rollback action * - * @param ModelInterface $record + * @param \Phalcon\Mvc\ModelInterface $record * @return void */ - public function setRollbackedRecord(ModelInterface $record); + public function setRollbackedRecord(\Phalcon\Mvc\ModelInterface $record); /** * Sets transaction manager related to the transaction * - * @param ManagerInterface $manager + * @param \Phalcon\Mvc\Model\Transaction\ManagerInterface $manager * @return void */ - public function setTransactionManager(ManagerInterface $manager); + public function setTransactionManager(\Phalcon\Mvc\Model\Transaction\ManagerInterface $manager); /** * Enables throwing exception diff --git a/src/Phalcon/Mvc/Model/ValidationFailed.php b/src/Phalcon/Mvc/Model/ValidationFailed.php index dbe051a3..f532b193 100644 --- a/src/Phalcon/Mvc/Model/ValidationFailed.php +++ b/src/Phalcon/Mvc/Model/ValidationFailed.php @@ -17,7 +17,7 @@ * This exception is generated when a model fails to save a record * Phalcon\Mvc\Model must be set up to have this behavior */ -class ValidationFailed extends Exception +class ValidationFailed extends \Phalcon\Mvc\Model\Exception { protected $messages; @@ -30,11 +30,11 @@ class ValidationFailed extends Exception * Phalcon\Mvc\Model\ValidationFailed constructor * * @param Message[] validationMessages - * @param ModelInterface $model + * @param \Phalcon\Mvc\ModelInterface $model * @param array $validationMessages * @param Message [] validationMessages */ - public function __construct(ModelInterface $model, array $validationMessages) + public function __construct(\Phalcon\Mvc\ModelInterface $model, array $validationMessages) { } diff --git a/src/Phalcon/Mvc/ModelInterface.php b/src/Phalcon/Mvc/ModelInterface.php index 80537a70..32b7d7c4 100644 --- a/src/Phalcon/Mvc/ModelInterface.php +++ b/src/Phalcon/Mvc/ModelInterface.php @@ -14,7 +14,6 @@ use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\Model\CriteriaInterface; use Phalcon\Mvc\Model\MetaDataInterface; -use Phalcon\Mvc\Model\Resultset\Simple; use Phalcon\Mvc\Model\ResultsetInterface; use Phalcon\Mvc\Model\TransactionInterface; @@ -29,10 +28,10 @@ interface ModelInterface /** * Appends a customized message on the validation process * - * @param MessageInterface $message + * @param \Phalcon\Messages\MessageInterface $message * @return ModelInterface */ - public function appendMessage(MessageInterface $message): ModelInterface; + public function appendMessage(\Phalcon\Messages\MessageInterface $message): ModelInterface; /** * Assigns values to a model from an array @@ -67,12 +66,12 @@ public static function cloneResult(ModelInterface $base, array $data, int $dirty /** * Assigns values to a model from an array returning a new model * - * @param Model $base + * @param \Phalcon\Mvc\Model $base * @param array $columnMap + * @return \Phalcon\Mvc\Model result * @param array $data * @param int $dirtyState * @param bool $keepSnapshots - *@return Model result */ public static function cloneResultMap($base, array $data, $columnMap, int $dirtyState = 0, bool $keepSnapshots = null): ModelInterface; @@ -155,7 +154,7 @@ public function getDirtyState(): int; /** * Returns array of validation messages * - * @return array|MessageInterface[] + * @return array|\Phalcon\Messages\MessageInterface[] */ public function getMessages(): array; @@ -192,7 +191,7 @@ public function getReadConnectionService(): string; * Returns related records based on defined relations * * @param array $arguments - * @return Simple|Phalcon\Mvc\Model\Resultset\Simple|false + * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|false * @param string $alias */ public function getRelated(string $alias, $arguments = null); @@ -246,10 +245,10 @@ public static function minimum($parameters = null); /** * Create a criteria for a specific model * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return CriteriaInterface */ - public static function query(DiInterface $container = null): CriteriaInterface; + public static function query(\Phalcon\Di\DiInterface $container = null): CriteriaInterface; /** * Refreshes the model attributes re-querying the record from the database @@ -304,10 +303,10 @@ public function setSnapshotData(array $data, $columnMap = null); /** * Sets a transaction related to the Model instance * - * @param TransactionInterface $transaction + * @param \Phalcon\Mvc\Model\TransactionInterface $transaction * @return ModelInterface */ - public function setTransaction(TransactionInterface $transaction): ModelInterface; + public function setTransaction(\Phalcon\Mvc\Model\TransactionInterface $transaction): ModelInterface; /** * Sets the DependencyInjection connection service used to write data diff --git a/src/Phalcon/Mvc/ModuleDefinitionInterface.php b/src/Phalcon/Mvc/ModuleDefinitionInterface.php index e4804a86..514135f4 100644 --- a/src/Phalcon/Mvc/ModuleDefinitionInterface.php +++ b/src/Phalcon/Mvc/ModuleDefinitionInterface.php @@ -22,14 +22,14 @@ interface ModuleDefinitionInterface /** * Registers an autoloader related to the module * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function registerAutoloaders(DiInterface $container = null); + public function registerAutoloaders(\Phalcon\Di\DiInterface $container = null); /** * Registers services related to the module * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container */ - public function registerServices(DiInterface $container); + public function registerServices(\Phalcon\Di\DiInterface $container); } diff --git a/src/Phalcon/Mvc/Router.php b/src/Phalcon/Mvc/Router.php index b02608d7..a9a02b4a 100644 --- a/src/Phalcon/Mvc/Router.php +++ b/src/Phalcon/Mvc/Router.php @@ -47,7 +47,7 @@ * echo $router->getControllerName(); * ``` */ -class Router extends AbstractInjectionAware implements RouterInterface, EventsAwareInterface +class Router extends AbstractInjectionAware implements \Phalcon\Mvc\RouterInterface, \Phalcon\Events\EventsAwareInterface { const POSITION_FIRST = 0; @@ -376,11 +376,11 @@ public function addTrace(string $pattern, $paths = null, $position = Router::POS * ); * ``` * - * @param RouteInterface $route + * @param \Phalcon\Mvc\Router\RouteInterface $route * @param mixed $position * @return RouterInterface */ - public function attach(RouteInterface $route, $position = Router::POSITION_LAST): RouterInterface + public function attach(\Phalcon\Mvc\Router\RouteInterface $route, $position = Router::POSITION_LAST): RouterInterface { } @@ -488,7 +488,7 @@ public function getRouteByName(string $name) /** * Returns all the routes defined in the router * - * @return array|RouteInterface[] + * @return array|\Phalcon\Mvc\Router\RouteInterface[] */ public function getRoutes(): array { @@ -521,10 +521,10 @@ public function isExactControllerName(): bool /** * Mounts a group of routes in the router * - * @param GroupInterface $group + * @param \Phalcon\Mvc\Router\GroupInterface $group * @return RouterInterface */ - public function mount(GroupInterface $group): RouterInterface + public function mount(\Phalcon\Mvc\Router\GroupInterface $group): RouterInterface { } @@ -622,10 +622,10 @@ public function getDefaults(): array /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } diff --git a/src/Phalcon/Mvc/Router/Annotations.php b/src/Phalcon/Mvc/Router/Annotations.php index 58958b68..bead7d61 100644 --- a/src/Phalcon/Mvc/Router/Annotations.php +++ b/src/Phalcon/Mvc/Router/Annotations.php @@ -102,9 +102,9 @@ public function handle(string $uri) * @param string $namespaceName * @param string $controller * @param string $action - * @param Annotation $annotation + * @param \Phalcon\Annotations\Annotation $annotation */ - public function processActionAnnotation(string $module, string $namespaceName, string $controller, string $action, Annotation $annotation) + public function processActionAnnotation(string $module, string $namespaceName, string $controller, string $action, \Phalcon\Annotations\Annotation $annotation) { } @@ -112,9 +112,9 @@ public function processActionAnnotation(string $module, string $namespaceName, s * Checks for annotations in the controller docblock * * @param string $handler - * @param Annotation $annotation + * @param \Phalcon\Annotations\Annotation $annotation */ - public function processControllerAnnotation(string $handler, Annotation $annotation) + public function processControllerAnnotation(string $handler, \Phalcon\Annotations\Annotation $annotation) { } diff --git a/src/Phalcon/Mvc/Router/Group.php b/src/Phalcon/Mvc/Router/Group.php index 6250c89b..f6b9b6d7 100644 --- a/src/Phalcon/Mvc/Router/Group.php +++ b/src/Phalcon/Mvc/Router/Group.php @@ -57,7 +57,7 @@ * $router->mount($blog); * ``` */ -class Group implements GroupInterface +class Group implements \Phalcon\Mvc\Router\GroupInterface { protected $beforeMatch; diff --git a/src/Phalcon/Mvc/Router/Route.php b/src/Phalcon/Mvc/Router/Route.php index 7b1aac76..bb9ea158 100644 --- a/src/Phalcon/Mvc/Router/Route.php +++ b/src/Phalcon/Mvc/Router/Route.php @@ -14,7 +14,7 @@ * * This class represents every route added to the router */ -class Route implements RouteInterface +class Route implements \Phalcon\Mvc\Router\RouteInterface { protected $beforeMatch; diff --git a/src/Phalcon/Mvc/RouterInterface.php b/src/Phalcon/Mvc/RouterInterface.php index ccc95fa9..41a01d0b 100644 --- a/src/Phalcon/Mvc/RouterInterface.php +++ b/src/Phalcon/Mvc/RouterInterface.php @@ -31,11 +31,11 @@ public function add(string $pattern, $paths = null, $httpMethods = null): RouteI /** * Attach Route object to the routes stack. * - * @param RouteInterface $route + * @param \Phalcon\Mvc\Router\RouteInterface $route * @param mixed $position * @return RouterInterface */ - public function attach(RouteInterface $route, $position = Router::POSITION_LAST): RouterInterface; + public function attach(\Phalcon\Mvc\Router\RouteInterface $route, $position = Router::POSITION_LAST): RouterInterface; /** * Adds a route to the router that only match if the HTTP method is CONNECT @@ -187,7 +187,7 @@ public function getParams(): array; /** * Return all the routes defined in the router * - * @return array|RouteInterface[] + * @return array|\Phalcon\Mvc\Router\RouteInterface[] */ public function getRoutes(): array; @@ -218,10 +218,10 @@ public function handle(string $uri); /** * Mounts a group of routes in the router * - * @param GroupInterface $group + * @param \Phalcon\Mvc\Router\GroupInterface $group * @return RouterInterface */ - public function mount(GroupInterface $group): RouterInterface; + public function mount(\Phalcon\Mvc\Router\GroupInterface $group): RouterInterface; /** * Sets the default action name diff --git a/src/Phalcon/Mvc/View.php b/src/Phalcon/Mvc/View.php index 856ab359..502f3cf0 100644 --- a/src/Phalcon/Mvc/View.php +++ b/src/Phalcon/Mvc/View.php @@ -45,7 +45,7 @@ * echo $view->getContent(); * ``` */ -class View extends Injectable implements ViewInterface, EventsAwareInterface +class View extends Injectable implements \Phalcon\Mvc\ViewInterface, \Phalcon\Events\EventsAwareInterface { /** * Render Level: To the action view @@ -597,10 +597,10 @@ public function setContent(string $content): View /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } diff --git a/src/Phalcon/Mvc/View/Engine/AbstractEngine.php b/src/Phalcon/Mvc/View/Engine/AbstractEngine.php index a3d8e5bd..b81f3d0d 100644 --- a/src/Phalcon/Mvc/View/Engine/AbstractEngine.php +++ b/src/Phalcon/Mvc/View/Engine/AbstractEngine.php @@ -17,7 +17,7 @@ * All the template engine adapters must inherit this class. This provides * basic interfacing between the engine and the Phalcon\Mvc\View component. */ -abstract class AbstractEngine extends Injectable implements EngineInterface +abstract class AbstractEngine extends Injectable implements \Phalcon\Mvc\View\Engine\EngineInterface { protected $view; @@ -26,10 +26,10 @@ abstract class AbstractEngine extends Injectable implements EngineInterface /** * Phalcon\Mvc\View\Engine constructor * - * @param ViewBaseInterface $view - * @param DiInterface $container + * @param \Phalcon\Mvc\ViewBaseInterface $view + * @param \Phalcon\Di\DiInterface $container */ - public function __construct(ViewBaseInterface $view, DiInterface $container = null) + public function __construct(\Phalcon\Mvc\ViewBaseInterface $view, \Phalcon\Di\DiInterface $container = null) { } diff --git a/src/Phalcon/Mvc/View/Engine/Php.php b/src/Phalcon/Mvc/View/Engine/Php.php index 283f1802..35138e3f 100644 --- a/src/Phalcon/Mvc/View/Engine/Php.php +++ b/src/Phalcon/Mvc/View/Engine/Php.php @@ -12,7 +12,7 @@ /** * Adapter to use PHP itself as templating engine */ -class Php extends AbstractEngine +class Php extends \Phalcon\Mvc\View\Engine\AbstractEngine { /** diff --git a/src/Phalcon/Mvc/View/Engine/Volt.php b/src/Phalcon/Mvc/View/Engine/Volt.php index 4c6958a6..78651114 100644 --- a/src/Phalcon/Mvc/View/Engine/Volt.php +++ b/src/Phalcon/Mvc/View/Engine/Volt.php @@ -18,7 +18,7 @@ /** * Designer friendly and fast template engine for PHP written in Zephir/C */ -class Volt extends AbstractEngine implements EventsAwareInterface +class Volt extends \Phalcon\Mvc\View\Engine\AbstractEngine implements \Phalcon\Events\EventsAwareInterface { protected $compiler; @@ -118,10 +118,10 @@ public function render(string $templatePath, $params, bool $mustClean = false) /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } diff --git a/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php b/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php index 439123aa..ff7b45dc 100644 --- a/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php +++ b/src/Phalcon/Mvc/View/Engine/Volt/Compiler.php @@ -25,7 +25,7 @@ * require $compiler->getCompiledTemplatePath(); * ``` */ -class Compiler implements InjectionAwareInterface +class Compiler implements \Phalcon\Di\InjectionAwareInterface { protected $autoescape = false; @@ -94,9 +94,9 @@ class Compiler implements InjectionAwareInterface /** * Phalcon\Mvc\View\Engine\Volt\Compiler * - * @param ViewBaseInterface $view + * @param \Phalcon\Mvc\ViewBaseInterface $view */ - public function __construct(ViewBaseInterface $view = null) + public function __construct(\Phalcon\Mvc\ViewBaseInterface $view = null) { } @@ -493,10 +493,10 @@ public function resolveTest(array $test, string $left): string /** * Sets the dependency injector * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } diff --git a/src/Phalcon/Mvc/View/Engine/Volt/Exception.php b/src/Phalcon/Mvc/View/Engine/Volt/Exception.php index cd92fc12..a097d61c 100644 --- a/src/Phalcon/Mvc/View/Engine/Volt/Exception.php +++ b/src/Phalcon/Mvc/View/Engine/Volt/Exception.php @@ -14,7 +14,7 @@ /** * Class for exceptions thrown by Phalcon\Mvc\View */ -class Exception extends BaseException +class Exception extends \Phalcon\Mvc\View\Exception { protected $statement; diff --git a/src/Phalcon/Mvc/View/Simple.php b/src/Phalcon/Mvc/View/Simple.php index f38154eb..94bc11ff 100644 --- a/src/Phalcon/Mvc/View/Simple.php +++ b/src/Phalcon/Mvc/View/Simple.php @@ -47,7 +47,7 @@ * ); * ``` */ -class Simple extends Injectable implements ViewBaseInterface, EventsAwareInterface +class Simple extends Injectable implements \Phalcon\Mvc\ViewBaseInterface, \Phalcon\Events\EventsAwareInterface { protected $activeRenderPath; @@ -252,10 +252,10 @@ public function setContent(string $content): Simple /** * Sets the events manager * - * @param ManagerInterface $eventsManager + * @param \Phalcon\Events\ManagerInterface $eventsManager * @return void */ - public function setEventsManager(ManagerInterface $eventsManager) + public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager) { } diff --git a/src/Phalcon/Mvc/ViewInterface.php b/src/Phalcon/Mvc/ViewInterface.php index f7a7ac71..c791f141 100644 --- a/src/Phalcon/Mvc/ViewInterface.php +++ b/src/Phalcon/Mvc/ViewInterface.php @@ -14,7 +14,7 @@ * * Interface for Phalcon\Mvc\View */ -interface ViewInterface extends ViewBaseInterface +interface ViewInterface extends \Phalcon\Mvc\ViewBaseInterface { /** diff --git a/src/Phalcon/Paginator/Adapter/AbstractAdapter.php b/src/Phalcon/Paginator/Adapter/AbstractAdapter.php index 035b9cf6..bb1378af 100644 --- a/src/Phalcon/Paginator/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Paginator/Adapter/AbstractAdapter.php @@ -16,7 +16,7 @@ /** * Phalcon\Paginator\Adapter\AbstractAdapter */ -abstract class AbstractAdapter implements AdapterInterface +abstract class AbstractAdapter implements \Phalcon\Paginator\Adapter\AdapterInterface { /** * Configuration of paginator @@ -82,10 +82,10 @@ public function setLimit(int $limitRows): AdapterInterface /** * Sets current repository for pagination * - * @param RepositoryInterface $repository + * @param \Phalcon\Paginator\RepositoryInterface $repository * @return AdapterInterface */ - public function setRepository(RepositoryInterface $repository): AdapterInterface + public function setRepository(\Phalcon\Paginator\RepositoryInterface $repository): AdapterInterface { } diff --git a/src/Phalcon/Paginator/Adapter/Model.php b/src/Phalcon/Paginator/Adapter/Model.php index de87027a..21f04fe3 100644 --- a/src/Phalcon/Paginator/Adapter/Model.php +++ b/src/Phalcon/Paginator/Adapter/Model.php @@ -79,7 +79,7 @@ * $paginate = $paginator->paginate(); * ``` */ -class Model extends AbstractAdapter +class Model extends \Phalcon\Paginator\Adapter\AbstractAdapter { /** diff --git a/src/Phalcon/Paginator/Adapter/NativeArray.php b/src/Phalcon/Paginator/Adapter/NativeArray.php index b244a004..98dc5e5e 100644 --- a/src/Phalcon/Paginator/Adapter/NativeArray.php +++ b/src/Phalcon/Paginator/Adapter/NativeArray.php @@ -35,7 +35,7 @@ * ); * ``` */ -class NativeArray extends AbstractAdapter +class NativeArray extends \Phalcon\Paginator\Adapter\AbstractAdapter { /** diff --git a/src/Phalcon/Paginator/Adapter/QueryBuilder.php b/src/Phalcon/Paginator/Adapter/QueryBuilder.php index a96864d8..6d325ea0 100644 --- a/src/Phalcon/Paginator/Adapter/QueryBuilder.php +++ b/src/Phalcon/Paginator/Adapter/QueryBuilder.php @@ -36,7 +36,7 @@ * ); * ``` */ -class QueryBuilder extends AbstractAdapter +class QueryBuilder extends \Phalcon\Paginator\Adapter\AbstractAdapter { /** * Paginator's data @@ -92,10 +92,10 @@ public function paginate(): RepositoryInterface /** * Set query builder object * - * @param Builder $builder + * @param \Phalcon\Mvc\Model\Query\Builder $builder * @return QueryBuilder */ - public function setQueryBuilder(Builder $builder): QueryBuilder + public function setQueryBuilder(\Phalcon\Mvc\Model\Query\Builder $builder): QueryBuilder { } } diff --git a/src/Phalcon/Paginator/PaginatorFactory.php b/src/Phalcon/Paginator/PaginatorFactory.php index b25e340c..ce26290e 100644 --- a/src/Phalcon/Paginator/PaginatorFactory.php +++ b/src/Phalcon/Paginator/PaginatorFactory.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Paginator; -use Phalcon\Config; use Phalcon\Paginator\Adapter\AdapterInterface; use Phalcon\Factory\AbstractFactory; use Phalcon\Helper\Arr; @@ -57,14 +56,14 @@ public function __construct(array $services = array()) * $paginator = (new PaginatorFactory())->load($options); * ``` * - * @param array|Config = [ + * @param array|\Phalcon\Config = [ * 'adapter' => 'queryBuilder', * 'limit' => 20, * 'page' => 1, * 'builder' => null * ] * @param mixed $config - * @param array|Config = [ + * @param array|\Phalcon\Config = [ * 'adapter' => 'queryBuilder', * 'limit' => 20, * 'page' => 1, diff --git a/src/Phalcon/Paginator/Repository.php b/src/Phalcon/Paginator/Repository.php index 00a8a85e..124c8086 100644 --- a/src/Phalcon/Paginator/Repository.php +++ b/src/Phalcon/Paginator/Repository.php @@ -17,7 +17,7 @@ * * Repository of current state Phalcon\Paginator\AdapterInterface::paginate() */ -class Repository implements RepositoryInterface, JsonSerializable +class Repository implements \Phalcon\Paginator\RepositoryInterface, \JsonSerializable { /** * @var array diff --git a/src/Phalcon/Registry.php b/src/Phalcon/Registry.php index dccd5ec9..59f90e2e 100644 --- a/src/Phalcon/Registry.php +++ b/src/Phalcon/Registry.php @@ -61,7 +61,7 @@ * are implemented using object handlers or similar techniques: this allows to * bypass relatively slow method calls. */ -final class Registry extends Collection +final class Registry extends \Phalcon\Collection { /** diff --git a/src/Phalcon/Security.php b/src/Phalcon/Security.php index 24e2a653..64c8f119 100644 --- a/src/Phalcon/Security.php +++ b/src/Phalcon/Security.php @@ -131,10 +131,10 @@ public function getWorkFactor(): int /** * Phalcon\Security constructor * - * @param SessionInterface $session - * @param RequestInterface $request + * @param \Phalcon\Session\ManagerInterface $session + * @param \Phalcon\Http\RequestInterface $request */ - public function __construct(SessionInterface $session = null, RequestInterface $request = null) + public function __construct(\Phalcon\Session\ManagerInterface $session = null, \Phalcon\Http\RequestInterface $request = null) { } diff --git a/src/Phalcon/Session/Adapter/AbstractAdapter.php b/src/Phalcon/Session/Adapter/AbstractAdapter.php index 773edbed..f86ae7f9 100644 --- a/src/Phalcon/Session/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Session/Adapter/AbstractAdapter.php @@ -20,7 +20,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -abstract class AbstractAdapter implements SessionHandlerInterface +abstract class AbstractAdapter implements \SessionHandlerInterface { /** * @var AdapterInterface diff --git a/src/Phalcon/Session/Adapter/Libmemcached.php b/src/Phalcon/Session/Adapter/Libmemcached.php index 6c8ddc0f..ec6b682d 100644 --- a/src/Phalcon/Session/Adapter/Libmemcached.php +++ b/src/Phalcon/Session/Adapter/Libmemcached.php @@ -14,7 +14,7 @@ /** * Phalcon\Session\Adapter\Libmemcached */ -class Libmemcached extends AbstractAdapter +class Libmemcached extends \Phalcon\Session\Adapter\AbstractAdapter { /** @@ -34,9 +34,9 @@ class Libmemcached extends AbstractAdapter * 'serializer' => null, * 'prefix' => 'sess-memc-' * ] - * @param AdapterFactory $factory + * @param \Phalcon\Storage\AdapterFactory $factory */ - public function __construct(AdapterFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\AdapterFactory $factory, array $options = array()) { } } diff --git a/src/Phalcon/Session/Adapter/Noop.php b/src/Phalcon/Session/Adapter/Noop.php index 61b7802b..feb2e656 100644 --- a/src/Phalcon/Session/Adapter/Noop.php +++ b/src/Phalcon/Session/Adapter/Noop.php @@ -27,7 +27,7 @@ * $session->setAdapter(new Noop()); * ``` */ -class Noop implements SessionHandlerInterface +class Noop implements \SessionHandlerInterface { /** * The connection of some adapters diff --git a/src/Phalcon/Session/Adapter/Redis.php b/src/Phalcon/Session/Adapter/Redis.php index 031979a9..4a4c8d60 100644 --- a/src/Phalcon/Session/Adapter/Redis.php +++ b/src/Phalcon/Session/Adapter/Redis.php @@ -14,7 +14,7 @@ /** * Phalcon\Session\Adapter\Redis */ -class Redis extends AbstractAdapter +class Redis extends \Phalcon\Session\Adapter\AbstractAdapter { /** @@ -29,9 +29,9 @@ class Redis extends AbstractAdapter * 'auth' => '', * 'socket' => '' * ] - * @param AdapterFactory $factory + * @param \Phalcon\Storage\AdapterFactory $factory */ - public function __construct(AdapterFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\AdapterFactory $factory, array $options = array()) { } } diff --git a/src/Phalcon/Session/Adapter/Stream.php b/src/Phalcon/Session/Adapter/Stream.php index fe7961e0..2dcb1c33 100644 --- a/src/Phalcon/Session/Adapter/Stream.php +++ b/src/Phalcon/Session/Adapter/Stream.php @@ -32,7 +32,7 @@ * $session->setAdapter($files); * ``` */ -class Stream extends Noop +class Stream extends \Phalcon\Session\Adapter\Noop { /** * @var string diff --git a/src/Phalcon/Session/Bag.php b/src/Phalcon/Session/Bag.php index a7b7b8a8..310f82d0 100644 --- a/src/Phalcon/Session/Bag.php +++ b/src/Phalcon/Session/Bag.php @@ -28,7 +28,7 @@ * $user->age = 22; * ``` */ -class Bag extends Collection implements InjectionAwareInterface +class Bag extends Collection implements \Phalcon\Di\InjectionAwareInterface { private $container; @@ -101,10 +101,10 @@ public function set(string $element, $value) /** * Sets the DependencyInjector container * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public function setDI(DiInterface $container) + public function setDI(\Phalcon\Di\DiInterface $container) { } } diff --git a/src/Phalcon/Session/Manager.php b/src/Phalcon/Session/Manager.php index 0ee34f4a..7a8529aa 100644 --- a/src/Phalcon/Session/Manager.php +++ b/src/Phalcon/Session/Manager.php @@ -21,7 +21,7 @@ * * Session manager class */ -class Manager extends AbstractInjectionAware implements ManagerInterface +class Manager extends AbstractInjectionAware implements \Phalcon\Session\ManagerInterface { /** * @var SessionHandlerInterface|null @@ -206,10 +206,10 @@ public function set(string $key, $value) /** * Set the adapter for the session * - * @param SessionHandlerInterface $adapter + * @param \SessionHandlerInterface $adapter * @return ManagerInterface */ - public function setAdapter(SessionHandlerInterface $adapter): ManagerInterface + public function setAdapter(\SessionHandlerInterface $adapter): ManagerInterface { } diff --git a/src/Phalcon/Session/ManagerInterface.php b/src/Phalcon/Session/ManagerInterface.php index b6827cd5..71730b61 100644 --- a/src/Phalcon/Session/ManagerInterface.php +++ b/src/Phalcon/Session/ManagerInterface.php @@ -143,10 +143,10 @@ public function set(string $key, $value); /** * Set the adapter for the session * - * @param SessionHandlerInterface $adapter + * @param \SessionHandlerInterface $adapter * @return ManagerInterface */ - public function setAdapter(SessionHandlerInterface $adapter): ManagerInterface; + public function setAdapter(\SessionHandlerInterface $adapter): ManagerInterface; /** * Set session Id diff --git a/src/Phalcon/Storage/Adapter/AbstractAdapter.php b/src/Phalcon/Storage/Adapter/AbstractAdapter.php index d12f6e82..a25d51be 100644 --- a/src/Phalcon/Storage/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Storage/Adapter/AbstractAdapter.php @@ -25,7 +25,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -abstract class AbstractAdapter implements AdapterInterface +abstract class AbstractAdapter implements \Phalcon\Storage\Adapter\AdapterInterface { /** * @var mixed @@ -100,9 +100,9 @@ public function getPrefix(): string * 'serializer' => null, * 'prefix' => '' * ] - * @param SerializerFactory $factory + * @param \Phalcon\Storage\SerializerFactory $factory */ - protected function __construct(SerializerFactory $factory, array $options = array()) + protected function __construct(\Phalcon\Storage\SerializerFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Storage/Adapter/Apcu.php b/src/Phalcon/Storage/Adapter/Apcu.php index bf32c876..3f9844ba 100644 --- a/src/Phalcon/Storage/Adapter/Apcu.php +++ b/src/Phalcon/Storage/Adapter/Apcu.php @@ -18,7 +18,7 @@ /** * Apcu adapter */ -class Apcu extends AbstractAdapter +class Apcu extends \Phalcon\Storage\Adapter\AbstractAdapter { /** * @var array @@ -35,9 +35,9 @@ class Apcu extends AbstractAdapter * 'serializer' => null, * 'prefix' => '' * ] - * @param SerializerFactory $factory + * @param \Phalcon\Storage\SerializerFactory $factory */ - public function __construct(SerializerFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\SerializerFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Storage/Adapter/Libmemcached.php b/src/Phalcon/Storage/Adapter/Libmemcached.php index c7d09d15..6e7d58fd 100644 --- a/src/Phalcon/Storage/Adapter/Libmemcached.php +++ b/src/Phalcon/Storage/Adapter/Libmemcached.php @@ -9,7 +9,6 @@ */ namespace Phalcon\Storage\Adapter; -use Memcached; use Phalcon\Helper\Arr; use Phalcon\Storage\Exception; use Phalcon\Storage\SerializerFactory; @@ -18,7 +17,7 @@ /** * Libmemcached adapter */ -class Libmemcached extends AbstractAdapter +class Libmemcached extends \Phalcon\Storage\Adapter\AbstractAdapter { /** * @var array @@ -42,9 +41,9 @@ class Libmemcached extends AbstractAdapter * 'serializer' => null, * 'prefix' => '' * ] - * @param SerializerFactory $factory + * @param \Phalcon\Storage\SerializerFactory $factory */ - public function __construct(SerializerFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\SerializerFactory $factory, array $options = array()) { } @@ -98,7 +97,7 @@ public function get(string $key, $defaultValue = null) * Returns the already connected adapter or connects to the Memcached * server(s) * - * @return Memcached + * @return \Memcached * @throws Exception */ public function getAdapter() @@ -158,9 +157,9 @@ public function set(string $key, $value, $ttl = null): bool * Checks the serializer. If it is a supported one it is set, otherwise * the custom one is set. * - * @param Memcached $connection + * @param \Memcached $connection */ - private function setSerializer(Memcached $connection) + private function setSerializer(\Memcached $connection) { } } diff --git a/src/Phalcon/Storage/Adapter/Memory.php b/src/Phalcon/Storage/Adapter/Memory.php index 4dff9050..b94a9c44 100644 --- a/src/Phalcon/Storage/Adapter/Memory.php +++ b/src/Phalcon/Storage/Adapter/Memory.php @@ -18,7 +18,7 @@ /** * Memory adapter */ -class Memory extends AbstractAdapter +class Memory extends \Phalcon\Storage\Adapter\AbstractAdapter { /** * @var Collection @@ -40,9 +40,9 @@ class Memory extends AbstractAdapter * 'serializer' => null, * 'prefix' => '' * ] - * @param SerializerFactory $factory + * @param \Phalcon\Storage\SerializerFactory $factory */ - public function __construct(SerializerFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\SerializerFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Storage/Adapter/Redis.php b/src/Phalcon/Storage/Adapter/Redis.php index 3cc267ae..68e25fd0 100644 --- a/src/Phalcon/Storage/Adapter/Redis.php +++ b/src/Phalcon/Storage/Adapter/Redis.php @@ -17,7 +17,7 @@ /** * Redis adapter */ -class Redis extends AbstractAdapter +class Redis extends \Phalcon\Storage\Adapter\AbstractAdapter { /** * @var array @@ -40,9 +40,9 @@ class Redis extends AbstractAdapter * 'serializer' => null, * 'prefix' => '' * ] - * @param SerializerFactory $factory + * @param \Phalcon\Storage\SerializerFactory $factory */ - public function __construct(SerializerFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\SerializerFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Storage/Adapter/Stream.php b/src/Phalcon/Storage/Adapter/Stream.php index 3af80979..9abc7e46 100644 --- a/src/Phalcon/Storage/Adapter/Stream.php +++ b/src/Phalcon/Storage/Adapter/Stream.php @@ -22,7 +22,7 @@ /** * Stream adapter */ -class Stream extends AbstractAdapter +class Stream extends \Phalcon\Storage\Adapter\AbstractAdapter { /** * @var string @@ -46,10 +46,10 @@ class Stream extends AbstractAdapter * 'prefix' => '' * ] * - * @param SerializerFactory $factory * @throws Exception + * @param \Phalcon\Storage\SerializerFactory $factory */ - public function __construct(SerializerFactory $factory, array $options = array()) + public function __construct(\Phalcon\Storage\SerializerFactory $factory, array $options = array()) { } diff --git a/src/Phalcon/Storage/Serializer/AbstractSerializer.php b/src/Phalcon/Storage/Serializer/AbstractSerializer.php index 2ed0e256..af131b21 100644 --- a/src/Phalcon/Storage/Serializer/AbstractSerializer.php +++ b/src/Phalcon/Storage/Serializer/AbstractSerializer.php @@ -19,7 +19,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -abstract class AbstractSerializer implements SerializerInterface +abstract class AbstractSerializer implements \Phalcon\Storage\Serializer\SerializerInterface { /** * @var mixed diff --git a/src/Phalcon/Storage/Serializer/Base64.php b/src/Phalcon/Storage/Serializer/Base64.php index 9a1b1bfe..1e506e4e 100644 --- a/src/Phalcon/Storage/Serializer/Base64.php +++ b/src/Phalcon/Storage/Serializer/Base64.php @@ -19,7 +19,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Base64 extends AbstractSerializer +class Base64 extends \Phalcon\Storage\Serializer\AbstractSerializer { /** diff --git a/src/Phalcon/Storage/Serializer/Igbinary.php b/src/Phalcon/Storage/Serializer/Igbinary.php index 978bc964..c3db0cbe 100644 --- a/src/Phalcon/Storage/Serializer/Igbinary.php +++ b/src/Phalcon/Storage/Serializer/Igbinary.php @@ -17,7 +17,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Igbinary extends AbstractSerializer +class Igbinary extends \Phalcon\Storage\Serializer\AbstractSerializer { /** diff --git a/src/Phalcon/Storage/Serializer/Json.php b/src/Phalcon/Storage/Serializer/Json.php index 072ceec7..6e148320 100644 --- a/src/Phalcon/Storage/Serializer/Json.php +++ b/src/Phalcon/Storage/Serializer/Json.php @@ -11,6 +11,7 @@ use InvalidArgumentException; use JsonSerializable; +use Phalcon\Helper\Json as JsonHelper; /** * This file is part of the Phalcon Framework. @@ -20,7 +21,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Json extends AbstractSerializer +class Json extends \Phalcon\Storage\Serializer\AbstractSerializer { /** diff --git a/src/Phalcon/Storage/Serializer/Msgpack.php b/src/Phalcon/Storage/Serializer/Msgpack.php index d5fa20a7..44c730ea 100644 --- a/src/Phalcon/Storage/Serializer/Msgpack.php +++ b/src/Phalcon/Storage/Serializer/Msgpack.php @@ -17,7 +17,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Msgpack extends AbstractSerializer +class Msgpack extends \Phalcon\Storage\Serializer\AbstractSerializer { /** diff --git a/src/Phalcon/Storage/Serializer/None.php b/src/Phalcon/Storage/Serializer/None.php index 46a0444a..5f6931f4 100644 --- a/src/Phalcon/Storage/Serializer/None.php +++ b/src/Phalcon/Storage/Serializer/None.php @@ -19,7 +19,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class None extends AbstractSerializer +class None extends \Phalcon\Storage\Serializer\AbstractSerializer { /** diff --git a/src/Phalcon/Storage/Serializer/Php.php b/src/Phalcon/Storage/Serializer/Php.php index 1a79c0d9..a606e340 100644 --- a/src/Phalcon/Storage/Serializer/Php.php +++ b/src/Phalcon/Storage/Serializer/Php.php @@ -20,7 +20,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class Php extends AbstractSerializer +class Php extends \Phalcon\Storage\Serializer\AbstractSerializer { /** diff --git a/src/Phalcon/Storage/Serializer/SerializerInterface.php b/src/Phalcon/Storage/Serializer/SerializerInterface.php index fb2c07df..0e567290 100644 --- a/src/Phalcon/Storage/Serializer/SerializerInterface.php +++ b/src/Phalcon/Storage/Serializer/SerializerInterface.php @@ -19,7 +19,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -interface SerializerInterface extends Serializable +interface SerializerInterface extends \Serializable { /** diff --git a/src/Phalcon/Tag.php b/src/Phalcon/Tag.php index 50ecb40b..55543f04 100644 --- a/src/Phalcon/Tag.php +++ b/src/Phalcon/Tag.php @@ -652,10 +652,10 @@ public static function setDefaults(array $values, bool $merge = false) /** * Sets the dependency injector container. * - * @param DiInterface $container + * @param \Phalcon\Di\DiInterface $container * @return void */ - public static function setDI(DiInterface $container) + public static function setDI(\Phalcon\Di\DiInterface $container) { } diff --git a/src/Phalcon/Tag/Select.php b/src/Phalcon/Tag/Select.php index 46309340..c73437ff 100644 --- a/src/Phalcon/Tag/Select.php +++ b/src/Phalcon/Tag/Select.php @@ -56,12 +56,12 @@ private static function optionsFromArray(array $data, $value, string $closeOptio * Generate the OPTION tags based on a resultset * * @param array $using - * @param ResultsetInterface $resultset + * @param \Phalcon\Mvc\Model\ResultsetInterface $resultset * @param mixed $value * @param string $closeOption * @return string */ - private static function optionsFromResultset(ResultsetInterface $resultset, $using, $value, string $closeOption): string + private static function optionsFromResultset(\Phalcon\Mvc\Model\ResultsetInterface $resultset, $using, $value, string $closeOption): string { } } diff --git a/src/Phalcon/Translate/Adapter/AbstractAdapter.php b/src/Phalcon/Translate/Adapter/AbstractAdapter.php index 004dccd1..8ad141e0 100644 --- a/src/Phalcon/Translate/Adapter/AbstractAdapter.php +++ b/src/Phalcon/Translate/Adapter/AbstractAdapter.php @@ -18,7 +18,7 @@ * * Base class for Phalcon\Translate adapters */ -abstract class AbstractAdapter implements AdapterInterface +abstract class AbstractAdapter implements \Phalcon\Translate\Adapter\AdapterInterface { /** * @var string @@ -32,10 +32,10 @@ abstract class AbstractAdapter implements AdapterInterface /** - * @param InterpolatorFactory $interpolator + * @param \Phalcon\Translate\InterpolatorFactory $interpolator * @param array $options */ - public function __construct(InterpolatorFactory $interpolator, array $options) + public function __construct(\Phalcon\Translate\InterpolatorFactory $interpolator, array $options) { } diff --git a/src/Phalcon/Translate/Adapter/Csv.php b/src/Phalcon/Translate/Adapter/Csv.php index 40a947ad..45b3523f 100644 --- a/src/Phalcon/Translate/Adapter/Csv.php +++ b/src/Phalcon/Translate/Adapter/Csv.php @@ -18,7 +18,7 @@ * * Allows to define translation lists using CSV file */ -class Csv extends AbstractAdapter implements ArrayAccess +class Csv extends \Phalcon\Translate\Adapter\AbstractAdapter implements \ArrayAccess { /** * @var array @@ -34,9 +34,9 @@ class Csv extends AbstractAdapter implements ArrayAccess * 'delimiter' => ';', * 'enclosure' => '"' * ] - * @param InterpolatorFactory $interpolator + * @param \Phalcon\Translate\InterpolatorFactory $interpolator */ - public function __construct(InterpolatorFactory $interpolator, array $options) + public function __construct(\Phalcon\Translate\InterpolatorFactory $interpolator, array $options) { } diff --git a/src/Phalcon/Translate/Adapter/Gettext.php b/src/Phalcon/Translate/Adapter/Gettext.php index dcb74aa0..95ad60ca 100644 --- a/src/Phalcon/Translate/Adapter/Gettext.php +++ b/src/Phalcon/Translate/Adapter/Gettext.php @@ -31,7 +31,7 @@ * * Allows translate using gettext */ -class Gettext extends AbstractAdapter implements ArrayAccess +class Gettext extends \Phalcon\Translate\Adapter\AbstractAdapter implements \ArrayAccess { /** * @var int @@ -91,9 +91,9 @@ public function getLocale(): string * 'directory' => '', * 'category' => '' * ] - * @param InterpolatorFactory $interpolator + * @param \Phalcon\Translate\InterpolatorFactory $interpolator */ - public function __construct(InterpolatorFactory $interpolator, array $options) + public function __construct(\Phalcon\Translate\InterpolatorFactory $interpolator, array $options) { } diff --git a/src/Phalcon/Translate/Adapter/NativeArray.php b/src/Phalcon/Translate/Adapter/NativeArray.php index 24fea267..08adffa8 100644 --- a/src/Phalcon/Translate/Adapter/NativeArray.php +++ b/src/Phalcon/Translate/Adapter/NativeArray.php @@ -18,7 +18,7 @@ * * Allows to define translation lists using PHP arrays */ -class NativeArray extends AbstractAdapter implements ArrayAccess +class NativeArray extends \Phalcon\Translate\Adapter\AbstractAdapter implements \ArrayAccess { /** * @var array @@ -38,9 +38,9 @@ class NativeArray extends AbstractAdapter implements ArrayAccess * 'content' => '', * 'triggerError' => false * ] - * @param InterpolatorFactory $interpolator + * @param \Phalcon\Translate\InterpolatorFactory $interpolator */ - public function __construct(InterpolatorFactory $interpolator, array $options) + public function __construct(\Phalcon\Translate\InterpolatorFactory $interpolator, array $options) { } diff --git a/src/Phalcon/Translate/Interpolator/AssociativeArray.php b/src/Phalcon/Translate/Interpolator/AssociativeArray.php index 0b4e7954..ea3aad8e 100644 --- a/src/Phalcon/Translate/Interpolator/AssociativeArray.php +++ b/src/Phalcon/Translate/Interpolator/AssociativeArray.php @@ -17,7 +17,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class AssociativeArray implements InterpolatorInterface +class AssociativeArray implements \Phalcon\Translate\Interpolator\InterpolatorInterface { /** diff --git a/src/Phalcon/Translate/Interpolator/IndexedArray.php b/src/Phalcon/Translate/Interpolator/IndexedArray.php index d7ff26c2..d363ba26 100644 --- a/src/Phalcon/Translate/Interpolator/IndexedArray.php +++ b/src/Phalcon/Translate/Interpolator/IndexedArray.php @@ -17,7 +17,7 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ -class IndexedArray implements InterpolatorInterface +class IndexedArray implements \Phalcon\Translate\Interpolator\InterpolatorInterface { /** diff --git a/src/Phalcon/Translate/TranslateFactory.php b/src/Phalcon/Translate/TranslateFactory.php index 7ff9804e..a5f831aa 100644 --- a/src/Phalcon/Translate/TranslateFactory.php +++ b/src/Phalcon/Translate/TranslateFactory.php @@ -43,7 +43,7 @@ public function __construct(InterpolatorFactory $interpolator, array $services = /** * Factory to create an instace from a Config object * - * @param array|Config = [ + * @param array|\Phalcon\Config = [ * 'adapter' => 'ini, * 'options' => [ * 'content' => '', @@ -57,7 +57,7 @@ public function __construct(InterpolatorFactory $interpolator, array $services = * ] * ] * @param mixed $config - * @param array|Config = [ + * @param array|\Phalcon\Config = [ * 'adapter' => 'ini, * 'options' => [ * 'content' => '', diff --git a/src/Phalcon/Url.php b/src/Phalcon/Url.php index 01f4367b..9d0d767e 100644 --- a/src/Phalcon/Url.php +++ b/src/Phalcon/Url.php @@ -33,7 +33,7 @@ * ); * ``` */ -class Url extends AbstractInjectionAware implements UrlInterface +class Url extends AbstractInjectionAware implements \Phalcon\Url\UrlInterface { /** * @var null | string @@ -57,9 +57,9 @@ class Url extends AbstractInjectionAware implements UrlInterface /** - * @param RouterInterface $router + * @param \Phalcon\Mvc\RouterInterface $router */ - public function __construct(RouterInterface $router = null) + public function __construct(\Phalcon\Mvc\RouterInterface $router = null) { } diff --git a/src/Phalcon/Validation.php b/src/Phalcon/Validation.php index a3814dba..6d8d3836 100644 --- a/src/Phalcon/Validation.php +++ b/src/Phalcon/Validation.php @@ -22,7 +22,7 @@ /** * Allows to validate data using custom or built-in validators */ -class Validation extends Injectable implements ValidationInterface +class Validation extends Injectable implements \Phalcon\Validation\ValidationInterface { protected $combinedFieldsValidators; @@ -74,20 +74,20 @@ public function __construct(array $validators = array()) * Adds a validator to a field * * @param mixed $field - * @param ValidatorInterface $validator + * @param \Phalcon\Validation\ValidatorInterface $validator * @return ValidationInterface */ - public function add($field, ValidatorInterface $validator): ValidationInterface + public function add($field, \Phalcon\Validation\ValidatorInterface $validator): ValidationInterface { } /** * Appends a message to the messages list * - * @param MessageInterface $message + * @param \Phalcon\Messages\MessageInterface $message * @return ValidationInterface */ - public function appendMessage(MessageInterface $message): ValidationInterface + public function appendMessage(\Phalcon\Messages\MessageInterface $message): ValidationInterface { } @@ -164,10 +164,10 @@ public function getValue(string $field) * Alias of `add` method * * @param mixed $field - * @param ValidatorInterface $validator + * @param \Phalcon\Validation\ValidatorInterface $validator * @return ValidationInterface */ - public function rule($field, ValidatorInterface $validator): ValidationInterface + public function rule($field, \Phalcon\Validation\ValidatorInterface $validator): ValidationInterface { } @@ -228,10 +228,10 @@ public function validate($data = null, $entity = null): Messages * Internal validations, if it returns true, then skip the current validator * * @param mixed $field - * @param ValidatorInterface $validator + * @param \Phalcon\Validation\ValidatorInterface $validator * @return bool */ - protected function preChecking($field, ValidatorInterface $validator): bool + protected function preChecking($field, \Phalcon\Validation\ValidatorInterface $validator): bool { } } diff --git a/src/Phalcon/Validation/AbstractCombinedFieldsValidator.php b/src/Phalcon/Validation/AbstractCombinedFieldsValidator.php index 1516dc24..f75e0a48 100644 --- a/src/Phalcon/Validation/AbstractCombinedFieldsValidator.php +++ b/src/Phalcon/Validation/AbstractCombinedFieldsValidator.php @@ -12,7 +12,7 @@ /** * This is a base class for combined fields validators */ -abstract class AbstractCombinedFieldsValidator extends AbstractValidator +abstract class AbstractCombinedFieldsValidator extends \Phalcon\Validation\AbstractValidator { } diff --git a/src/Phalcon/Validation/AbstractValidator.php b/src/Phalcon/Validation/AbstractValidator.php index 9be71ded..b27ad90b 100644 --- a/src/Phalcon/Validation/AbstractValidator.php +++ b/src/Phalcon/Validation/AbstractValidator.php @@ -17,7 +17,7 @@ /** * This is a base class for validators */ -abstract class AbstractValidator implements ValidatorInterface +abstract class AbstractValidator implements \Phalcon\Validation\ValidatorInterface { /** * Message template @@ -122,11 +122,11 @@ public function setOption(string $key, $value) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - abstract public function validate(Validation $validation, $field): bool; + abstract public function validate(\Phalcon\Validation $validation, $field): bool; /** * Prepares a validation code. @@ -141,25 +141,25 @@ protected function prepareCode(string $field): ?int /** * Prepares a label for the field. * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param string $field * @return mixed */ - protected function prepareLabel(Validation $validation, string $field) + protected function prepareLabel(\Phalcon\Validation $validation, string $field) { } /** * Create a default message by factory * - * @param Validation $validation - * @param mixed $field - * @param array $replacements - *@return Message + * @return Message * * @throw Exception + * @param \Phalcon\Validation $validation + * @param mixed $field + * @param array $replacements */ - public function messageFactory(Validation $validation, $field, array $replacements = array()): Message + public function messageFactory(\Phalcon\Validation $validation, $field, array $replacements = array()): Message { } } diff --git a/src/Phalcon/Validation/AbstractValidatorComposite.php b/src/Phalcon/Validation/AbstractValidatorComposite.php index ea1a6734..667eddb5 100644 --- a/src/Phalcon/Validation/AbstractValidatorComposite.php +++ b/src/Phalcon/Validation/AbstractValidatorComposite.php @@ -14,7 +14,7 @@ /** * This is a base class for combined fields validators */ -abstract class AbstractValidatorComposite extends AbstractValidator implements ValidatorCompositeInterface +abstract class AbstractValidatorComposite extends \Phalcon\Validation\AbstractValidator implements \Phalcon\Validation\ValidatorCompositeInterface { /** * @var array @@ -32,11 +32,11 @@ public function getValidators(): array /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/ValidationInterface.php b/src/Phalcon/Validation/ValidationInterface.php index be5ee432..517fb752 100644 --- a/src/Phalcon/Validation/ValidationInterface.php +++ b/src/Phalcon/Validation/ValidationInterface.php @@ -31,10 +31,10 @@ public function add(string $field, ValidatorInterface $validator): ValidationInt /** * Appends a message to the messages list * - * @param MessageInterface $message + * @param \Phalcon\Messages\MessageInterface $message * @return ValidationInterface */ - public function appendMessage(MessageInterface $message): ValidationInterface; + public function appendMessage(\Phalcon\Messages\MessageInterface $message): ValidationInterface; /** * Assigns the data to an entity diff --git a/src/Phalcon/Validation/Validator/Alnum.php b/src/Phalcon/Validation/Validator/Alnum.php index 484a068e..e472c230 100644 --- a/src/Phalcon/Validation/Validator/Alnum.php +++ b/src/Phalcon/Validation/Validator/Alnum.php @@ -68,11 +68,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Alpha.php b/src/Phalcon/Validation/Validator/Alpha.php index 610840f4..2a6d2cd1 100644 --- a/src/Phalcon/Validation/Validator/Alpha.php +++ b/src/Phalcon/Validation/Validator/Alpha.php @@ -69,11 +69,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Between.php b/src/Phalcon/Validation/Validator/Between.php index e823290b..a8a68798 100644 --- a/src/Phalcon/Validation/Validator/Between.php +++ b/src/Phalcon/Validation/Validator/Between.php @@ -82,11 +82,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Callback.php b/src/Phalcon/Validation/Validator/Callback.php index d94e75b5..597f4119 100644 --- a/src/Phalcon/Validation/Validator/Callback.php +++ b/src/Phalcon/Validation/Validator/Callback.php @@ -81,11 +81,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Confirmation.php b/src/Phalcon/Validation/Validator/Confirmation.php index f776cb1e..14b05359 100644 --- a/src/Phalcon/Validation/Validator/Confirmation.php +++ b/src/Phalcon/Validation/Validator/Confirmation.php @@ -78,11 +78,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } diff --git a/src/Phalcon/Validation/Validator/CreditCard.php b/src/Phalcon/Validation/Validator/CreditCard.php index 7e9fa1cb..d29f587e 100644 --- a/src/Phalcon/Validation/Validator/CreditCard.php +++ b/src/Phalcon/Validation/Validator/CreditCard.php @@ -69,11 +69,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } diff --git a/src/Phalcon/Validation/Validator/Date.php b/src/Phalcon/Validation/Validator/Date.php index 90d9fb95..b9bc3a08 100644 --- a/src/Phalcon/Validation/Validator/Date.php +++ b/src/Phalcon/Validation/Validator/Date.php @@ -76,11 +76,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } diff --git a/src/Phalcon/Validation/Validator/Digit.php b/src/Phalcon/Validation/Validator/Digit.php index be43ddde..901d23a5 100644 --- a/src/Phalcon/Validation/Validator/Digit.php +++ b/src/Phalcon/Validation/Validator/Digit.php @@ -69,11 +69,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Email.php b/src/Phalcon/Validation/Validator/Email.php index 02f2e718..0726c88f 100644 --- a/src/Phalcon/Validation/Validator/Email.php +++ b/src/Phalcon/Validation/Validator/Email.php @@ -69,11 +69,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/ExclusionIn.php b/src/Phalcon/Validation/Validator/ExclusionIn.php index c578655a..83c1fc9f 100644 --- a/src/Phalcon/Validation/Validator/ExclusionIn.php +++ b/src/Phalcon/Validation/Validator/ExclusionIn.php @@ -83,11 +83,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/AbstractFile.php b/src/Phalcon/Validation/Validator/File/AbstractFile.php index aa9d39ed..e9108c55 100644 --- a/src/Phalcon/Validation/Validator/File/AbstractFile.php +++ b/src/Phalcon/Validation/Validator/File/AbstractFile.php @@ -125,7 +125,7 @@ public function setMessageValid($messageValid) * @param string $field * @return bool */ - public function isAllowEmpty(Validation $validation, string $field): bool + public function isAllowEmpty(\Phalcon\Validation $validation, string $field): bool { } @@ -136,7 +136,7 @@ public function isAllowEmpty(Validation $validation, string $field): bool * @param mixed $field * @return bool */ - public function checkUpload(Validation $validation, $field): bool + public function checkUpload(\Phalcon\Validation $validation, $field): bool { } @@ -147,7 +147,7 @@ public function checkUpload(Validation $validation, $field): bool * @param mixed $field * @return boolean */ - public function checkUploadMaxSize(Validation $validation, $field): bool + public function checkUploadMaxSize(\Phalcon\Validation $validation, $field): bool { } @@ -158,7 +158,7 @@ public function checkUploadMaxSize(Validation $validation, $field): bool * @param mixed $field * @return boolean */ - public function checkUploadIsEmpty(Validation $validation, $field): bool + public function checkUploadIsEmpty(\Phalcon\Validation $validation, $field): bool { } @@ -169,7 +169,7 @@ public function checkUploadIsEmpty(Validation $validation, $field): bool * @param mixed $field * @return boolean */ - public function checkUploadIsValid(Validation $validation, $field): bool + public function checkUploadIsValid(\Phalcon\Validation $validation, $field): bool { } diff --git a/src/Phalcon/Validation/Validator/File/MimeType.php b/src/Phalcon/Validation/Validator/File/MimeType.php index ad51c377..60cb7c75 100644 --- a/src/Phalcon/Validation/Validator/File/MimeType.php +++ b/src/Phalcon/Validation/Validator/File/MimeType.php @@ -61,7 +61,7 @@ * ); * ``` */ -class MimeType extends AbstractFile +class MimeType extends \Phalcon\Validation\Validator\File\AbstractFile { protected $template = 'File :field must be of type: :types'; @@ -74,7 +74,7 @@ class MimeType extends AbstractFile * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php index c2bc6a2e..afd76049 100644 --- a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php +++ b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php @@ -74,11 +74,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Max.php b/src/Phalcon/Validation/Validator/File/Resolution/Max.php index 4680e9fd..aa3fb6b4 100644 --- a/src/Phalcon/Validation/Validator/File/Resolution/Max.php +++ b/src/Phalcon/Validation/Validator/File/Resolution/Max.php @@ -80,11 +80,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Min.php b/src/Phalcon/Validation/Validator/File/Resolution/Min.php index 23917c64..c798e93a 100644 --- a/src/Phalcon/Validation/Validator/File/Resolution/Min.php +++ b/src/Phalcon/Validation/Validator/File/Resolution/Min.php @@ -80,11 +80,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/Size/Equal.php b/src/Phalcon/Validation/Validator/File/Size/Equal.php index 84411a3b..d9540a66 100644 --- a/src/Phalcon/Validation/Validator/File/Size/Equal.php +++ b/src/Phalcon/Validation/Validator/File/Size/Equal.php @@ -79,11 +79,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/Size/Max.php b/src/Phalcon/Validation/Validator/File/Size/Max.php index 70a94d55..88789e0c 100644 --- a/src/Phalcon/Validation/Validator/File/Size/Max.php +++ b/src/Phalcon/Validation/Validator/File/Size/Max.php @@ -80,11 +80,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/File/Size/Min.php b/src/Phalcon/Validation/Validator/File/Size/Min.php index ac0f30e5..177b6f0b 100644 --- a/src/Phalcon/Validation/Validator/File/Size/Min.php +++ b/src/Phalcon/Validation/Validator/File/Size/Min.php @@ -80,11 +80,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Identical.php b/src/Phalcon/Validation/Validator/Identical.php index 8bebbcca..c0ce1863 100644 --- a/src/Phalcon/Validation/Validator/Identical.php +++ b/src/Phalcon/Validation/Validator/Identical.php @@ -76,11 +76,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/InclusionIn.php b/src/Phalcon/Validation/Validator/InclusionIn.php index ff8f5ef2..b10ac528 100644 --- a/src/Phalcon/Validation/Validator/InclusionIn.php +++ b/src/Phalcon/Validation/Validator/InclusionIn.php @@ -77,11 +77,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Ip.php b/src/Phalcon/Validation/Validator/Ip.php index a9f78614..510937ac 100644 --- a/src/Phalcon/Validation/Validator/Ip.php +++ b/src/Phalcon/Validation/Validator/Ip.php @@ -94,11 +94,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Numericality.php b/src/Phalcon/Validation/Validator/Numericality.php index 59b55de1..0dbffa5e 100644 --- a/src/Phalcon/Validation/Validator/Numericality.php +++ b/src/Phalcon/Validation/Validator/Numericality.php @@ -69,11 +69,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/PresenceOf.php b/src/Phalcon/Validation/Validator/PresenceOf.php index 0b3c970b..86fee665 100644 --- a/src/Phalcon/Validation/Validator/PresenceOf.php +++ b/src/Phalcon/Validation/Validator/PresenceOf.php @@ -69,11 +69,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Regex.php b/src/Phalcon/Validation/Validator/Regex.php index 8e9e29e8..20c406ea 100644 --- a/src/Phalcon/Validation/Validator/Regex.php +++ b/src/Phalcon/Validation/Validator/Regex.php @@ -75,11 +75,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/StringLength/Max.php b/src/Phalcon/Validation/Validator/StringLength/Max.php index 987e003d..496c4100 100644 --- a/src/Phalcon/Validation/Validator/StringLength/Max.php +++ b/src/Phalcon/Validation/Validator/StringLength/Max.php @@ -84,11 +84,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/StringLength/Min.php b/src/Phalcon/Validation/Validator/StringLength/Min.php index 24dd58a9..3e61bb04 100644 --- a/src/Phalcon/Validation/Validator/StringLength/Min.php +++ b/src/Phalcon/Validation/Validator/StringLength/Min.php @@ -84,11 +84,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/Validator/Uniqueness.php b/src/Phalcon/Validation/Validator/Uniqueness.php index ec307653..48caa76d 100644 --- a/src/Phalcon/Validation/Validator/Uniqueness.php +++ b/src/Phalcon/Validation/Validator/Uniqueness.php @@ -114,11 +114,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } @@ -134,11 +134,11 @@ protected function getColumnNameReal($record, string $field): string } /** - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - protected function isUniqueness(Validation $validation, $field): bool + protected function isUniqueness(\Phalcon\Validation $validation, $field): bool { } diff --git a/src/Phalcon/Validation/Validator/Url.php b/src/Phalcon/Validation/Validator/Url.php index 62849361..68ee2633 100644 --- a/src/Phalcon/Validation/Validator/Url.php +++ b/src/Phalcon/Validation/Validator/Url.php @@ -70,11 +70,11 @@ public function __construct(array $options = array()) /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool + public function validate(\Phalcon\Validation $validation, $field): bool { } } diff --git a/src/Phalcon/Validation/ValidatorCompositeInterface.php b/src/Phalcon/Validation/ValidatorCompositeInterface.php index 95acbd8f..9d1335de 100644 --- a/src/Phalcon/Validation/ValidatorCompositeInterface.php +++ b/src/Phalcon/Validation/ValidatorCompositeInterface.php @@ -27,9 +27,9 @@ public function getValidators(): array; /** * Executes the validation * - * @param Validation $validation + * @param \Phalcon\Validation $validation * @param mixed $field * @return bool */ - public function validate(Validation $validation, $field): bool; + public function validate(\Phalcon\Validation $validation, $field): bool; } diff --git a/src/Phalcon/Validation/ValidatorInterface.php b/src/Phalcon/Validation/ValidatorInterface.php index 2ab3248e..25e113c2 100644 --- a/src/Phalcon/Validation/ValidatorInterface.php +++ b/src/Phalcon/Validation/ValidatorInterface.php @@ -39,11 +39,11 @@ public function hasOption(string $key): bool; /** * Executes the validation * - * @param Validation $validation + * @return boolean + * @param \Phalcon\Validation $validation * @param mixed $field - *@return boolean */ - public function validate(Validation $validation, $field): bool; + public function validate(\Phalcon\Validation $validation, $field): bool; /** * Get the template message From 8f98719c15775bcd6587ed411160b5aaa58bb5a5 Mon Sep 17 00:00:00 2001 From: Ruud Boon Date: Tue, 21 Jan 2020 22:40:10 +0100 Subject: [PATCH 2/2] Optimised stubs --- psalm.xml | 2 +- src/Phalcon/Acl/Adapter/AbstractAdapter.php | 1 - src/Phalcon/Acl/Adapter/AdapterInterface.php | 3 --- src/Phalcon/Acl/Adapter/Memory.php | 9 ------- .../Annotations/Adapter/AbstractAdapter.php | 5 ++-- .../Annotations/Adapter/AdapterInterface.php | 2 +- src/Phalcon/Annotations/Adapter/Apcu.php | 2 -- src/Phalcon/Annotations/Adapter/Memory.php | 2 -- src/Phalcon/Annotations/Adapter/Stream.php | 4 --- .../Annotations/AnnotationsFactory.php | 1 - src/Phalcon/Annotations/Collection.php | 3 --- src/Phalcon/Annotations/Reader.php | 2 -- .../Application/AbstractApplication.php | 1 - src/Phalcon/Assets/Asset/Css.php | 2 -- src/Phalcon/Assets/Asset/Js.php | 2 -- src/Phalcon/Assets/Collection.php | 7 ----- src/Phalcon/Assets/Filters/Cssmin.php | 2 -- src/Phalcon/Assets/Filters/Jsmin.php | 2 -- src/Phalcon/Assets/Filters/None.php | 2 -- src/Phalcon/Assets/Inline/Css.php | 2 -- src/Phalcon/Assets/Inline/Js.php | 2 -- src/Phalcon/Assets/Manager.php | 6 ----- src/Phalcon/Cache.php | 2 -- src/Phalcon/Cache/Adapter/Apcu.php | 1 - src/Phalcon/Cache/Adapter/Libmemcached.php | 1 - src/Phalcon/Cache/Adapter/Memory.php | 1 - src/Phalcon/Cache/Adapter/Redis.php | 1 - src/Phalcon/Cache/Adapter/Stream.php | 1 - src/Phalcon/Cache/AdapterFactory.php | 1 - src/Phalcon/Cache/CacheFactory.php | 5 ---- src/Phalcon/Cli/Console.php | 4 --- src/Phalcon/Cli/Dispatcher.php | 5 ---- src/Phalcon/Cli/Router.php | 5 +--- src/Phalcon/Cli/Task.php | 1 - src/Phalcon/Collection.php | 7 ----- src/Phalcon/Collection/Exception.php | 2 -- src/Phalcon/Config.php | 3 --- src/Phalcon/Config/Adapter/Grouped.php | 3 --- src/Phalcon/Config/Adapter/Ini.php | 1 - src/Phalcon/Config/Adapter/Json.php | 1 - src/Phalcon/Config/Adapter/Yaml.php | 1 - src/Phalcon/Config/ConfigFactory.php | 8 ------ src/Phalcon/Container.php | 1 - src/Phalcon/Crypt.php | 2 -- src/Phalcon/Db/AbstractDb.php | 2 -- src/Phalcon/Db/Adapter/AbstractAdapter.php | 7 ----- src/Phalcon/Db/Adapter/AdapterInterface.php | 4 --- src/Phalcon/Db/Adapter/Pdo/AbstractPdo.php | 5 ---- src/Phalcon/Db/Adapter/Pdo/Mysql.php | 10 ------- src/Phalcon/Db/Adapter/Pdo/Postgresql.php | 8 ------ src/Phalcon/Db/Adapter/Pdo/Sqlite.php | 9 ------- src/Phalcon/Db/Adapter/PdoFactory.php | 1 - src/Phalcon/Db/Dialect/Mysql.php | 6 ----- src/Phalcon/Db/Dialect/Postgresql.php | 6 ----- src/Phalcon/Db/Dialect/Sqlite.php | 6 ----- src/Phalcon/Db/Result/Pdo.php | 2 -- src/Phalcon/Debug.php | 7 ----- src/Phalcon/Debug/Dump.php | 7 ----- src/Phalcon/Di.php | 7 ----- src/Phalcon/Di/DiInterface.php | 2 -- src/Phalcon/Di/FactoryDefault.php | 2 -- src/Phalcon/Di/FactoryDefault/Cli.php | 2 -- src/Phalcon/Di/Injectable.php | 1 - src/Phalcon/Di/Service.php | 4 --- src/Phalcon/Di/Service/Builder.php | 3 --- src/Phalcon/Dispatcher/AbstractDispatcher.php | 6 ----- src/Phalcon/Escaper.php | 4 --- src/Phalcon/Events/Manager.php | 3 --- src/Phalcon/Factory/AbstractFactory.php | 2 -- src/Phalcon/Filter.php | 4 --- src/Phalcon/Filter/FilterFactory.php | 2 -- src/Phalcon/Flash/AbstractFlash.php | 2 -- src/Phalcon/Flash/Session.php | 1 - src/Phalcon/Forms/Element/AbstractElement.php | 5 ---- src/Phalcon/Forms/Element/Check.php | 2 -- src/Phalcon/Forms/Element/Date.php | 2 -- .../Forms/Element/ElementInterface.php | 2 -- src/Phalcon/Forms/Element/Email.php | 2 -- src/Phalcon/Forms/Element/File.php | 2 -- src/Phalcon/Forms/Element/Hidden.php | 2 -- src/Phalcon/Forms/Element/Numeric.php | 2 -- src/Phalcon/Forms/Element/Password.php | 2 -- src/Phalcon/Forms/Element/Radio.php | 2 -- src/Phalcon/Forms/Element/Select.php | 2 -- src/Phalcon/Forms/Element/Submit.php | 2 -- src/Phalcon/Forms/Element/Text.php | 2 -- src/Phalcon/Forms/Element/TextArea.php | 2 -- src/Phalcon/Forms/Form.php | 7 ----- src/Phalcon/Helper/Arr.php | 2 -- src/Phalcon/Helper/Json.php | 2 -- src/Phalcon/Helper/Str.php | 2 -- src/Phalcon/Html/Attributes.php | 2 -- src/Phalcon/Html/Breadcrumbs.php | 2 -- src/Phalcon/Html/Helper/AbstractHelper.php | 1 - src/Phalcon/Html/TagFactory.php | 1 - src/Phalcon/Http/Cookie.php | 8 ------ src/Phalcon/Http/Message/AbstractCommon.php | 2 -- src/Phalcon/Http/Message/AbstractRequest.php | 1 - .../Exception/InvalidArgumentException.php | 2 -- src/Phalcon/Http/Message/Request.php | 2 -- src/Phalcon/Http/Message/RequestFactory.php | 2 +- src/Phalcon/Http/Message/Response.php | 3 --- src/Phalcon/Http/Message/ResponseFactory.php | 2 +- src/Phalcon/Http/Message/ServerRequest.php | 1 - .../Http/Message/ServerRequestFactory.php | 3 +-- src/Phalcon/Http/Message/Stream.php | 3 --- src/Phalcon/Http/Message/StreamFactory.php | 1 - src/Phalcon/Http/Message/UploadedFile.php | 3 --- .../Http/Message/UploadedFileFactory.php | 2 +- src/Phalcon/Http/Message/Uri.php | 2 -- src/Phalcon/Http/Request.php | 8 ------ src/Phalcon/Http/RequestInterface.php | 3 --- src/Phalcon/Http/Response.php | 15 ++--------- src/Phalcon/Http/Response/Cookies.php | 2 -- src/Phalcon/Http/ResponseInterface.php | 1 - src/Phalcon/Image/Adapter/AbstractAdapter.php | 1 - src/Phalcon/Image/Adapter/Gd.php | 3 --- src/Phalcon/Image/Adapter/Imagick.php | 3 --- src/Phalcon/Image/ImageFactory.php | 2 -- src/Phalcon/Loader.php | 2 -- src/Phalcon/Logger.php | 2 -- .../Logger/Adapter/AbstractAdapter.php | 3 --- .../Logger/Adapter/AdapterInterface.php | 1 - src/Phalcon/Logger/Adapter/Noop.php | 2 -- src/Phalcon/Logger/Adapter/Stream.php | 6 ----- src/Phalcon/Logger/Adapter/Syslog.php | 8 ------ .../Logger/Formatter/AbstractFormatter.php | 5 ---- .../Logger/Formatter/FormatterInterface.php | 2 -- src/Phalcon/Logger/Formatter/Json.php | 3 --- src/Phalcon/Logger/Formatter/Line.php | 3 --- src/Phalcon/Logger/LoggerFactory.php | 2 -- src/Phalcon/Messages/Message.php | 2 -- src/Phalcon/Messages/Messages.php | 5 ---- src/Phalcon/Mvc/Application.php | 6 ----- src/Phalcon/Mvc/Dispatcher.php | 5 ---- src/Phalcon/Mvc/Micro.php | 14 +--------- src/Phalcon/Mvc/Micro/LazyLoader.php | 2 -- src/Phalcon/Mvc/Micro/MiddlewareInterface.php | 2 -- src/Phalcon/Mvc/Model.php | 26 +------------------ src/Phalcon/Mvc/Model/Behavior.php | 2 -- src/Phalcon/Mvc/Model/Behavior/SoftDelete.php | 2 -- .../Mvc/Model/Behavior/Timestampable.php | 3 --- src/Phalcon/Mvc/Model/BehaviorInterface.php | 2 -- src/Phalcon/Mvc/Model/Binder.php | 5 ---- src/Phalcon/Mvc/Model/Criteria.php | 3 --- src/Phalcon/Mvc/Model/CriteriaInterface.php | 2 -- src/Phalcon/Mvc/Model/Manager.php | 14 +++------- src/Phalcon/Mvc/Model/ManagerInterface.php | 3 +-- src/Phalcon/Mvc/Model/MetaData.php | 3 --- src/Phalcon/Mvc/Model/MetaData/Apcu.php | 3 --- .../Mvc/Model/MetaData/Libmemcached.php | 3 --- src/Phalcon/Mvc/Model/MetaData/Memory.php | 1 - src/Phalcon/Mvc/Model/MetaData/Redis.php | 2 -- .../Model/MetaData/Strategy/Annotations.php | 6 ----- .../Model/MetaData/Strategy/Introspection.php | 7 ----- .../MetaData/Strategy/StrategyInterface.php | 3 --- src/Phalcon/Mvc/Model/MetaData/Stream.php | 1 - src/Phalcon/Mvc/Model/MetaDataInterface.php | 1 - src/Phalcon/Mvc/Model/Query.php | 13 +--------- src/Phalcon/Mvc/Model/Query/Builder.php | 5 ---- src/Phalcon/Mvc/Model/Query/Status.php | 1 - .../Mvc/Model/Query/StatusInterface.php | 1 - src/Phalcon/Mvc/Model/ResultInterface.php | 2 -- src/Phalcon/Mvc/Model/Resultset.php | 13 +--------- src/Phalcon/Mvc/Model/Resultset/Complex.php | 11 -------- src/Phalcon/Mvc/Model/Resultset/Simple.php | 7 ----- src/Phalcon/Mvc/Model/ResultsetInterface.php | 4 +-- src/Phalcon/Mvc/Model/Row.php | 5 ---- src/Phalcon/Mvc/Model/Transaction.php | 6 ----- src/Phalcon/Mvc/Model/Transaction/Failed.php | 1 - src/Phalcon/Mvc/Model/Transaction/Manager.php | 3 --- .../Mvc/Model/TransactionInterface.php | 3 --- src/Phalcon/Mvc/ModelInterface.php | 3 --- src/Phalcon/Mvc/ModuleDefinitionInterface.php | 2 -- src/Phalcon/Mvc/Router.php | 6 ----- src/Phalcon/Mvc/Router/Annotations.php | 2 -- src/Phalcon/Mvc/RouterInterface.php | 1 - src/Phalcon/Mvc/View.php | 7 ----- .../Mvc/View/Engine/AbstractEngine.php | 1 - src/Phalcon/Mvc/View/Engine/Volt.php | 3 --- src/Phalcon/Mvc/View/Engine/Volt/Compiler.php | 3 --- .../Mvc/View/Engine/Volt/Exception.php | 2 -- src/Phalcon/Mvc/View/Simple.php | 8 ------ src/Phalcon/Mvc/ViewBaseInterface.php | 2 -- .../Paginator/Adapter/AbstractAdapter.php | 2 -- src/Phalcon/Paginator/Adapter/Model.php | 4 --- src/Phalcon/Paginator/Adapter/NativeArray.php | 1 - .../Paginator/Adapter/QueryBuilder.php | 2 -- src/Phalcon/Paginator/PaginatorFactory.php | 3 +-- src/Phalcon/Paginator/Repository.php | 3 --- src/Phalcon/Security.php | 2 -- .../Session/Adapter/AbstractAdapter.php | 1 - src/Phalcon/Session/Adapter/Libmemcached.php | 2 -- src/Phalcon/Session/Adapter/Noop.php | 2 -- src/Phalcon/Session/Adapter/Redis.php | 2 -- src/Phalcon/Session/Adapter/Stream.php | 3 --- src/Phalcon/Session/Bag.php | 2 -- src/Phalcon/Session/Manager.php | 5 +--- src/Phalcon/Session/ManagerInterface.php | 1 - .../Storage/Adapter/AbstractAdapter.php | 5 +--- .../Storage/Adapter/AdapterInterface.php | 2 -- src/Phalcon/Storage/Adapter/Apcu.php | 6 ----- src/Phalcon/Storage/Adapter/Libmemcached.php | 3 --- src/Phalcon/Storage/Adapter/Memory.php | 4 --- src/Phalcon/Storage/Adapter/Redis.php | 3 --- src/Phalcon/Storage/Adapter/Stream.php | 7 ----- .../Storage/Serializer/AbstractSerializer.php | 2 -- src/Phalcon/Storage/Serializer/Base64.php | 2 -- src/Phalcon/Storage/Serializer/Json.php | 4 --- src/Phalcon/Storage/Serializer/None.php | 2 -- src/Phalcon/Storage/Serializer/Php.php | 3 --- .../Serializer/SerializerInterface.php | 2 -- src/Phalcon/Tag.php | 2 -- src/Phalcon/Tag/Select.php | 4 --- src/Phalcon/Text.php | 2 -- .../Translate/Adapter/AbstractAdapter.php | 2 -- src/Phalcon/Translate/Adapter/Csv.php | 4 --- src/Phalcon/Translate/Adapter/Gettext.php | 4 --- src/Phalcon/Translate/Adapter/NativeArray.php | 4 --- src/Phalcon/Translate/TranslateFactory.php | 2 -- src/Phalcon/Url.php | 3 --- src/Phalcon/Validation.php | 6 ----- src/Phalcon/Validation/AbstractValidator.php | 3 --- .../Validation/AbstractValidatorComposite.php | 2 -- .../Validation/ValidationInterface.php | 2 -- src/Phalcon/Validation/Validator/Alnum.php | 1 - src/Phalcon/Validation/Validator/Alpha.php | 2 -- src/Phalcon/Validation/Validator/Between.php | 2 -- src/Phalcon/Validation/Validator/Callback.php | 3 --- .../Validation/Validator/Confirmation.php | 3 --- .../Validation/Validator/CreditCard.php | 2 -- src/Phalcon/Validation/Validator/Date.php | 3 --- src/Phalcon/Validation/Validator/Digit.php | 2 -- src/Phalcon/Validation/Validator/Email.php | 2 -- .../Validation/Validator/ExclusionIn.php | 3 --- src/Phalcon/Validation/Validator/File.php | 10 ------- .../Validator/File/AbstractFile.php | 1 - .../Validation/Validator/File/MimeType.php | 2 -- .../Validator/File/Resolution/Equal.php | 2 -- .../Validator/File/Resolution/Max.php | 2 -- .../Validator/File/Resolution/Min.php | 2 -- .../Validation/Validator/File/Size/Equal.php | 2 -- .../Validation/Validator/File/Size/Max.php | 2 -- .../Validation/Validator/File/Size/Min.php | 2 -- .../Validation/Validator/Identical.php | 2 -- .../Validation/Validator/InclusionIn.php | 3 --- src/Phalcon/Validation/Validator/Ip.php | 2 -- .../Validation/Validator/Numericality.php | 2 -- .../Validation/Validator/PresenceOf.php | 2 -- src/Phalcon/Validation/Validator/Regex.php | 2 -- .../Validation/Validator/StringLength.php | 5 ---- .../Validation/Validator/StringLength/Max.php | 3 --- .../Validation/Validator/StringLength/Min.php | 3 --- .../Validation/Validator/Uniqueness.php | 5 ---- src/Phalcon/Validation/Validator/Url.php | 2 -- .../ValidatorCompositeInterface.php | 2 -- src/Phalcon/Validation/ValidatorFactory.php | 2 -- src/Phalcon/Validation/ValidatorInterface.php | 3 --- 258 files changed, 23 insertions(+), 836 deletions(-) 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 */