diff --git a/src/Phalcon/Cache.php b/src/Phalcon/Cache.php
index e680bfd8..40cd8611 100644
--- a/src/Phalcon/Cache.php
+++ b/src/Phalcon/Cache.php
@@ -76,8 +76,8 @@ public function deleteMultiple($keys): bool
     /**
      * Fetches a value from the cache.
      *
-     * @param string $key          The unique key of this item in the cache.
-     * @param mixed  $defaultValue Default value to return if the key does not exist.
+     * @param string $key The unique key of this item in the cache.
+     * @param mixed $defaultValue Default value to return if the key does not exist.
      *
      * @return mixed The value of the item from the cache, or $default in case of cache miss.
      *
@@ -90,8 +90,8 @@ public function get($key, $defaultValue = null)
     /**
      * Obtains multiple cache items by their unique keys.
      *
-     * @param iterable $keys         A list of keys that can obtained in a single operation.
-     * @param mixed    $defaultValue Default value to return for keys that do not exist.
+     * @param iterable $keys A list of keys that can obtained in a single operation.
+     * @param mixed $defaultValue Default value to return for keys that do not exist.
      *
      * @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
      *
@@ -117,9 +117,9 @@ public function has($key): bool
     /**
      * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
      *
-     * @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 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
      *                                      the driver supports TTL then the library may set a default value
      *                                      for it or let the driver take care of that.
      *
@@ -134,8 +134,8 @@ 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 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
      *                                       the driver supports TTL then the library may set a default value
      *                                       for it or let the driver take care of that.
      *
@@ -164,5 +164,4 @@ protected function checkKey($key)
     protected function checkKeys($keys)
     {
     }
-
 }
diff --git a/src/Phalcon/Collection.php b/src/Phalcon/Collection.php
index b6389b32..0047e935 100644
--- a/src/Phalcon/Collection.php
+++ b/src/Phalcon/Collection.php
@@ -266,5 +266,4 @@ public function unserialize($serialized)
     protected function setData(string $element, $value)
     {
     }
-
 }
diff --git a/src/Phalcon/Config.php b/src/Phalcon/Config.php
index 54b9b5ee..aef376b8 100644
--- a/src/Phalcon/Config.php
+++ b/src/Phalcon/Config.php
@@ -129,5 +129,4 @@ final protected function internalMerge(array $source, array $target): array
     protected function setData($element, $value)
     {
     }
-
 }
diff --git a/src/Phalcon/Container.php b/src/Phalcon/Container.php
index 682790d0..45d76bd2 100644
--- a/src/Phalcon/Container.php
+++ b/src/Phalcon/Container.php
@@ -43,5 +43,4 @@ public function get($name)
     public function has($name): bool
     {
     }
-
 }
diff --git a/src/Phalcon/Crypt.php b/src/Phalcon/Crypt.php
index 1e8fba6c..ba879ba2 100644
--- a/src/Phalcon/Crypt.php
+++ b/src/Phalcon/Crypt.php
@@ -156,11 +156,11 @@ public function decrypt(string $text, string $key = null): string
     /**
      * Decrypt a text that is coded as a base64 string.
      *
-     * @throws \Phalcon\Crypt\Mismatch
      * @param string $text
      * @param mixed $key
      * @param bool $safe
      * @return string
+     * @throws \Phalcon\Crypt\Mismatch
      */
     public function decryptBase64(string $text, $key = null, bool $safe = false): string
     {
@@ -284,9 +284,9 @@ public function setCipher(string $cipher): CryptInterface
     /**
      * Set the name of hashing algorithm.
      *
-     * @throws \Phalcon\Crypt\Exception
      * @param string $hashAlgo
      * @return \Phalcon\Crypt\CryptInterface
+     * @throws \Phalcon\Crypt\Exception
      */
     public function setHashAlgo(string $hashAlgo): CryptInterface
     {
@@ -396,5 +396,4 @@ protected function cryptPadText(string $text, string $mode, int $blockSize, int
     protected function cryptUnpadText(string $text, string $mode, int $blockSize, int $paddingType)
     {
     }
-
 }
diff --git a/src/Phalcon/Debug.php b/src/Phalcon/Debug.php
index 8176e61f..a6203126 100644
--- a/src/Phalcon/Debug.php
+++ b/src/Phalcon/Debug.php
@@ -23,7 +23,7 @@ class Debug
     /**
      * @var bool
      */
-    static protected $isActive;
+    protected static $isActive;
 
     /**
      * @var bool
@@ -244,5 +244,4 @@ protected function getVarDump($variable): string
     final protected function showTraceItem(int $n, array $trace): string
     {
     }
-
 }
diff --git a/src/Phalcon/Di.php b/src/Phalcon/Di.php
index e3ba7bca..4ae0d207 100644
--- a/src/Phalcon/Di.php
+++ b/src/Phalcon/Di.php
@@ -66,7 +66,7 @@ class Di implements \Phalcon\Di\DiInterface
     /**
      * Latest DI build
      */
-    static protected $_default;
+    protected static $_default;
 
 
     /**
@@ -409,5 +409,4 @@ public function setRaw(string $name, \Phalcon\Di\ServiceInterface $rawDefinition
     public function setShared(string $name, $definition): ServiceInterface
     {
     }
-
 }
diff --git a/src/Phalcon/Escaper.php b/src/Phalcon/Escaper.php
index b4b81f61..5e8c1236 100644
--- a/src/Phalcon/Escaper.php
+++ b/src/Phalcon/Escaper.php
@@ -159,5 +159,4 @@ public function setEncoding(string $encoding)
     public function setHtmlQuoteType(int $quoteType)
     {
     }
-
 }
diff --git a/src/Phalcon/Exception.php b/src/Phalcon/Exception.php
index dd44dc5c..2c453056 100644
--- a/src/Phalcon/Exception.php
+++ b/src/Phalcon/Exception.php
@@ -17,5 +17,4 @@ class Exception extends \Exception implements \Throwable
     public static function containerServiceNotFound(string $service): string
     {
     }
-
 }
diff --git a/src/Phalcon/Filter.php b/src/Phalcon/Filter.php
index af1d47eb..93fff9a7 100644
--- a/src/Phalcon/Filter.php
+++ b/src/Phalcon/Filter.php
@@ -166,5 +166,4 @@ private function processArrayValues(array $values, string $sanitizerName, array
     private function sanitizer($value, string $sanitizerName, array $sanitizerParams = array())
     {
     }
-
 }
diff --git a/src/Phalcon/Kernel.php b/src/Phalcon/Kernel.php
index 97664875..dbca3b84 100644
--- a/src/Phalcon/Kernel.php
+++ b/src/Phalcon/Kernel.php
@@ -12,11 +12,10 @@ class Kernel
      * Produces a pre-computed hash key based on a string. This function
      * produces different numbers in 32bit/64bit processors
      *
-     * @return string
      * @param string $key
+     * @return string
      */
     public static function preComputeHashKey(string $key)
     {
     }
-
 }
diff --git a/src/Phalcon/Loader.php b/src/Phalcon/Loader.php
index 5b8c36c5..62055867 100644
--- a/src/Phalcon/Loader.php
+++ b/src/Phalcon/Loader.php
@@ -279,5 +279,4 @@ public function unregister(): Loader
     protected function prepareNamespace(array $namespaceName): array
     {
     }
-
 }
diff --git a/src/Phalcon/Logger.php b/src/Phalcon/Logger.php
index 94f4c4b9..85dda5f1 100644
--- a/src/Phalcon/Logger.php
+++ b/src/Phalcon/Logger.php
@@ -195,8 +195,8 @@ public function excludeAdapters(array $adapters = array()): Logger
      *
      * @param string $name The name of the adapter
      *
-     * @throws Exception
      * @return \Phalcon\Logger\Adapter\AdapterInterface
+     * @throws Exception
      */
     public function getAdapter(string $name): AdapterInterface
     {
@@ -258,8 +258,8 @@ public function notice($message, array $context = array())
      *
      * @param string $name The name of the adapter
      *
-     * @throws Logger\Exception
      * @return Logger
+     * @throws Logger\Exception
      */
     public function removeAdapter(string $name): Logger
     {
@@ -303,9 +303,9 @@ public function warning($message, array $context = array())
      *
      * @param int $level
      * @param string $message *
-     * @throws Logger\Exception
      * @param array $context
      * @return bool
+     * @throws Logger\Exception
      */
     protected function addMessage(int $level, string $message, array $context = array()): bool
     {
@@ -329,5 +329,4 @@ protected function getLevels(): array
     private function getLevelNumber($level): int
     {
     }
-
 }
diff --git a/src/Phalcon/Registry.php b/src/Phalcon/Registry.php
index 8908b38c..e5234f64 100644
--- a/src/Phalcon/Registry.php
+++ b/src/Phalcon/Registry.php
@@ -277,5 +277,4 @@ final public function toJson(int $options = 79): string
     final public function unserialize($serialized)
     {
     }
-
 }
diff --git a/src/Phalcon/Security.php b/src/Phalcon/Security.php
index 72385801..eb791bf6 100644
--- a/src/Phalcon/Security.php
+++ b/src/Phalcon/Security.php
@@ -291,5 +291,4 @@ private function getLocalRequest(): ?RequestInterface
     private function getLocalSession(): ?SessionInterface
     {
     }
-
 }
diff --git a/src/Phalcon/Tag.php b/src/Phalcon/Tag.php
index 29dfc532..c4b1e65b 100644
--- a/src/Phalcon/Tag.php
+++ b/src/Phalcon/Tag.php
@@ -47,40 +47,40 @@ class Tag
     const XHTML5 = 11;
 
 
-    static protected $autoEscape = true;
+    protected static $autoEscape = true;
 
     /**
      * DI Container
      */
-    static protected $container;
+    protected static $container;
 
     /**
      * Pre-assigned values for components
      */
-    static protected $displayValues;
+    protected static $displayValues;
 
 
-    static protected $documentAppendTitle = null;
+    protected static $documentAppendTitle = null;
 
 
-    static protected $documentPrependTitle = null;
+    protected static $documentPrependTitle = null;
 
     /**
      * HTML document title
      */
-    static protected $documentTitle = null;
+    protected static $documentTitle = null;
 
 
-    static protected $documentTitleSeparator = null;
+    protected static $documentTitleSeparator = null;
 
 
-    static protected $documentType = 11;
+    protected static $documentType = 11;
 
 
-    static protected $escaperService = null;
+    protected static $escaperService = null;
 
 
-    static protected $urlService = null;
+    protected static $urlService = null;
 
 
     /**
@@ -649,7 +649,7 @@ public static function weekField($parameters): string
      * @param bool $asValue
      * @return string
      */
-    static final protected function inputField(string $type, $parameters, bool $asValue = false): string
+    final protected static function inputField(string $type, $parameters, bool $asValue = false): string
     {
     }
 
@@ -660,8 +660,7 @@ static final protected function inputField(string $type, $parameters, bool $asVa
      * @param mixed $parameters
      * @return string
      */
-    static final protected function inputFieldChecked(string $type, $parameters): string
+    final protected static function inputFieldChecked(string $type, $parameters): string
     {
     }
-
 }
diff --git a/src/Phalcon/Text.php b/src/Phalcon/Text.php
index 3856fa28..e5971794 100644
--- a/src/Phalcon/Text.php
+++ b/src/Phalcon/Text.php
@@ -269,5 +269,4 @@ public static function underscore(string $text): string
     public static function upper(string $text, string $encoding = 'UTF-8'): string
     {
     }
-
 }
diff --git a/src/Phalcon/Url.php b/src/Phalcon/Url.php
index 8cb01ae2..b5786583 100644
--- a/src/Phalcon/Url.php
+++ b/src/Phalcon/Url.php
@@ -198,5 +198,4 @@ public function setStaticBaseUri(string $staticBaseUri): UrlInterface
     public function path(string $path = null): string
     {
     }
-
 }
diff --git a/src/Phalcon/Validation.php b/src/Phalcon/Validation.php
index 9480ffe7..99644012 100644
--- a/src/Phalcon/Validation.php
+++ b/src/Phalcon/Validation.php
@@ -36,7 +36,6 @@ class Validation extends Injectable implements \Phalcon\Validation\ValidationInt
     protected $values;
 
 
-
     public function getData()
     {
     }
@@ -219,5 +218,4 @@ public function validate($data = null, $entity = null): Messages
     protected function preChecking($field, \Phalcon\Validation\ValidatorInterface $validator): bool
     {
     }
-
 }
diff --git a/src/Phalcon/Version.php b/src/Phalcon/Version.php
index c8630cb2..237ed367 100644
--- a/src/Phalcon/Version.php
+++ b/src/Phalcon/Version.php
@@ -85,7 +85,7 @@ protected static function _getVersion(): array
      * @param int $special
      * @return string
      */
-    protected final static function _getSpecial(int $special): string
+    final protected static function _getSpecial(int $special): string
     {
     }
 
@@ -131,5 +131,4 @@ public static function getId(): string
     public static function getPart(int $part): string
     {
     }
-
 }
diff --git a/src/Phalcon/acl/Component.php b/src/Phalcon/acl/Component.php
index af42828c..8f068fd1 100644
--- a/src/Phalcon/acl/Component.php
+++ b/src/Phalcon/acl/Component.php
@@ -58,5 +58,4 @@ public function __toString(): string
     public function __construct(string $name, string $description = null)
     {
     }
-
 }
diff --git a/src/Phalcon/acl/ComponentAware.php b/src/Phalcon/acl/ComponentAware.php
index 3539eb59..412164f1 100644
--- a/src/Phalcon/acl/ComponentAware.php
+++ b/src/Phalcon/acl/ComponentAware.php
@@ -14,5 +14,4 @@ interface ComponentAware
      * @return string
      */
     public function getComponentName(): string;
-
 }
diff --git a/src/Phalcon/acl/ComponentInterface.php b/src/Phalcon/acl/ComponentInterface.php
index b1e0960c..2a98bb5b 100644
--- a/src/Phalcon/acl/ComponentInterface.php
+++ b/src/Phalcon/acl/ComponentInterface.php
@@ -28,5 +28,4 @@ public function getName(): string;
      * @return string
      */
     public function __toString(): string;
-
 }
diff --git a/src/Phalcon/acl/Enum.php b/src/Phalcon/acl/Enum.php
index bce07c38..a81e1a28 100644
--- a/src/Phalcon/acl/Enum.php
+++ b/src/Phalcon/acl/Enum.php
@@ -12,6 +12,4 @@ class Enum
 
 
     const DENY = 0;
-
-
 }
diff --git a/src/Phalcon/acl/Role.php b/src/Phalcon/acl/Role.php
index 32174e12..563e1dc0 100644
--- a/src/Phalcon/acl/Role.php
+++ b/src/Phalcon/acl/Role.php
@@ -58,5 +58,4 @@ public function getDescription(): string
     public function __construct(string $name, string $description = null)
     {
     }
-
 }
diff --git a/src/Phalcon/acl/RoleAware.php b/src/Phalcon/acl/RoleAware.php
index 8a22a4b6..b568a8bf 100644
--- a/src/Phalcon/acl/RoleAware.php
+++ b/src/Phalcon/acl/RoleAware.php
@@ -14,5 +14,4 @@ interface RoleAware
      * @return string
      */
     public function getRoleName(): string;
-
 }
diff --git a/src/Phalcon/acl/RoleInterface.php b/src/Phalcon/acl/RoleInterface.php
index 7ba84c4a..0d22ff31 100644
--- a/src/Phalcon/acl/RoleInterface.php
+++ b/src/Phalcon/acl/RoleInterface.php
@@ -28,5 +28,4 @@ public function getDescription(): string;
      * @return string
      */
     public function __toString(): string;
-
 }
diff --git a/src/Phalcon/acl/adapter/AbstractAdapter.php b/src/Phalcon/acl/adapter/AbstractAdapter.php
index d1d265b7..96992459 100644
--- a/src/Phalcon/acl/adapter/AbstractAdapter.php
+++ b/src/Phalcon/acl/adapter/AbstractAdapter.php
@@ -117,5 +117,4 @@ public function setDefaultAction(int $defaultAccess)
     public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
     {
     }
-
 }
diff --git a/src/Phalcon/acl/adapter/AdapterInterface.php b/src/Phalcon/acl/adapter/AdapterInterface.php
index 76530327..bd8a7852 100644
--- a/src/Phalcon/acl/adapter/AdapterInterface.php
+++ b/src/Phalcon/acl/adapter/AdapterInterface.php
@@ -170,5 +170,4 @@ public function setDefaultAction(int $defaultAccess);
      * @param int $defaultAccess
      */
     public function setNoArgumentsDefaultAction(int $defaultAccess);
-
 }
diff --git a/src/Phalcon/acl/adapter/Memory.php b/src/Phalcon/acl/adapter/Memory.php
index 32402257..21231cb4 100644
--- a/src/Phalcon/acl/adapter/Memory.php
+++ b/src/Phalcon/acl/adapter/Memory.php
@@ -443,5 +443,4 @@ private function allowOrDeny(string $roleName, string $componentName, $access, $
     private function canAccess(string $roleName, string $componentName, string $access)
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/Annotation.php b/src/Phalcon/annotations/Annotation.php
index 73c32ac7..3e108679 100644
--- a/src/Phalcon/annotations/Annotation.php
+++ b/src/Phalcon/annotations/Annotation.php
@@ -121,5 +121,4 @@ public function hasArgument($position): bool
     public function numberArguments(): int
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/AnnotationsFactory.php b/src/Phalcon/annotations/AnnotationsFactory.php
index 48c8ebdd..1879fbe6 100644
--- a/src/Phalcon/annotations/AnnotationsFactory.php
+++ b/src/Phalcon/annotations/AnnotationsFactory.php
@@ -49,5 +49,4 @@ public function newInstance(string $name, array $options = array()): AbstractAda
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/Collection.php b/src/Phalcon/annotations/Collection.php
index 89818e02..fbe9063f 100644
--- a/src/Phalcon/annotations/Collection.php
+++ b/src/Phalcon/annotations/Collection.php
@@ -129,5 +129,4 @@ public function rewind()
     public function valid(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/Reader.php b/src/Phalcon/annotations/Reader.php
index b085d963..d9e3f689 100644
--- a/src/Phalcon/annotations/Reader.php
+++ b/src/Phalcon/annotations/Reader.php
@@ -29,5 +29,4 @@ public function parse(string $className): array
     public static function parseDocBlock(string $docBlock, $file = null, $line = null): array
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/ReaderInterface.php b/src/Phalcon/annotations/ReaderInterface.php
index 5ba4b965..0d319b13 100644
--- a/src/Phalcon/annotations/ReaderInterface.php
+++ b/src/Phalcon/annotations/ReaderInterface.php
@@ -25,5 +25,4 @@ public function parse(string $className): array;
      * @return array
      */
     public static function parseDocBlock(string $docBlock, $file = null, $line = null): array;
-
 }
diff --git a/src/Phalcon/annotations/Reflection.php b/src/Phalcon/annotations/Reflection.php
index ae86841f..5d73a94b 100644
--- a/src/Phalcon/annotations/Reflection.php
+++ b/src/Phalcon/annotations/Reflection.php
@@ -82,5 +82,4 @@ public function getPropertiesAnnotations()
     public function getReflectionData(): array
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/adapter/AbstractAdapter.php b/src/Phalcon/annotations/adapter/AbstractAdapter.php
index f1750128..a1c84925 100644
--- a/src/Phalcon/annotations/adapter/AbstractAdapter.php
+++ b/src/Phalcon/annotations/adapter/AbstractAdapter.php
@@ -92,5 +92,4 @@ public function getReader(): ReaderInterface
     public function setReader(\Phalcon\Annotations\ReaderInterface $reader)
     {
     }
-
 }
diff --git a/src/Phalcon/annotations/adapter/AdapterInterface.php b/src/Phalcon/annotations/adapter/AdapterInterface.php
index 31895549..e316bb87 100644
--- a/src/Phalcon/annotations/adapter/AdapterInterface.php
+++ b/src/Phalcon/annotations/adapter/AdapterInterface.php
@@ -67,5 +67,4 @@ public function getReader(): ReaderInterface;
      * @param \Phalcon\Annotations\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 d191f10b..434ce2e9 100644
--- a/src/Phalcon/annotations/adapter/Apcu.php
+++ b/src/Phalcon/annotations/adapter/Apcu.php
@@ -53,5 +53,4 @@ public function read(string $key)
     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 f0b7a267..1a70e83b 100644
--- a/src/Phalcon/annotations/adapter/Memory.php
+++ b/src/Phalcon/annotations/adapter/Memory.php
@@ -33,5 +33,4 @@ public function read(string $key)
     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 d61b8780..6ef35cde 100644
--- a/src/Phalcon/annotations/adapter/Stream.php
+++ b/src/Phalcon/annotations/adapter/Stream.php
@@ -51,5 +51,4 @@ public function read(string $key)
     public function write(string $key, \Phalcon\Annotations\Reflection $data)
     {
     }
-
 }
diff --git a/src/Phalcon/application/AbstractApplication.php b/src/Phalcon/application/AbstractApplication.php
index 64da7660..52f5e994 100644
--- a/src/Phalcon/application/AbstractApplication.php
+++ b/src/Phalcon/application/AbstractApplication.php
@@ -122,5 +122,4 @@ public function setDefaultModule(string $defaultModule): AbstractApplication
     public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
     {
     }
-
 }
diff --git a/src/Phalcon/assets/Asset.php b/src/Phalcon/assets/Asset.php
index 19892055..b65b304b 100644
--- a/src/Phalcon/assets/Asset.php
+++ b/src/Phalcon/assets/Asset.php
@@ -297,5 +297,4 @@ public function setType(string $type): AssetInterface
     public function setPath(string $path): AssetInterface
     {
     }
-
 }
diff --git a/src/Phalcon/assets/AssetInterface.php b/src/Phalcon/assets/AssetInterface.php
index c7bdf739..44bbc9ea 100644
--- a/src/Phalcon/assets/AssetInterface.php
+++ b/src/Phalcon/assets/AssetInterface.php
@@ -59,5 +59,4 @@ public function setFilter(bool $filter): AssetInterface;
      * @return AssetInterface
      */
     public function setType(string $type): AssetInterface;
-
 }
diff --git a/src/Phalcon/assets/Collection.php b/src/Phalcon/assets/Collection.php
index 69ad96e2..e81ae5af 100644
--- a/src/Phalcon/assets/Collection.php
+++ b/src/Phalcon/assets/Collection.php
@@ -481,5 +481,4 @@ public function valid(): bool
     final protected function addAsset(AssetInterface $asset): bool
     {
     }
-
 }
diff --git a/src/Phalcon/assets/FilterInterface.php b/src/Phalcon/assets/FilterInterface.php
index e0ba66c2..f933b5ed 100644
--- a/src/Phalcon/assets/FilterInterface.php
+++ b/src/Phalcon/assets/FilterInterface.php
@@ -15,5 +15,4 @@ interface FilterInterface
      * @return string
      */
     public function filter(string $content): string;
-
 }
diff --git a/src/Phalcon/assets/Inline.php b/src/Phalcon/assets/Inline.php
index f643eafd..6cffc46d 100644
--- a/src/Phalcon/assets/Inline.php
+++ b/src/Phalcon/assets/Inline.php
@@ -110,5 +110,4 @@ public function setFilter(bool $filter): AssetInterface
     public function setType(string $type): AssetInterface
     {
     }
-
 }
diff --git a/src/Phalcon/assets/Manager.php b/src/Phalcon/assets/Manager.php
index 6d5b66bb..e618f536 100644
--- a/src/Phalcon/assets/Manager.php
+++ b/src/Phalcon/assets/Manager.php
@@ -351,5 +351,4 @@ public function useImplicitOutput(bool $implicitOutput): Manager
     private function getPrefixedPath(\Phalcon\Assets\Collection $collection, string $path): string
     {
     }
-
 }
diff --git a/src/Phalcon/assets/asset/Css.php b/src/Phalcon/assets/asset/Css.php
index bfc4313a..4ee16acd 100644
--- a/src/Phalcon/assets/asset/Css.php
+++ b/src/Phalcon/assets/asset/Css.php
@@ -21,5 +21,4 @@ class Css extends \Phalcon\Assets\Asset
     public function __construct(string $path, bool $local = true, bool $filter = true, array $attributes = array(), string $version = null, bool $autoVersion = false)
     {
     }
-
 }
diff --git a/src/Phalcon/assets/asset/Js.php b/src/Phalcon/assets/asset/Js.php
index 7d1032e2..07e78f19 100644
--- a/src/Phalcon/assets/asset/Js.php
+++ b/src/Phalcon/assets/asset/Js.php
@@ -21,5 +21,4 @@ class Js extends \Phalcon\Assets\Asset
     public function __construct(string $path, bool $local = true, bool $filter = true, array $attributes = array(), string $version = null, bool $autoVersion = false)
     {
     }
-
 }
diff --git a/src/Phalcon/assets/filters/Cssmin.php b/src/Phalcon/assets/filters/Cssmin.php
index 4964b7f8..fe03b48b 100644
--- a/src/Phalcon/assets/filters/Cssmin.php
+++ b/src/Phalcon/assets/filters/Cssmin.php
@@ -19,5 +19,4 @@ class Cssmin implements \Phalcon\Assets\FilterInterface
     public function filter(string $content): string
     {
     }
-
 }
diff --git a/src/Phalcon/assets/filters/Jsmin.php b/src/Phalcon/assets/filters/Jsmin.php
index 9f5356cd..691af3bf 100644
--- a/src/Phalcon/assets/filters/Jsmin.php
+++ b/src/Phalcon/assets/filters/Jsmin.php
@@ -20,5 +20,4 @@ class Jsmin implements \Phalcon\Assets\FilterInterface
     public function filter(string $content): string
     {
     }
-
 }
diff --git a/src/Phalcon/assets/filters/None.php b/src/Phalcon/assets/filters/None.php
index eea54d58..7b07ff7f 100644
--- a/src/Phalcon/assets/filters/None.php
+++ b/src/Phalcon/assets/filters/None.php
@@ -17,5 +17,4 @@ class None implements \Phalcon\Assets\FilterInterface
     public function filter(string $content): string
     {
     }
-
 }
diff --git a/src/Phalcon/assets/inline/Css.php b/src/Phalcon/assets/inline/Css.php
index a6f2a205..ed9f6c35 100644
--- a/src/Phalcon/assets/inline/Css.php
+++ b/src/Phalcon/assets/inline/Css.php
@@ -18,5 +18,4 @@ class Css extends \Phalcon\Assets\Inline
     public function __construct(string $content, bool $filter = true, $attributes = null)
     {
     }
-
 }
diff --git a/src/Phalcon/assets/inline/Js.php b/src/Phalcon/assets/inline/Js.php
index c8b04f72..3606be6b 100644
--- a/src/Phalcon/assets/inline/Js.php
+++ b/src/Phalcon/assets/inline/Js.php
@@ -18,5 +18,4 @@ class Js extends \Phalcon\Assets\Inline
     public function __construct(string $content, bool $filter = true, $attributes = null)
     {
     }
-
 }
diff --git a/src/Phalcon/cache/AdapterFactory.php b/src/Phalcon/cache/AdapterFactory.php
index 73e79832..04895e44 100644
--- a/src/Phalcon/cache/AdapterFactory.php
+++ b/src/Phalcon/cache/AdapterFactory.php
@@ -46,5 +46,4 @@ public function newInstance(string $name, array $options = array()): AdapterInte
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/cache/CacheFactory.php b/src/Phalcon/cache/CacheFactory.php
index 13c5d0c9..27f02fc5 100644
--- a/src/Phalcon/cache/CacheFactory.php
+++ b/src/Phalcon/cache/CacheFactory.php
@@ -44,5 +44,4 @@ public function load($config)
     public function newInstance(string $name, array $options = array()): CacheInterface
     {
     }
-
 }
diff --git a/src/Phalcon/cli/Console.php b/src/Phalcon/cli/Console.php
index 77acfe2a..82bfad9a 100644
--- a/src/Phalcon/cli/Console.php
+++ b/src/Phalcon/cli/Console.php
@@ -40,5 +40,4 @@ public function handle(array $arguments = null)
     public function setArgument(array $arguments = null, bool $str = true, bool $shift = true): Console
     {
     }
-
 }
diff --git a/src/Phalcon/cli/Dispatcher.php b/src/Phalcon/cli/Dispatcher.php
index de74a5b5..47179b40 100644
--- a/src/Phalcon/cli/Dispatcher.php
+++ b/src/Phalcon/cli/Dispatcher.php
@@ -80,9 +80,9 @@ public function getLastTask(): TaskInterface
     /**
      * Gets an option by its name or numeric index
      *
-     * @param  mixed $option
-     * @param  string|array $filters
-     * @param  mixed $defaultValue
+     * @param mixed $option
+     * @param string|array $filters
+     * @param mixed $defaultValue
      * @return mixed
      */
     public function getOption($option, $filters = null, $defaultValue = null)
@@ -180,5 +180,4 @@ protected function handleException(\Exception $exception)
     protected function throwDispatchException(string $message, int $exceptionCode = 0)
     {
     }
-
 }
diff --git a/src/Phalcon/cli/DispatcherInterface.php b/src/Phalcon/cli/DispatcherInterface.php
index eed77c38..58ca9c1f 100644
--- a/src/Phalcon/cli/DispatcherInterface.php
+++ b/src/Phalcon/cli/DispatcherInterface.php
@@ -70,5 +70,4 @@ public function setTaskName(string $taskName);
      * @param string $taskSuffix
      */
     public function setTaskSuffix(string $taskSuffix);
-
 }
diff --git a/src/Phalcon/cli/Router.php b/src/Phalcon/cli/Router.php
index bd5fa234..a6956eff 100644
--- a/src/Phalcon/cli/Router.php
+++ b/src/Phalcon/cli/Router.php
@@ -240,5 +240,4 @@ public function setDefaultTask(string $taskName)
     public function wasMatched(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/cli/RouterInterface.php b/src/Phalcon/cli/RouterInterface.php
index 9a3dbaa9..5f2f0ba6 100644
--- a/src/Phalcon/cli/RouterInterface.php
+++ b/src/Phalcon/cli/RouterInterface.php
@@ -125,5 +125,4 @@ public function setDefaultTask(string $taskName);
      * @return bool
      */
     public function wasMatched(): bool;
-
 }
diff --git a/src/Phalcon/cli/Task.php b/src/Phalcon/cli/Task.php
index dd399c74..8fe41590 100644
--- a/src/Phalcon/cli/Task.php
+++ b/src/Phalcon/cli/Task.php
@@ -59,5 +59,4 @@ public function getEventsManager(): ?ManagerInterface
     public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager)
     {
     }
-
 }
diff --git a/src/Phalcon/cli/router/Route.php b/src/Phalcon/cli/router/Route.php
index 42fc9a52..8ff80394 100644
--- a/src/Phalcon/cli/router/Route.php
+++ b/src/Phalcon/cli/router/Route.php
@@ -23,7 +23,7 @@ class Route implements \Phalcon\Cli\Router\RouteInterface
     protected $delimiter;
 
 
-    static protected $delimiterPath = self::DEFAULT_DELIMITER;
+    protected static $delimiterPath = self::DEFAULT_DELIMITER;
 
 
     protected $description;
@@ -41,7 +41,7 @@ class Route implements \Phalcon\Cli\Router\RouteInterface
     protected $pattern;
 
 
-    static protected $uniqueId = 0;
+    protected static $uniqueId = 0;
 
 
     /**
@@ -241,5 +241,4 @@ public function setDescription(string $description): RouteInterface
     public function setName(string $name): RouteInterface
     {
     }
-
 }
diff --git a/src/Phalcon/cli/router/RouteInterface.php b/src/Phalcon/cli/router/RouteInterface.php
index d5cff844..f87e2b98 100644
--- a/src/Phalcon/cli/router/RouteInterface.php
+++ b/src/Phalcon/cli/router/RouteInterface.php
@@ -108,5 +108,4 @@ public function setDescription(string $description): RouteInterface;
      * @return RouteInterface
      */
     public function setName(string $name): RouteInterface;
-
 }
diff --git a/src/Phalcon/collection/ReadOnly.php b/src/Phalcon/collection/ReadOnly.php
index 9cdb2eb2..d5709a3c 100644
--- a/src/Phalcon/collection/ReadOnly.php
+++ b/src/Phalcon/collection/ReadOnly.php
@@ -28,5 +28,4 @@ public function remove(string $element)
     public function set(string $element, $value)
     {
     }
-
 }
diff --git a/src/Phalcon/config/ConfigFactory.php b/src/Phalcon/config/ConfigFactory.php
index ac5cce55..c26fcb48 100644
--- a/src/Phalcon/config/ConfigFactory.php
+++ b/src/Phalcon/config/ConfigFactory.php
@@ -61,5 +61,4 @@ public function newInstance(string $name, string $fileName, $params = null)
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/config/adapter/Grouped.php b/src/Phalcon/config/adapter/Grouped.php
index 83d53cbf..46564c81 100644
--- a/src/Phalcon/config/adapter/Grouped.php
+++ b/src/Phalcon/config/adapter/Grouped.php
@@ -67,5 +67,4 @@ class Grouped extends Config
     public function __construct(array $arrayConfig, string $defaultAdapter = 'php')
     {
     }
-
 }
diff --git a/src/Phalcon/config/adapter/Ini.php b/src/Phalcon/config/adapter/Ini.php
index 27de2d5e..79a0f125 100644
--- a/src/Phalcon/config/adapter/Ini.php
+++ b/src/Phalcon/config/adapter/Ini.php
@@ -80,5 +80,4 @@ protected function cast($ini)
     protected function parseIniString(string $path, $value): array
     {
     }
-
 }
diff --git a/src/Phalcon/config/adapter/Json.php b/src/Phalcon/config/adapter/Json.php
index 070d12dc..b2df23b3 100644
--- a/src/Phalcon/config/adapter/Json.php
+++ b/src/Phalcon/config/adapter/Json.php
@@ -35,5 +35,4 @@ class Json extends Config
     public function __construct(string $filePath)
     {
     }
-
 }
diff --git a/src/Phalcon/config/adapter/Php.php b/src/Phalcon/config/adapter/Php.php
index 5b214eb9..c1e91821 100644
--- a/src/Phalcon/config/adapter/Php.php
+++ b/src/Phalcon/config/adapter/Php.php
@@ -50,5 +50,4 @@ class Php extends Config
     public function __construct(string $filePath)
     {
     }
-
 }
diff --git a/src/Phalcon/config/adapter/Yaml.php b/src/Phalcon/config/adapter/Yaml.php
index fe22659f..f545b2a2 100644
--- a/src/Phalcon/config/adapter/Yaml.php
+++ b/src/Phalcon/config/adapter/Yaml.php
@@ -53,5 +53,4 @@ class Yaml extends Config
     public function __construct(string $filePath, array $callbacks = null)
     {
     }
-
 }
diff --git a/src/Phalcon/crypt/CryptInterface.php b/src/Phalcon/crypt/CryptInterface.php
index 2758e631..7248875f 100644
--- a/src/Phalcon/crypt/CryptInterface.php
+++ b/src/Phalcon/crypt/CryptInterface.php
@@ -133,5 +133,4 @@ public function setKey(string $key): CryptInterface;
      * @return CryptInterface
      */
     public function setPadding(int $scheme): CryptInterface;
-
 }
diff --git a/src/Phalcon/db/AbstractDb.php b/src/Phalcon/db/AbstractDb.php
index faf5d492..d99eee40 100644
--- a/src/Phalcon/db/AbstractDb.php
+++ b/src/Phalcon/db/AbstractDb.php
@@ -56,5 +56,4 @@ abstract class AbstractDb
     public static function setup(array $options)
     {
     }
-
 }
diff --git a/src/Phalcon/db/Column.php b/src/Phalcon/db/Column.php
index 5bc4457f..f8fb568d 100644
--- a/src/Phalcon/db/Column.php
+++ b/src/Phalcon/db/Column.php
@@ -446,5 +446,4 @@ public function isPrimary(): bool
     public function isUnsigned(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/db/ColumnInterface.php b/src/Phalcon/db/ColumnInterface.php
index 2fc8226d..d76627d2 100644
--- a/src/Phalcon/db/ColumnInterface.php
+++ b/src/Phalcon/db/ColumnInterface.php
@@ -119,5 +119,4 @@ public function isPrimary(): bool;
      * @return bool
      */
     public function isUnsigned(): bool;
-
 }
diff --git a/src/Phalcon/db/Dialect.php b/src/Phalcon/db/Dialect.php
index f8ff74e3..1644f7dd 100644
--- a/src/Phalcon/db/Dialect.php
+++ b/src/Phalcon/db/Dialect.php
@@ -502,5 +502,4 @@ protected function prepareTable(string $table, string $schema = null, string $al
     protected function prepareQualified(string $column, string $domain = null, string $escapeChar = null): string
     {
     }
-
 }
diff --git a/src/Phalcon/db/DialectInterface.php b/src/Phalcon/db/DialectInterface.php
index 0e8e587d..5fc159d5 100644
--- a/src/Phalcon/db/DialectInterface.php
+++ b/src/Phalcon/db/DialectInterface.php
@@ -312,5 +312,4 @@ public function tableOptions(string $table, string $schema = null): string;
      * @return string
      */
     public function viewExists(string $viewName, string $schemaName = null): string;
-
 }
diff --git a/src/Phalcon/db/Enum.php b/src/Phalcon/db/Enum.php
index 3049c8f7..6c105d89 100644
--- a/src/Phalcon/db/Enum.php
+++ b/src/Phalcon/db/Enum.php
@@ -57,6 +57,4 @@ class Enum
 
 
     const FETCH_UNIQUE = 196608;
-
-
 }
diff --git a/src/Phalcon/db/Index.php b/src/Phalcon/db/Index.php
index d861d538..f80a22bd 100644
--- a/src/Phalcon/db/Index.php
+++ b/src/Phalcon/db/Index.php
@@ -92,5 +92,4 @@ public function getType(): string
     public function __construct(string $name, array $columns, string $type = '')
     {
     }
-
 }
diff --git a/src/Phalcon/db/IndexInterface.php b/src/Phalcon/db/IndexInterface.php
index 036ed333..38d385a8 100644
--- a/src/Phalcon/db/IndexInterface.php
+++ b/src/Phalcon/db/IndexInterface.php
@@ -28,5 +28,4 @@ public function getName(): string;
      * @return string
      */
     public function getType(): string;
-
 }
diff --git a/src/Phalcon/db/Profiler.php b/src/Phalcon/db/Profiler.php
index 1c72907c..9c3aa351 100644
--- a/src/Phalcon/db/Profiler.php
+++ b/src/Phalcon/db/Profiler.php
@@ -143,5 +143,4 @@ public function startProfile(string $sqlStatement, $sqlVariables = null, $sqlBin
     public function stopProfile(): Profiler
     {
     }
-
 }
diff --git a/src/Phalcon/db/RawValue.php b/src/Phalcon/db/RawValue.php
index ff3994fa..e89199da 100644
--- a/src/Phalcon/db/RawValue.php
+++ b/src/Phalcon/db/RawValue.php
@@ -52,5 +52,4 @@ public function __toString(): string
     public function __construct($value)
     {
     }
-
 }
diff --git a/src/Phalcon/db/Reference.php b/src/Phalcon/db/Reference.php
index 6a80a29f..8d88dc19 100644
--- a/src/Phalcon/db/Reference.php
+++ b/src/Phalcon/db/Reference.php
@@ -163,5 +163,4 @@ public function getOnUpdate(): string
     public function __construct(string $name, array $definition)
     {
     }
-
 }
diff --git a/src/Phalcon/db/ReferenceInterface.php b/src/Phalcon/db/ReferenceInterface.php
index 738157ac..056b8049 100644
--- a/src/Phalcon/db/ReferenceInterface.php
+++ b/src/Phalcon/db/ReferenceInterface.php
@@ -63,5 +63,4 @@ public function getReferencedTable(): string;
      * @return string
      */
     public function getSchemaName(): string;
-
 }
diff --git a/src/Phalcon/db/ResultInterface.php b/src/Phalcon/db/ResultInterface.php
index a6baa4b2..7ce90cb1 100644
--- a/src/Phalcon/db/ResultInterface.php
+++ b/src/Phalcon/db/ResultInterface.php
@@ -73,5 +73,4 @@ public function numRows(): int;
      * @return bool
      */
     public function setFetchMode(int $fetchMode): bool;
-
 }
diff --git a/src/Phalcon/db/adapter/AbstractAdapter.php b/src/Phalcon/db/adapter/AbstractAdapter.php
index e768f3c9..f4891771 100644
--- a/src/Phalcon/db/adapter/AbstractAdapter.php
+++ b/src/Phalcon/db/adapter/AbstractAdapter.php
@@ -15,7 +15,7 @@ abstract class AbstractAdapter implements \Phalcon\Db\Adapter\AdapterInterface,
     /**
      * Connection ID
      */
-    static protected $connectionConsecutive = 0;
+    protected static $connectionConsecutive = 0;
 
     /**
      * Active connection ID
@@ -919,5 +919,4 @@ public function useExplicitIdValue(): bool
     public function viewExists(string $viewName, string $schemaName = null): bool
     {
     }
-
 }
diff --git a/src/Phalcon/db/adapter/AdapterInterface.php b/src/Phalcon/db/adapter/AdapterInterface.php
index 33611efd..cc9e7e03 100644
--- a/src/Phalcon/db/adapter/AdapterInterface.php
+++ b/src/Phalcon/db/adapter/AdapterInterface.php
@@ -621,5 +621,4 @@ public function useExplicitIdValue(): bool;
      * @return bool
      */
     public function viewExists(string $viewName, string $schemaName = null): bool;
-
 }
diff --git a/src/Phalcon/db/adapter/PdoFactory.php b/src/Phalcon/db/adapter/PdoFactory.php
index ce2bc323..d24a0621 100644
--- a/src/Phalcon/db/adapter/PdoFactory.php
+++ b/src/Phalcon/db/adapter/PdoFactory.php
@@ -53,5 +53,4 @@ public function newInstance(string $name, array $options = array()): AbstractAda
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/db/adapter/pdo/AbstractPdo.php b/src/Phalcon/db/adapter/pdo/AbstractPdo.php
index a923ff6d..053c10bd 100644
--- a/src/Phalcon/db/adapter/pdo/AbstractPdo.php
+++ b/src/Phalcon/db/adapter/pdo/AbstractPdo.php
@@ -366,5 +366,4 @@ public function rollback(bool $nesting = true): bool
      * @return array
      */
     abstract protected function getDsnDefaults(): array;
-
 }
diff --git a/src/Phalcon/db/adapter/pdo/Mysql.php b/src/Phalcon/db/adapter/pdo/Mysql.php
index e2b967c7..53e1b091 100644
--- a/src/Phalcon/db/adapter/pdo/Mysql.php
+++ b/src/Phalcon/db/adapter/pdo/Mysql.php
@@ -103,5 +103,4 @@ public function describeReferences(string $table, string $schema = null): array
     protected function getDsnDefaults(): array
     {
     }
-
 }
diff --git a/src/Phalcon/db/adapter/pdo/Postgresql.php b/src/Phalcon/db/adapter/pdo/Postgresql.php
index c1452061..40012014 100644
--- a/src/Phalcon/db/adapter/pdo/Postgresql.php
+++ b/src/Phalcon/db/adapter/pdo/Postgresql.php
@@ -167,5 +167,4 @@ public function useExplicitIdValue(): bool
     protected function getDsnDefaults(): array
     {
     }
-
 }
diff --git a/src/Phalcon/db/adapter/pdo/Sqlite.php b/src/Phalcon/db/adapter/pdo/Sqlite.php
index a1b4c2b8..f0243b91 100644
--- a/src/Phalcon/db/adapter/pdo/Sqlite.php
+++ b/src/Phalcon/db/adapter/pdo/Sqlite.php
@@ -138,5 +138,4 @@ public function useExplicitIdValue(): bool
     protected function getDsnDefaults(): array
     {
     }
-
 }
diff --git a/src/Phalcon/db/dialect/Mysql.php b/src/Phalcon/db/dialect/Mysql.php
index 0b004487..0a35e0ef 100644
--- a/src/Phalcon/db/dialect/Mysql.php
+++ b/src/Phalcon/db/dialect/Mysql.php
@@ -351,5 +351,4 @@ private function checkColumnSizeAndScale(\Phalcon\Db\ColumnInterface $column): s
     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 4f1b43f5..99a4f307 100644
--- a/src/Phalcon/db/dialect/Postgresql.php
+++ b/src/Phalcon/db/dialect/Postgresql.php
@@ -322,5 +322,4 @@ protected function castDefault(\Phalcon\Db\ColumnInterface $column): string
     protected function getTableOptions(array $definition): string
     {
     }
-
 }
diff --git a/src/Phalcon/db/dialect/Sqlite.php b/src/Phalcon/db/dialect/Sqlite.php
index e7b4cca5..5ac53f17 100644
--- a/src/Phalcon/db/dialect/Sqlite.php
+++ b/src/Phalcon/db/dialect/Sqlite.php
@@ -345,5 +345,4 @@ public function truncateTable(string $tableName, string $schemaName): string
     public function viewExists(string $viewName, string $schemaName = null): string
     {
     }
-
 }
diff --git a/src/Phalcon/db/profiler/Item.php b/src/Phalcon/db/profiler/Item.php
index 0e6c60da..e4244b58 100644
--- a/src/Phalcon/db/profiler/Item.php
+++ b/src/Phalcon/db/profiler/Item.php
@@ -141,5 +141,4 @@ public function getSqlVariables(): array
     public function getTotalElapsedSeconds(): float
     {
     }
-
 }
diff --git a/src/Phalcon/db/result/Pdo.php b/src/Phalcon/db/result/Pdo.php
index 3bd03566..c7f012c7 100644
--- a/src/Phalcon/db/result/Pdo.php
+++ b/src/Phalcon/db/result/Pdo.php
@@ -225,5 +225,4 @@ public function numRows(): int
     public function setFetchMode(int $fetchMode, $colNoOrClassNameOrObject = null, $ctorargs = null): bool
     {
     }
-
 }
diff --git a/src/Phalcon/debug/Dump.php b/src/Phalcon/debug/Dump.php
index f2ae8f6d..cc2fbf6a 100644
--- a/src/Phalcon/debug/Dump.php
+++ b/src/Phalcon/debug/Dump.php
@@ -168,5 +168,4 @@ protected function getStyle(string $type): string
     protected function output($variable, string $name = null, int $tab = 1): string
     {
     }
-
 }
diff --git a/src/Phalcon/di/AbstractInjectionAware.php b/src/Phalcon/di/AbstractInjectionAware.php
index 3a7790bb..bdb18ca2 100644
--- a/src/Phalcon/di/AbstractInjectionAware.php
+++ b/src/Phalcon/di/AbstractInjectionAware.php
@@ -32,5 +32,4 @@ public function getDI(): DiInterface
     public function setDI(\Phalcon\Di\DiInterface $container)
     {
     }
-
 }
diff --git a/src/Phalcon/di/DiInterface.php b/src/Phalcon/di/DiInterface.php
index d1995d31..9f170fce 100644
--- a/src/Phalcon/di/DiInterface.php
+++ b/src/Phalcon/di/DiInterface.php
@@ -123,5 +123,4 @@ public function setRaw(string $name, \Phalcon\Di\ServiceInterface $rawDefinition
      * @return \Phalcon\Di\ServiceInterface
      */
     public function setShared(string $name, $definition): ServiceInterface;
-
 }
diff --git a/src/Phalcon/di/FactoryDefault.php b/src/Phalcon/di/FactoryDefault.php
index 7b75437b..3478549d 100644
--- a/src/Phalcon/di/FactoryDefault.php
+++ b/src/Phalcon/di/FactoryDefault.php
@@ -17,5 +17,4 @@ class FactoryDefault extends \Phalcon\Di
     public function __construct()
     {
     }
-
 }
diff --git a/src/Phalcon/di/Injectable.php b/src/Phalcon/di/Injectable.php
index 55b12a8e..f7382c65 100644
--- a/src/Phalcon/di/Injectable.php
+++ b/src/Phalcon/di/Injectable.php
@@ -80,5 +80,4 @@ public function getDI(): DiInterface
     public function setDI(\Phalcon\Di\DiInterface $container)
     {
     }
-
 }
diff --git a/src/Phalcon/di/InjectionAwareInterface.php b/src/Phalcon/di/InjectionAwareInterface.php
index d12064ac..3bf3ec3b 100644
--- a/src/Phalcon/di/InjectionAwareInterface.php
+++ b/src/Phalcon/di/InjectionAwareInterface.php
@@ -22,5 +22,4 @@ public function setDI(\Phalcon\Di\DiInterface $container);
      * @return \Phalcon\Di\DiInterface
      */
     public function getDI(): DiInterface;
-
 }
diff --git a/src/Phalcon/di/Service.php b/src/Phalcon/di/Service.php
index 81e5032b..3de49845 100644
--- a/src/Phalcon/di/Service.php
+++ b/src/Phalcon/di/Service.php
@@ -55,8 +55,8 @@ public function getDefinition()
     /**
      * Returns a parameter in a specific position
      *
-     * @return array
      * @param int $position
+     * @return array
      */
     public function getParameter(int $position)
     {
@@ -128,5 +128,4 @@ public function setShared(bool $shared)
     public function setSharedInstance($sharedInstance)
     {
     }
-
 }
diff --git a/src/Phalcon/di/ServiceInterface.php b/src/Phalcon/di/ServiceInterface.php
index 90647806..7771819c 100644
--- a/src/Phalcon/di/ServiceInterface.php
+++ b/src/Phalcon/di/ServiceInterface.php
@@ -18,8 +18,8 @@ public function getDefinition();
     /**
      * Returns a parameter in a specific position
      *
-     * @return array
      * @param int $position
+     * @return array
      */
     public function getParameter(int $position);
 
@@ -68,5 +68,4 @@ public function setParameter(int $position, array $parameter): ServiceInterface;
      * @param bool $shared
      */
     public function setShared(bool $shared);
-
 }
diff --git a/src/Phalcon/di/ServiceProviderInterface.php b/src/Phalcon/di/ServiceProviderInterface.php
index e61eaedb..6756aa83 100644
--- a/src/Phalcon/di/ServiceProviderInterface.php
+++ b/src/Phalcon/di/ServiceProviderInterface.php
@@ -35,5 +35,4 @@ interface ServiceProviderInterface
      * @param \Phalcon\Di\DiInterface $di
      */
     public function register(\Phalcon\Di\DiInterface $di);
-
 }
diff --git a/src/Phalcon/di/factorydefault/Cli.php b/src/Phalcon/di/factorydefault/Cli.php
index 0b7bad40..f7c4b2d3 100644
--- a/src/Phalcon/di/factorydefault/Cli.php
+++ b/src/Phalcon/di/factorydefault/Cli.php
@@ -21,5 +21,4 @@ class Cli extends FactoryDefault
     public function __construct()
     {
     }
-
 }
diff --git a/src/Phalcon/di/service/Builder.php b/src/Phalcon/di/service/Builder.php
index d83b465b..2886678e 100644
--- a/src/Phalcon/di/service/Builder.php
+++ b/src/Phalcon/di/service/Builder.php
@@ -14,9 +14,9 @@ class Builder
      * Builds a service using a complex service definition
      *
      * @param array $parameters
-     * @return mixed
      * @param \Phalcon\Di\DiInterface $container
      * @param array $definition
+     * @return mixed
      */
     public function build(\Phalcon\Di\DiInterface $container, array $definition, $parameters = null)
     {
@@ -25,10 +25,10 @@ public function build(\Phalcon\Di\DiInterface $container, array $definition, $pa
     /**
      * Resolves a constructor/call parameter
      *
-     * @return mixed
      * @param \Phalcon\Di\DiInterface $container
      * @param int $position
      * @param array $argument
+     * @return mixed
      */
     private function buildParameter(\Phalcon\Di\DiInterface $container, int $position, array $argument)
     {
@@ -44,5 +44,4 @@ private function buildParameter(\Phalcon\Di\DiInterface $container, int $positio
     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 b092ff52..ec2af170 100644
--- a/src/Phalcon/dispatcher/AbstractDispatcher.php
+++ b/src/Phalcon/dispatcher/AbstractDispatcher.php
@@ -146,8 +146,8 @@ public function dispatch(): bool
      * );
      * ```
      *
-     * @throws \Phalcon\Exception
      * @param array $forward
+     * @throws \Phalcon\Exception
      */
     public function forward(array $forward)
     {
@@ -463,5 +463,4 @@ protected function resolveEmptyProperties()
     protected function toCamelCase(string $input): string
     {
     }
-
 }
diff --git a/src/Phalcon/dispatcher/DispatcherInterface.php b/src/Phalcon/dispatcher/DispatcherInterface.php
index 3e670853..c8ff6675 100644
--- a/src/Phalcon/dispatcher/DispatcherInterface.php
+++ b/src/Phalcon/dispatcher/DispatcherInterface.php
@@ -145,5 +145,4 @@ public function setParam($param, $value);
      * @param array $params
      */
     public function setParams(array $params);
-
 }
diff --git a/src/Phalcon/dispatcher/Exception.php b/src/Phalcon/dispatcher/Exception.php
index a9867c1d..cad099de 100644
--- a/src/Phalcon/dispatcher/Exception.php
+++ b/src/Phalcon/dispatcher/Exception.php
@@ -24,6 +24,4 @@ class Exception extends \Phalcon\Exception
 
 
     const EXCEPTION_NO_DI = 0;
-
-
 }
diff --git a/src/Phalcon/domain/payload/Payload.php b/src/Phalcon/domain/payload/Payload.php
index b3117f15..8be33d5e 100644
--- a/src/Phalcon/domain/payload/Payload.php
+++ b/src/Phalcon/domain/payload/Payload.php
@@ -137,5 +137,4 @@ public function setOutput($output): PayloadInterface
     public function setStatus($status): PayloadInterface
     {
     }
-
 }
diff --git a/src/Phalcon/domain/payload/PayloadFactory.php b/src/Phalcon/domain/payload/PayloadFactory.php
index 739ac257..9c93b0df 100644
--- a/src/Phalcon/domain/payload/PayloadFactory.php
+++ b/src/Phalcon/domain/payload/PayloadFactory.php
@@ -16,5 +16,4 @@ class PayloadFactory
     public function newInstance(): PayloadInterface
     {
     }
-
 }
diff --git a/src/Phalcon/domain/payload/ReadableInterface.php b/src/Phalcon/domain/payload/ReadableInterface.php
index 53a7fd5a..cac33ff9 100644
--- a/src/Phalcon/domain/payload/ReadableInterface.php
+++ b/src/Phalcon/domain/payload/ReadableInterface.php
@@ -42,5 +42,4 @@ public function getMessages();
      * @return mixed
      */
     public function getExtras();
-
 }
diff --git a/src/Phalcon/domain/payload/Status.php b/src/Phalcon/domain/payload/Status.php
index 5da2de6f..6d3b632c 100644
--- a/src/Phalcon/domain/payload/Status.php
+++ b/src/Phalcon/domain/payload/Status.php
@@ -74,5 +74,4 @@ class Status
     final private function __construct()
     {
     }
-
 }
diff --git a/src/Phalcon/domain/payload/WriteableInterface.php b/src/Phalcon/domain/payload/WriteableInterface.php
index cf737f0c..08bbd422 100644
--- a/src/Phalcon/domain/payload/WriteableInterface.php
+++ b/src/Phalcon/domain/payload/WriteableInterface.php
@@ -49,5 +49,4 @@ public function setMessages($messages): PayloadInterface;
      * @return \Phalcon\Domain\Payload\PayloadInterface
      */
     public function setExtras($extras): PayloadInterface;
-
 }
diff --git a/src/Phalcon/escaper/EscaperInterface.php b/src/Phalcon/escaper/EscaperInterface.php
index 784051f3..282aa24c 100644
--- a/src/Phalcon/escaper/EscaperInterface.php
+++ b/src/Phalcon/escaper/EscaperInterface.php
@@ -70,5 +70,4 @@ public function setEncoding(string $encoding);
      * @param int $quoteType
      */
     public function setHtmlQuoteType(int $quoteType);
-
 }
diff --git a/src/Phalcon/events/Event.php b/src/Phalcon/events/Event.php
index 6e8b3142..87441b61 100644
--- a/src/Phalcon/events/Event.php
+++ b/src/Phalcon/events/Event.php
@@ -152,5 +152,4 @@ public function setType(string $type): EventInterface
     public function stop(): EventInterface
     {
     }
-
 }
diff --git a/src/Phalcon/events/EventInterface.php b/src/Phalcon/events/EventInterface.php
index 92f60516..8ac004c0 100644
--- a/src/Phalcon/events/EventInterface.php
+++ b/src/Phalcon/events/EventInterface.php
@@ -60,5 +60,4 @@ public function setType(string $type): EventInterface;
      * @return EventInterface
      */
     public function stop(): EventInterface;
-
 }
diff --git a/src/Phalcon/events/EventsAwareInterface.php b/src/Phalcon/events/EventsAwareInterface.php
index dec83036..971d263e 100644
--- a/src/Phalcon/events/EventsAwareInterface.php
+++ b/src/Phalcon/events/EventsAwareInterface.php
@@ -24,5 +24,4 @@ public function getEventsManager(): ?ManagerInterface;
      * @param ManagerInterface $eventsManager
      */
     public function setEventsManager(ManagerInterface $eventsManager);
-
 }
diff --git a/src/Phalcon/events/Manager.php b/src/Phalcon/events/Manager.php
index 5aa8fa91..ed672b84 100644
--- a/src/Phalcon/events/Manager.php
+++ b/src/Phalcon/events/Manager.php
@@ -100,9 +100,9 @@ public function enablePriorities(bool $enablePriorities)
      *
      * @param object $source
      * @param mixed $data
-     * @return mixed
      * @param string $eventType
      * @param bool $cancelable
+     * @return mixed
      */
     public function fire(string $eventType, $source, $data = null, bool $cancelable = true)
     {
@@ -111,9 +111,9 @@ public function fire(string $eventType, $source, $data = null, bool $cancelable
     /**
      * Internal handler to call a queue of events
      *
-     * @return mixed
      * @param \SplPriorityQueue $queue
      * @param EventInterface $event
+     * @return mixed
      */
     final public function fireQueue(\SplPriorityQueue $queue, EventInterface $event)
     {
@@ -158,5 +158,4 @@ public function hasListeners(string $type): bool
     public function isCollecting(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/events/ManagerInterface.php b/src/Phalcon/events/ManagerInterface.php
index 7ddf377a..bad1e4bb 100644
--- a/src/Phalcon/events/ManagerInterface.php
+++ b/src/Phalcon/events/ManagerInterface.php
@@ -42,9 +42,9 @@ public function detachAll(string $type = null);
      *
      * @param object $source
      * @param mixed $data
-     * @return mixed
      * @param string $eventType
      * @param bool $cancelable
+     * @return mixed
      */
     public function fire(string $eventType, $source, $data = null, bool $cancelable = true);
 
@@ -63,5 +63,4 @@ public function getListeners(string $type): array;
      * @return bool
      */
     public function hasListeners(string $type): bool;
-
 }
diff --git a/src/Phalcon/factory/AbstractFactory.php b/src/Phalcon/factory/AbstractFactory.php
index 31396f92..7c7a381f 100644
--- a/src/Phalcon/factory/AbstractFactory.php
+++ b/src/Phalcon/factory/AbstractFactory.php
@@ -57,5 +57,4 @@ abstract protected function getAdapters(): array;
     protected function init(array $services = array())
     {
     }
-
 }
diff --git a/src/Phalcon/filter/FilterFactory.php b/src/Phalcon/filter/FilterFactory.php
index 690c108f..e79b82ae 100644
--- a/src/Phalcon/filter/FilterFactory.php
+++ b/src/Phalcon/filter/FilterFactory.php
@@ -29,5 +29,4 @@ public function newInstance(): FilterInterface
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/filter/FilterInterface.php b/src/Phalcon/filter/FilterInterface.php
index 067ba31c..ffa0fea8 100644
--- a/src/Phalcon/filter/FilterInterface.php
+++ b/src/Phalcon/filter/FilterInterface.php
@@ -17,5 +17,4 @@ interface FilterInterface
      * @return mixed
      */
     public function sanitize($value, $sanitizers, bool $noRecursive = false);
-
 }
diff --git a/src/Phalcon/filter/sanitize/AbsInt.php b/src/Phalcon/filter/sanitize/AbsInt.php
index 8e81576a..8cceb179 100644
--- a/src/Phalcon/filter/sanitize/AbsInt.php
+++ b/src/Phalcon/filter/sanitize/AbsInt.php
@@ -16,5 +16,4 @@ class AbsInt
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Alnum.php b/src/Phalcon/filter/sanitize/Alnum.php
index e6acb75a..533abeff 100644
--- a/src/Phalcon/filter/sanitize/Alnum.php
+++ b/src/Phalcon/filter/sanitize/Alnum.php
@@ -16,5 +16,4 @@ class Alnum
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Alpha.php b/src/Phalcon/filter/sanitize/Alpha.php
index 65a72e6c..5c4a764b 100644
--- a/src/Phalcon/filter/sanitize/Alpha.php
+++ b/src/Phalcon/filter/sanitize/Alpha.php
@@ -16,5 +16,4 @@ class Alpha
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/BoolVal.php b/src/Phalcon/filter/sanitize/BoolVal.php
index d1c00d66..d3d4708c 100644
--- a/src/Phalcon/filter/sanitize/BoolVal.php
+++ b/src/Phalcon/filter/sanitize/BoolVal.php
@@ -16,5 +16,4 @@ class BoolVal
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Email.php b/src/Phalcon/filter/sanitize/Email.php
index a2e43a68..6efc92fa 100644
--- a/src/Phalcon/filter/sanitize/Email.php
+++ b/src/Phalcon/filter/sanitize/Email.php
@@ -16,5 +16,4 @@ class Email
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/FloatVal.php b/src/Phalcon/filter/sanitize/FloatVal.php
index 7b838493..916a7c04 100644
--- a/src/Phalcon/filter/sanitize/FloatVal.php
+++ b/src/Phalcon/filter/sanitize/FloatVal.php
@@ -16,5 +16,4 @@ class FloatVal
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/IntVal.php b/src/Phalcon/filter/sanitize/IntVal.php
index db75914a..98445ffc 100644
--- a/src/Phalcon/filter/sanitize/IntVal.php
+++ b/src/Phalcon/filter/sanitize/IntVal.php
@@ -16,5 +16,4 @@ class IntVal
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Lower.php b/src/Phalcon/filter/sanitize/Lower.php
index 74ab9e1d..19aaad22 100644
--- a/src/Phalcon/filter/sanitize/Lower.php
+++ b/src/Phalcon/filter/sanitize/Lower.php
@@ -16,5 +16,4 @@ class Lower
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/LowerFirst.php b/src/Phalcon/filter/sanitize/LowerFirst.php
index 99d96acc..70f5a0bc 100644
--- a/src/Phalcon/filter/sanitize/LowerFirst.php
+++ b/src/Phalcon/filter/sanitize/LowerFirst.php
@@ -16,5 +16,4 @@ class LowerFirst
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Regex.php b/src/Phalcon/filter/sanitize/Regex.php
index 397c125b..f7aa7910 100644
--- a/src/Phalcon/filter/sanitize/Regex.php
+++ b/src/Phalcon/filter/sanitize/Regex.php
@@ -18,5 +18,4 @@ class Regex
     public function __invoke($input, $pattern, $replace)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Remove.php b/src/Phalcon/filter/sanitize/Remove.php
index d95e31b5..a556ef0f 100644
--- a/src/Phalcon/filter/sanitize/Remove.php
+++ b/src/Phalcon/filter/sanitize/Remove.php
@@ -17,5 +17,4 @@ class Remove
     public function __invoke($input, $replace)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Replace.php b/src/Phalcon/filter/sanitize/Replace.php
index a40b14c2..6117afa9 100644
--- a/src/Phalcon/filter/sanitize/Replace.php
+++ b/src/Phalcon/filter/sanitize/Replace.php
@@ -18,5 +18,4 @@ class Replace
     public function __invoke($input, $from, $to)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Special.php b/src/Phalcon/filter/sanitize/Special.php
index 7e333cc7..fe890c36 100644
--- a/src/Phalcon/filter/sanitize/Special.php
+++ b/src/Phalcon/filter/sanitize/Special.php
@@ -16,5 +16,4 @@ class Special
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/SpecialFull.php b/src/Phalcon/filter/sanitize/SpecialFull.php
index fb9c7efb..04564d3a 100644
--- a/src/Phalcon/filter/sanitize/SpecialFull.php
+++ b/src/Phalcon/filter/sanitize/SpecialFull.php
@@ -16,5 +16,4 @@ class SpecialFull
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/StringVal.php b/src/Phalcon/filter/sanitize/StringVal.php
index f168d5e4..db0866a0 100644
--- a/src/Phalcon/filter/sanitize/StringVal.php
+++ b/src/Phalcon/filter/sanitize/StringVal.php
@@ -16,5 +16,4 @@ class StringVal
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Striptags.php b/src/Phalcon/filter/sanitize/Striptags.php
index fa617220..72f8bf05 100644
--- a/src/Phalcon/filter/sanitize/Striptags.php
+++ b/src/Phalcon/filter/sanitize/Striptags.php
@@ -16,5 +16,4 @@ class Striptags
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Trim.php b/src/Phalcon/filter/sanitize/Trim.php
index 78092617..c325fc47 100644
--- a/src/Phalcon/filter/sanitize/Trim.php
+++ b/src/Phalcon/filter/sanitize/Trim.php
@@ -16,5 +16,4 @@ class Trim
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Upper.php b/src/Phalcon/filter/sanitize/Upper.php
index 3e9638ab..3baed094 100644
--- a/src/Phalcon/filter/sanitize/Upper.php
+++ b/src/Phalcon/filter/sanitize/Upper.php
@@ -16,5 +16,4 @@ class Upper
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/UpperFirst.php b/src/Phalcon/filter/sanitize/UpperFirst.php
index 2906ba8a..afbc238b 100644
--- a/src/Phalcon/filter/sanitize/UpperFirst.php
+++ b/src/Phalcon/filter/sanitize/UpperFirst.php
@@ -16,5 +16,4 @@ class UpperFirst
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/UpperWords.php b/src/Phalcon/filter/sanitize/UpperWords.php
index 4782f08b..8f24dc60 100644
--- a/src/Phalcon/filter/sanitize/UpperWords.php
+++ b/src/Phalcon/filter/sanitize/UpperWords.php
@@ -16,5 +16,4 @@ class UpperWords
     public function __invoke(string $input)
     {
     }
-
 }
diff --git a/src/Phalcon/filter/sanitize/Url.php b/src/Phalcon/filter/sanitize/Url.php
index 885a8634..ac80afde 100644
--- a/src/Phalcon/filter/sanitize/Url.php
+++ b/src/Phalcon/filter/sanitize/Url.php
@@ -16,5 +16,4 @@ class Url
     public function __invoke($input)
     {
     }
-
 }
diff --git a/src/Phalcon/firewall/adapter/AbstractAdapter.php b/src/Phalcon/firewall/adapter/AbstractAdapter.php
index 3807da09..5f9c0c44 100644
--- a/src/Phalcon/firewall/adapter/AbstractAdapter.php
+++ b/src/Phalcon/firewall/adapter/AbstractAdapter.php
@@ -4,13 +4,8 @@
 
 use Closure;
 use Phalcon\Acl\Enum;
-use Phalcon\Acl\RoleAware;
 use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
-use Phalcon\Di\DiInterface;
-use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
-use Phalcon\Firewall\Exception;
-use Phalcon\Mvc\Dispatcher;
 
 /**
  * Adapter for Phalcon\Firewall adapters
@@ -229,5 +224,4 @@ protected function saveAccessInCache(string $key, bool $access)
     protected function throwFirewallException(string $message, int $exceptionCode = 0): bool
     {
     }
-
 }
diff --git a/src/Phalcon/firewall/adapter/Acl.php b/src/Phalcon/firewall/adapter/Acl.php
index ec36390f..c45de4ce 100644
--- a/src/Phalcon/firewall/adapter/Acl.php
+++ b/src/Phalcon/firewall/adapter/Acl.php
@@ -206,5 +206,4 @@ protected function handleDispatcher(\Phalcon\Mvc\DispatcherInterface $dispatcher
     protected function saveAccessInCache(string $key, bool $access)
     {
     }
-
 }
diff --git a/src/Phalcon/firewall/adapter/AdapterInterface.php b/src/Phalcon/firewall/adapter/AdapterInterface.php
index d38b6148..24eed8aa 100644
--- a/src/Phalcon/firewall/adapter/AdapterInterface.php
+++ b/src/Phalcon/firewall/adapter/AdapterInterface.php
@@ -61,5 +61,4 @@ public function setDefaultAccess(int $defaultAccess): AdapterInterface;
      * @return AdapterInterface
      */
     public function setRoleCallback(\Closure $callback): AdapterInterface;
-
 }
diff --git a/src/Phalcon/firewall/adapter/Annotations.php b/src/Phalcon/firewall/adapter/Annotations.php
index 9424746c..610d81f0 100644
--- a/src/Phalcon/firewall/adapter/Annotations.php
+++ b/src/Phalcon/firewall/adapter/Annotations.php
@@ -126,5 +126,4 @@ protected function getAccessFromCache(string $key, array $originalValues = null,
     protected function handleAnnotation($annotation, bool $access, $role)
     {
     }
-
 }
diff --git a/src/Phalcon/firewall/adapter/micro/Acl.php b/src/Phalcon/firewall/adapter/micro/Acl.php
index 72483f90..bc3227c6 100644
--- a/src/Phalcon/firewall/adapter/micro/Acl.php
+++ b/src/Phalcon/firewall/adapter/micro/Acl.php
@@ -232,5 +232,4 @@ protected function handleRouter(\Phalcon\Mvc\Micro $micro)
     protected function saveAccessInCache(string $key, bool $access)
     {
     }
-
 }
diff --git a/src/Phalcon/flash/AbstractFlash.php b/src/Phalcon/flash/AbstractFlash.php
index f48a7fd8..e37abb3a 100644
--- a/src/Phalcon/flash/AbstractFlash.php
+++ b/src/Phalcon/flash/AbstractFlash.php
@@ -215,8 +215,8 @@ public function success(string $message): string
      * ```
      *
      * @param string|array $message
-     * @return string|void
      * @param string $type
+     * @return string|void
      */
     public function outputMessage(string $type, $message)
     {
@@ -266,5 +266,4 @@ private function prepareEscapedMessage(string $message): string
     private function prepareHtmlMessage(string $type, string $message): string
     {
     }
-
 }
diff --git a/src/Phalcon/flash/Direct.php b/src/Phalcon/flash/Direct.php
index e70ffb0e..92ba9061 100644
--- a/src/Phalcon/flash/Direct.php
+++ b/src/Phalcon/flash/Direct.php
@@ -28,5 +28,4 @@ public function message(string $type, $message): ?string
     public function output(bool $remove = true)
     {
     }
-
 }
diff --git a/src/Phalcon/flash/FlashInterface.php b/src/Phalcon/flash/FlashInterface.php
index d5516aac..b5161398 100644
--- a/src/Phalcon/flash/FlashInterface.php
+++ b/src/Phalcon/flash/FlashInterface.php
@@ -50,5 +50,4 @@ public function success(string $message): string;
      * @return string
      */
     public function warning(string $message): string;
-
 }
diff --git a/src/Phalcon/flash/Session.php b/src/Phalcon/flash/Session.php
index ccf30cea..9a36708b 100644
--- a/src/Phalcon/flash/Session.php
+++ b/src/Phalcon/flash/Session.php
@@ -88,5 +88,4 @@ protected function setSessionMessages(array $messages): array
     public function getSessionService(): ManagerInterface
     {
     }
-
 }
diff --git a/src/Phalcon/forms/Form.php b/src/Phalcon/forms/Form.php
index d9a105a6..18cdb99d 100644
--- a/src/Phalcon/forms/Form.php
+++ b/src/Phalcon/forms/Form.php
@@ -321,8 +321,8 @@ public function rewind()
     /**
      * Sets the form's action
      *
-     * @return Form
      * @param string $action
+     * @return Form
      */
     public function setAction(string $action): Form
     {
@@ -377,5 +377,4 @@ public function setUserOptions(array $options): Form
     public function valid(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/forms/Manager.php b/src/Phalcon/forms/Manager.php
index b59bdfda..42aeafcc 100644
--- a/src/Phalcon/forms/Manager.php
+++ b/src/Phalcon/forms/Manager.php
@@ -52,5 +52,4 @@ public function has(string $name): bool
     public function set(string $name, Form $form): Manager
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/AbstractElement.php b/src/Phalcon/forms/element/AbstractElement.php
index 903f45be..9bae5d4a 100644
--- a/src/Phalcon/forms/element/AbstractElement.php
+++ b/src/Phalcon/forms/element/AbstractElement.php
@@ -357,5 +357,4 @@ public function setUserOption(string $option, $value): ElementInterface
     public function setUserOptions(array $options): ElementInterface
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Check.php b/src/Phalcon/forms/element/Check.php
index 2cf1e024..68472d21 100644
--- a/src/Phalcon/forms/element/Check.php
+++ b/src/Phalcon/forms/element/Check.php
@@ -19,5 +19,4 @@ class Check extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Date.php b/src/Phalcon/forms/element/Date.php
index 8d37a028..56000b1b 100644
--- a/src/Phalcon/forms/element/Date.php
+++ b/src/Phalcon/forms/element/Date.php
@@ -17,5 +17,4 @@ class Date extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/ElementInterface.php b/src/Phalcon/forms/element/ElementInterface.php
index a8c29101..fbde7685 100644
--- a/src/Phalcon/forms/element/ElementInterface.php
+++ b/src/Phalcon/forms/element/ElementInterface.php
@@ -256,5 +256,4 @@ public function setUserOption(string $option, $value): ElementInterface;
      * @return ElementInterface
      */
     public function setUserOptions(array $options): ElementInterface;
-
 }
diff --git a/src/Phalcon/forms/element/Email.php b/src/Phalcon/forms/element/Email.php
index 96d70d99..d008a2a0 100644
--- a/src/Phalcon/forms/element/Email.php
+++ b/src/Phalcon/forms/element/Email.php
@@ -19,5 +19,4 @@ class Email extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/File.php b/src/Phalcon/forms/element/File.php
index a50e054e..89f91f29 100644
--- a/src/Phalcon/forms/element/File.php
+++ b/src/Phalcon/forms/element/File.php
@@ -17,5 +17,4 @@ class File extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Hidden.php b/src/Phalcon/forms/element/Hidden.php
index 29558220..8821861c 100644
--- a/src/Phalcon/forms/element/Hidden.php
+++ b/src/Phalcon/forms/element/Hidden.php
@@ -19,5 +19,4 @@ class Hidden extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Numeric.php b/src/Phalcon/forms/element/Numeric.php
index 1f8b48eb..2a348713 100644
--- a/src/Phalcon/forms/element/Numeric.php
+++ b/src/Phalcon/forms/element/Numeric.php
@@ -19,5 +19,4 @@ class Numeric extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Password.php b/src/Phalcon/forms/element/Password.php
index 49f3b795..23f775ed 100644
--- a/src/Phalcon/forms/element/Password.php
+++ b/src/Phalcon/forms/element/Password.php
@@ -19,5 +19,4 @@ class Password extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Radio.php b/src/Phalcon/forms/element/Radio.php
index 6d9e0af4..1a6b4e25 100644
--- a/src/Phalcon/forms/element/Radio.php
+++ b/src/Phalcon/forms/element/Radio.php
@@ -19,5 +19,4 @@ class Radio extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Select.php b/src/Phalcon/forms/element/Select.php
index 92c05612..4c2c5c4c 100644
--- a/src/Phalcon/forms/element/Select.php
+++ b/src/Phalcon/forms/element/Select.php
@@ -62,5 +62,4 @@ public function render(array $attributes = array()): string
     public function setOptions($options): ElementInterface
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Submit.php b/src/Phalcon/forms/element/Submit.php
index c64cd2a6..d5070038 100644
--- a/src/Phalcon/forms/element/Submit.php
+++ b/src/Phalcon/forms/element/Submit.php
@@ -17,5 +17,4 @@ class Submit extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/Text.php b/src/Phalcon/forms/element/Text.php
index b0f55d39..32aeaf71 100644
--- a/src/Phalcon/forms/element/Text.php
+++ b/src/Phalcon/forms/element/Text.php
@@ -19,5 +19,4 @@ class Text extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/forms/element/TextArea.php b/src/Phalcon/forms/element/TextArea.php
index cf43c71c..458c6c79 100644
--- a/src/Phalcon/forms/element/TextArea.php
+++ b/src/Phalcon/forms/element/TextArea.php
@@ -17,5 +17,4 @@ class TextArea extends AbstractElement
     public function render(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/helper/Arr.php b/src/Phalcon/helper/Arr.php
index 1dc7e540..70f8dd5a 100644
--- a/src/Phalcon/helper/Arr.php
+++ b/src/Phalcon/helper/Arr.php
@@ -12,8 +12,8 @@ class Arr
      * Chunks an array into smaller arrays of a specified size.
      *
      * @param array $collection
-     * @param int   $size
-     * @param bool  $preserveKeys
+     * @param int $size
+     * @param bool $preserveKeys
      *
      * @return array
      */
@@ -25,7 +25,7 @@ final public static function chunk(array $collection, int $size, bool $preserveK
      * Returns the first element of the collection. If a callable is passed, the
      * element returned is the first that validates true
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return mixed
@@ -38,7 +38,7 @@ final public static function first(array $collection, $method = null)
      * Returns the key of the first element of the collection. If a callable
      * is passed, the element returned is the first that validates true
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return mixed
@@ -51,7 +51,7 @@ final public static function firstKey(array $collection, $method = null)
      * Flattens an array up to the one level depth, unless `$deep` is set to `true`
      *
      * @param array $collection
-     * @param bool  $deep
+     * @param bool $deep
      *
      * @return array
      */
@@ -75,7 +75,7 @@ final public static function get(array $collection, $index, $defaultValue = null
     /**
      * Groups the elements of an array based on the passed callable
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return array
@@ -113,7 +113,7 @@ final public static function isUnique(array $collection): bool
      * Returns the last element of the collection. If a callable is passed, the
      * element returned is the first that validates true
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * return mixed
@@ -127,7 +127,7 @@ final public static function last(array $collection, $method = null)
      * Returns the key of the last element of the collection. If a callable is
      * passed, the element returned is the first that validates true
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return mixed
@@ -139,8 +139,8 @@ final public static function lastKey(array $collection, $method = null)
     /**
      * Sorts a collection of arrays or objects by key
      *
-     * @param array  $collection
-     * @param mixed  $attribute
+     * @param array $collection
+     * @param mixed $attribute
      * @param string $order
      *
      * @return array
@@ -152,7 +152,7 @@ final public static function order(array $collection, $attribute, string $order
     /**
      * Retrieves all of the values for a given key:
      *
-     * @param array  $collection
+     * @param array $collection
      * @param string $element
      *
      * @return array
@@ -178,7 +178,7 @@ final public static function set(array $collection, $value, $index = null): arra
      * Returns a new array with n elements removed from the right.
      *
      * @param array $collection
-     * @param int   $elements
+     * @param int $elements
      *
      * @return array
      */
@@ -190,7 +190,7 @@ final public static function sliceLeft(array $collection, int $elements = 1): ar
      * Returns a new array with the X elements from the right
      *
      * @param array $collection
-     * @param int   $elements
+     * @param int $elements
      *
      * @return array
      */
@@ -223,7 +223,7 @@ final public static function toObject(array $collection)
      * Returns true if the provided function returns true for all elements of
      * the collection, false otherwise.
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return bool
@@ -236,7 +236,7 @@ final public static function validateAll(array $collection, $method): bool
      * Returns true if the provided function returns true for at least one
      * element fo the collection, false otherwise.
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return bool
@@ -248,7 +248,7 @@ final public static function validateAny(array $collection, $method): bool
     /**
      * Helper method to filter the collection
      *
-     * @param array    $collection
+     * @param array $collection
      * @param callable $method
      *
      * @return array
@@ -269,5 +269,4 @@ final private static function filterCollection(array $collection, $method = null
     final public static function whiteList(array $collection, array $whiteList): array
     {
     }
-
 }
diff --git a/src/Phalcon/helper/Fs.php b/src/Phalcon/helper/Fs.php
index 16ae71f3..04e5c383 100644
--- a/src/Phalcon/helper/Fs.php
+++ b/src/Phalcon/helper/Fs.php
@@ -21,5 +21,4 @@ class Fs
     final public static function basename(string $uri, $suffix = null): string
     {
     }
-
 }
diff --git a/src/Phalcon/helper/Number.php b/src/Phalcon/helper/Number.php
index d2696d15..63d21e47 100644
--- a/src/Phalcon/helper/Number.php
+++ b/src/Phalcon/helper/Number.php
@@ -21,5 +21,4 @@ class Number
     final public static function between(int $value, int $from, int $to): bool
     {
     }
-
 }
diff --git a/src/Phalcon/helper/Str.php b/src/Phalcon/helper/Str.php
index 0e9a456d..60e6890a 100644
--- a/src/Phalcon/helper/Str.php
+++ b/src/Phalcon/helper/Str.php
@@ -38,7 +38,7 @@ class Str
      * ```
      *
      * @param string $text
-     * @param mixed  $delimiter
+     * @param mixed $delimiter
      *
      * @return string
      */
@@ -67,9 +67,9 @@ final public static function camelize(string $text, $delimiter = null): string
      * @param string $b
      * @param string ...N
      *
-     * @return string
      * @param string  ...N
      *
+     * @return string
      */
     final public static function concat(): string
     {
@@ -81,8 +81,8 @@ final public static function concat(): string
      *
      * @param string $string
      *
-     * @return int
      * @param string $text
+     * @return int
      */
     final public static function countVowels(string $text): int
     {
@@ -94,11 +94,11 @@ final public static function countVowels(string $text): int
      * string intact, or set it to true to convert to uppercase.
      *
      * @param string $string
-     * @param bool   $upperRest
+     * @param bool $upperRest
      * @param string $encoding
      *
-     * @return string
      * @param string $text
+     * @return string
      */
     final public static function decapitalize(string $text, bool $upperRest = false, string $encoding = 'UTF-8'): string
     {
@@ -187,7 +187,7 @@ final public static function dynamic(string $text, string $leftDelimiter = '{',
      *
      * @param string $text
      * @param string $end
-     * @param bool   $ignoreCase
+     * @param bool $ignoreCase
      *
      * @return bool
      */
@@ -374,7 +374,7 @@ final public static function reduceSlashes(string $text): string
      *
      * @param string $text
      * @param string $start
-     * @param bool   $ignoreCase
+     * @param bool $ignoreCase
      *
      * @return bool
      */
@@ -393,7 +393,7 @@ final public static function startsWith(string $text, string $start, bool $ignor
      * ```
      *
      * @param string $text
-     * @param mixed  $delimiter
+     * @param mixed $delimiter
      *
      * @return string
      */
@@ -435,5 +435,4 @@ final public static function underscore(string $text): string
     final public static function upper(string $text, string $encoding = 'UTF-8'): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/Attributes.php b/src/Phalcon/html/Attributes.php
index 48665f8b..b15686e8 100644
--- a/src/Phalcon/html/Attributes.php
+++ b/src/Phalcon/html/Attributes.php
@@ -27,5 +27,4 @@ public function render(): string
     public function __toString(): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/Breadcrumbs.php b/src/Phalcon/html/Breadcrumbs.php
index 86463993..be4e59a9 100644
--- a/src/Phalcon/html/Breadcrumbs.php
+++ b/src/Phalcon/html/Breadcrumbs.php
@@ -118,5 +118,4 @@ public function render(): string
     public function toArray(): array
     {
     }
-
 }
diff --git a/src/Phalcon/html/TagFactory.php b/src/Phalcon/html/TagFactory.php
index eb7953c5..161d4ecf 100644
--- a/src/Phalcon/html/TagFactory.php
+++ b/src/Phalcon/html/TagFactory.php
@@ -41,5 +41,4 @@ public function newInstance(string $name)
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/html/attributes/AttributesInterface.php b/src/Phalcon/html/attributes/AttributesInterface.php
index cc82778f..10d1db1d 100644
--- a/src/Phalcon/html/attributes/AttributesInterface.php
+++ b/src/Phalcon/html/attributes/AttributesInterface.php
@@ -26,5 +26,4 @@ public function getAttributes(): Attributes;
      * @return AttributesInterface
      */
     public function setAttributes(\Phalcon\Html\Attributes $attributes): AttributesInterface;
-
 }
diff --git a/src/Phalcon/html/attributes/RenderInterface.php b/src/Phalcon/html/attributes/RenderInterface.php
index 4d1574b3..1b94eb49 100644
--- a/src/Phalcon/html/attributes/RenderInterface.php
+++ b/src/Phalcon/html/attributes/RenderInterface.php
@@ -16,5 +16,4 @@ interface RenderInterface
      * @return string
      */
     public function render(): string;
-
 }
diff --git a/src/Phalcon/html/helper/AbstractHelper.php b/src/Phalcon/html/helper/AbstractHelper.php
index 24ddf7e6..3e4d856f 100644
--- a/src/Phalcon/html/helper/AbstractHelper.php
+++ b/src/Phalcon/html/helper/AbstractHelper.php
@@ -81,5 +81,4 @@ protected function renderAttributes(array $attributes): string
     protected function selfClose(string $tag, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Anchor.php b/src/Phalcon/html/helper/Anchor.php
index 1d90510a..70ad18aa 100644
--- a/src/Phalcon/html/helper/Anchor.php
+++ b/src/Phalcon/html/helper/Anchor.php
@@ -19,5 +19,4 @@ class Anchor extends AbstractHelper
     public function __invoke(string $href, string $text, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/AnchorRaw.php b/src/Phalcon/html/helper/AnchorRaw.php
index c6a1932b..27555b04 100644
--- a/src/Phalcon/html/helper/AnchorRaw.php
+++ b/src/Phalcon/html/helper/AnchorRaw.php
@@ -19,5 +19,4 @@ class AnchorRaw extends AbstractHelper
     public function __invoke(string $href, string $text, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Body.php b/src/Phalcon/html/helper/Body.php
index de69a86e..9dc0319b 100644
--- a/src/Phalcon/html/helper/Body.php
+++ b/src/Phalcon/html/helper/Body.php
@@ -17,5 +17,4 @@ class Body extends AbstractHelper
     public function __invoke(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Button.php b/src/Phalcon/html/helper/Button.php
index 22406cde..56b8eca9 100644
--- a/src/Phalcon/html/helper/Button.php
+++ b/src/Phalcon/html/helper/Button.php
@@ -18,5 +18,4 @@ class Button extends AbstractHelper
     public function __invoke(string $text, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Close.php b/src/Phalcon/html/helper/Close.php
index ab43610c..5e4d0e78 100644
--- a/src/Phalcon/html/helper/Close.php
+++ b/src/Phalcon/html/helper/Close.php
@@ -18,5 +18,4 @@ class Close extends \Phalcon\Html\Helper\AbstractHelper
     public function __invoke(string $tag): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Element.php b/src/Phalcon/html/helper/Element.php
index 76046df0..92d66641 100644
--- a/src/Phalcon/html/helper/Element.php
+++ b/src/Phalcon/html/helper/Element.php
@@ -19,5 +19,4 @@ class Element extends AbstractHelper
     public function __invoke(string $tag, string $text, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/ElementRaw.php b/src/Phalcon/html/helper/ElementRaw.php
index 2f2c4660..7ca8a390 100644
--- a/src/Phalcon/html/helper/ElementRaw.php
+++ b/src/Phalcon/html/helper/ElementRaw.php
@@ -13,9 +13,9 @@ class ElementRaw extends \Phalcon\Html\Helper\AbstractHelper
 {
 
     /**
-     * @param string $tag        The tag for the anchor
-     * @param string $text       The text for the anchor
-     * @param array  $attributes Any additional attributes
+     * @param string $tag The tag for the anchor
+     * @param string $text The text for the anchor
+     * @param array $attributes Any additional attributes
      *
      * @return string
      * @throws Exception
@@ -23,5 +23,4 @@ class ElementRaw extends \Phalcon\Html\Helper\AbstractHelper
     public function __invoke(string $tag, string $text, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Form.php b/src/Phalcon/html/helper/Form.php
index 54a991f1..341db284 100644
--- a/src/Phalcon/html/helper/Form.php
+++ b/src/Phalcon/html/helper/Form.php
@@ -17,5 +17,4 @@ class Form extends AbstractHelper
     public function __invoke(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Img.php b/src/Phalcon/html/helper/Img.php
index 21521374..1fa5ed79 100644
--- a/src/Phalcon/html/helper/Img.php
+++ b/src/Phalcon/html/helper/Img.php
@@ -14,7 +14,7 @@ class Img extends \Phalcon\Html\Helper\AbstractHelper
 
     /**
      * @param string $src
-     * @param array  $attributes Any additional attributes
+     * @param array $attributes Any additional attributes
      *
      * @return string
      * @throws Exception
@@ -22,5 +22,4 @@ class Img extends \Phalcon\Html\Helper\AbstractHelper
     public function __invoke(string $src, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/Label.php b/src/Phalcon/html/helper/Label.php
index d58997ac..c6b67169 100644
--- a/src/Phalcon/html/helper/Label.php
+++ b/src/Phalcon/html/helper/Label.php
@@ -21,5 +21,4 @@ class Label extends \Phalcon\Html\Helper\AbstractHelper
     public function __invoke(array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/html/helper/TextArea.php b/src/Phalcon/html/helper/TextArea.php
index 8acf5742..ba570df0 100644
--- a/src/Phalcon/html/helper/TextArea.php
+++ b/src/Phalcon/html/helper/TextArea.php
@@ -18,5 +18,4 @@ class TextArea extends AbstractHelper
     public function __invoke(string $text, array $attributes = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/http/Cookie.php b/src/Phalcon/http/Cookie.php
index d739fe0c..bf5ffb55 100644
--- a/src/Phalcon/http/Cookie.php
+++ b/src/Phalcon/http/Cookie.php
@@ -238,10 +238,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 \Phalcon\Http\Cookie\Exception
+     * @see \Phalcon\Security\Random
      */
     public function setSignKey(string $signKey = null): CookieInterface
     {
@@ -270,11 +270,10 @@ public function useEncryption(bool $useEncryption): CookieInterface
     /**
      * Assert the cookie's key is enough long.
      *
-     * @throws \Phalcon\Http\Cookie\Exception
      * @param string $signKey
+     * @throws \Phalcon\Http\Cookie\Exception
      */
     protected function assertSignKeyIsLongEnough(string $signKey)
     {
     }
-
 }
diff --git a/src/Phalcon/http/CookieInterface.php b/src/Phalcon/http/CookieInterface.php
index afbf0c44..8d2386f2 100644
--- a/src/Phalcon/http/CookieInterface.php
+++ b/src/Phalcon/http/CookieInterface.php
@@ -135,5 +135,4 @@ public function setValue($value): CookieInterface;
      * @return CookieInterface
      */
     public function useEncryption(bool $useEncryption): CookieInterface;
-
 }
diff --git a/src/Phalcon/http/Request.php b/src/Phalcon/http/Request.php
index e32b6c38..a8f767ee 100644
--- a/src/Phalcon/http/Request.php
+++ b/src/Phalcon/http/Request.php
@@ -848,5 +848,4 @@ private function getFilterService(): FilterInterface
     private function getServerArray(): array
     {
     }
-
 }
diff --git a/src/Phalcon/http/RequestInterface.php b/src/Phalcon/http/RequestInterface.php
index 38b703ea..d15b3a93 100644
--- a/src/Phalcon/http/RequestInterface.php
+++ b/src/Phalcon/http/RequestInterface.php
@@ -495,5 +495,4 @@ public function isSoap(): bool;
      * @return bool
      */
     public function isTrace(): bool;
-
 }
diff --git a/src/Phalcon/http/Response.php b/src/Phalcon/http/Response.php
index 12dfc8ef..a25698f6 100644
--- a/src/Phalcon/http/Response.php
+++ b/src/Phalcon/http/Response.php
@@ -474,5 +474,4 @@ public function setStatusCode(int $code, string $message = null): ResponseInterf
     public function setRawHeader(string $header): ResponseInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/ResponseInterface.php b/src/Phalcon/http/ResponseInterface.php
index 3506a696..8d6ba4e4 100644
--- a/src/Phalcon/http/ResponseInterface.php
+++ b/src/Phalcon/http/ResponseInterface.php
@@ -184,5 +184,4 @@ public function sendCookies(): ResponseInterface;
      * @return bool|ResponseInterface
      */
     public function sendHeaders();
-
 }
diff --git a/src/Phalcon/http/message/AbstractCommon.php b/src/Phalcon/http/message/AbstractCommon.php
index 9d853ab1..61a4e2a7 100644
--- a/src/Phalcon/http/message/AbstractCommon.php
+++ b/src/Phalcon/http/message/AbstractCommon.php
@@ -11,7 +11,7 @@ abstract class AbstractCommon
     /**
      * Returns a new instance having set the parameter
      *
-     * @param mixed  $element
+     * @param mixed $element
      * @param string $property
      *
      * @return mixed
@@ -33,7 +33,7 @@ final protected function checkStringParameter($element)
      * Checks the element passed; assigns it to the property and returns a
      * clone of the object back
      *
-     * @param mixed  $element
+     * @param mixed $element
      * @param string $property
      *
      * @return mixed
@@ -41,5 +41,4 @@ final protected function checkStringParameter($element)
     final protected function processWith($element, string $property)
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/AbstractMessage.php b/src/Phalcon/http/message/AbstractMessage.php
index b87d0870..861c686d 100644
--- a/src/Phalcon/http/message/AbstractMessage.php
+++ b/src/Phalcon/http/message/AbstractMessage.php
@@ -169,13 +169,13 @@ public function hasHeader($name): bool
      * immutability of the message, and MUST return an instance that has the
      * new header and/or value.
      *
-     * @param string          $name
+     * @param string $name
      * @param string|string[] $value
      *
-     * @return self
      * @param mixed $value
      * @param string|string  [] $value
      *
+     * @return self
      */
     public function withAddedHeader($name, $value)
     {
@@ -211,15 +211,15 @@ public function withBody(\Psr\Http\Message\StreamInterface $body)
      * immutability of the message, and MUST return an instance that has the
      * new and/or updated header and value.
      *
-     * @param string          $name
+     * @param string $name
      * @param string|string[] $value
      *
-     * @return self
-     * @throws InvalidArgumentException for invalid header names or values.
-     *
      * @param mixed $value
      * @param string|string  [] $value
      *
+     * @return self
+     * @throws InvalidArgumentException for invalid header names or values.
+     *
      */
     public function withHeader($name, $value)
     {
@@ -369,7 +369,7 @@ final protected function populateHeaderCollection(array $headers): Collection
      * Set a valid stream
      *
      * @param StreamInterface|resource|string $body
-     * @param string                          $mode
+     * @param string $mode
      *
      * @return StreamInterface
      */
@@ -397,5 +397,4 @@ final protected function processHeaders($headers): Collection
     final protected function processProtocol($protocol = ''): string
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/AbstractRequest.php b/src/Phalcon/http/message/AbstractRequest.php
index b90e6d15..cf69d995 100644
--- a/src/Phalcon/http/message/AbstractRequest.php
+++ b/src/Phalcon/http/message/AbstractRequest.php
@@ -146,7 +146,7 @@ public function withRequestTarget($requestTarget)
      * @see http://tools.ietf.org/html/rfc3986#section-4.3
      *
      * @param UriInterface $uri
-     * @param bool         $preserveHost
+     * @param bool $preserveHost
      *
      * @return object
      */
@@ -175,5 +175,4 @@ final protected function processMethod($method = ''): string
     final protected function processUri($uri): UriInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/Request.php b/src/Phalcon/http/message/Request.php
index 289aabd5..7033576c 100644
--- a/src/Phalcon/http/message/Request.php
+++ b/src/Phalcon/http/message/Request.php
@@ -15,13 +15,12 @@ final class Request extends AbstractRequest implements \Psr\Http\Message\Request
     /**
      * Request constructor.
      *
-     * @param string                          $method
-     * @param UriInterface|string|null        $uri
+     * @param string $method
+     * @param UriInterface|string|null $uri
      * @param StreamInterface|resource|string $body
-     * @param array                           $headers
+     * @param array $headers
      */
     public function __construct(string $method = 'GET', $uri = null, $body = 'php://memory', $headers = array())
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/RequestFactory.php b/src/Phalcon/http/message/RequestFactory.php
index 34305845..f5f626f2 100644
--- a/src/Phalcon/http/message/RequestFactory.php
+++ b/src/Phalcon/http/message/RequestFactory.php
@@ -15,7 +15,7 @@ final class RequestFactory implements \Psr\Http\Message\RequestFactoryInterface
     /**
      * Create a new request.
      *
-     * @param string                   $method
+     * @param string $method
      * @param UriInterface|string|null $uri
      *
      * @return RequestInterface
@@ -23,5 +23,4 @@ final class RequestFactory implements \Psr\Http\Message\RequestFactoryInterface
     public function createRequest(string $method, $uri): RequestInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/Response.php b/src/Phalcon/http/message/Response.php
index 808c760f..c82cf0f7 100644
--- a/src/Phalcon/http/message/Response.php
+++ b/src/Phalcon/http/message/Response.php
@@ -69,8 +69,8 @@ public function getStatusCode(): int
      * Response constructor.
      *
      * @param string $body
-     * @param int    $code
-     * @param array  $headers
+     * @param int $code
+     * @param array $headers
      */
     public function __construct($body = 'php://memory', int $code = 200, array $headers = array())
     {
@@ -91,7 +91,7 @@ public function __construct($body = 'php://memory', int $code = 200, array $head
      * @see http://tools.ietf.org/html/rfc7231#section-6
      * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
      *
-     * @param int    $code
+     * @param int $code
      * @param string $reasonPhrase
      *
      * @return Response
@@ -136,5 +136,4 @@ private function getPhrases(): array
     private function processCode($code, $phrase = '')
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/ResponseFactory.php b/src/Phalcon/http/message/ResponseFactory.php
index 4707ee3e..91b3541a 100644
--- a/src/Phalcon/http/message/ResponseFactory.php
+++ b/src/Phalcon/http/message/ResponseFactory.php
@@ -14,7 +14,7 @@ final class ResponseFactory implements \Psr\Http\Message\ResponseFactoryInterfac
     /**
      * Create a new response.
      *
-     * @param int    $code         The HTTP status code. Defaults to 200.
+     * @param int $code The HTTP status code. Defaults to 200.
      * @param string $reasonPhrase The reason phrase to associate with the status
      *                             code in the generated response. If none is
      *                             provided, implementations MAY use the defaults
@@ -25,5 +25,4 @@ final class ResponseFactory implements \Psr\Http\Message\ResponseFactoryInterfac
     public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/ServerRequest.php b/src/Phalcon/http/message/ServerRequest.php
index 55e7970e..5f62b6e8 100644
--- a/src/Phalcon/http/message/ServerRequest.php
+++ b/src/Phalcon/http/message/ServerRequest.php
@@ -165,16 +165,16 @@ public function getUploadedFiles(): array
     /**
      * ServerRequest constructor.
      *
-     * @param string                   $method
+     * @param string $method
      * @param UriInterface|string|null $uri
-     * @param array                    $serverParams
-     * @param StreamInterface|string   $body
-     * @param array                    $headers
-     * @param array                    $cookies
-     * @param array                    $queryParams
-     * @param array                    $uploadFiles
-     * @param null|array|object        $parsedBody
-     * @param string                   $protocol
+     * @param array $serverParams
+     * @param StreamInterface|string $body
+     * @param array $headers
+     * @param array $cookies
+     * @param array $queryParams
+     * @param array $uploadFiles
+     * @param null|array|object $parsedBody
+     * @param string $protocol
      */
     public function __construct(string $method = 'GET', $uri = null, array $serverParams = array(), $body = 'php://input', $headers = array(), array $cookies = array(), array $queryParams = array(), array $uploadFiles = array(), $parsedBody = null, string $protocol = '1.1')
     {
@@ -190,8 +190,8 @@ public function __construct(string $method = 'GET', $uri = null, array $serverPa
      * This method obviates the need for a hasAttribute() method, as it allows
      * specifying a default value to return if the attribute is not found.
      *
-     * @param string        $name
-     * @param mixed|null    $defaultValue
+     * @param string $name
+     * @param mixed|null $defaultValue
      *
      * @return mixed
      */
@@ -225,7 +225,7 @@ public function getAttributes(): array
      * updated attribute.
      *
      * @param string $name
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @return ServerRequest
      */
@@ -356,5 +356,4 @@ public function withoutAttribute($name): ServerRequest
     private function checkUploadedFiles(array $files)
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/ServerRequestFactory.php b/src/Phalcon/http/message/ServerRequestFactory.php
index 67f6f51f..5bc42c35 100644
--- a/src/Phalcon/http/message/ServerRequestFactory.php
+++ b/src/Phalcon/http/message/ServerRequestFactory.php
@@ -23,14 +23,14 @@ class ServerRequestFactory implements \Psr\Http\Message\ServerRequestFactoryInte
      * no attempt is made to determine the HTTP method or URI, which must be
      * provided explicitly.
      *
-     * @param string              $method       The HTTP method associated with
+     * @param string $method The HTTP method associated with
      *                                          the request.
-     * @param UriInterface|string $uri          The URI associated with the
+     * @param UriInterface|string $uri The URI associated with the
      *                                          request. If the value is a
      *                                          string, the factory MUST create
      *                                          a UriInterface instance based
      *                                          on it.
-     * @param array               $serverParams Array of SAPI parameters with
+     * @param array $serverParams Array of SAPI parameters with
      *                                          which to seed the generated
      *                                          request instance.
      *
@@ -46,11 +46,11 @@ public function createServerRequest(string $method, $uri, array $serverParams =
      * If any argument is not supplied, the corresponding superglobal value will
      * be used.
      *
-     * @param array $server  $_SERVER superglobal
-     * @param array $get     $_GET superglobal
-     * @param array $post    $_POST superglobal
+     * @param array $server $_SERVER superglobal
+     * @param array $get $_GET superglobal
+     * @param array $post $_POST superglobal
      * @param array $cookies $_COOKIE superglobal
-     * @param array $files   $_FILES superglobal
+     * @param array $files $_FILES superglobal
      *
      * @return ServerRequest
      * @see fromServer()
@@ -155,7 +155,7 @@ private function createUploadedFile(array $file): UploadedFile
      * Returns a header
      *
      * @param Collection $headers
-     * @param string     $name
+     * @param string $name
      * @param mixed|null $defaultValue
      *
      * @return mixed|string
@@ -234,5 +234,4 @@ private function parseUploadedFiles(array $files): Collection
     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 67736b60..2a44a4f0 100644
--- a/src/Phalcon/http/message/Stream.php
+++ b/src/Phalcon/http/message/Stream.php
@@ -23,7 +23,7 @@ class Stream implements \Psr\Http\Message\StreamInterface
     /**
      * Stream constructor.
      *
-     * @param mixed  $stream
+     * @param mixed $stream
      * @param string $mode
      */
     public function __construct($stream, string $mode = 'rb')
@@ -175,7 +175,7 @@ public function seek($offset, $whence = 0)
     /**
      * Sets the stream - existing instance
      *
-     * @param mixed  $stream
+     * @param mixed $stream
      * @param string $mode
      */
     public function setStream($stream, string $mode = 'rb')
@@ -229,5 +229,4 @@ private function checkSeekable()
     private function checkWritable()
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/StreamFactory.php b/src/Phalcon/http/message/StreamFactory.php
index 60c8cc2a..ee5921f9 100644
--- a/src/Phalcon/http/message/StreamFactory.php
+++ b/src/Phalcon/http/message/StreamFactory.php
@@ -34,7 +34,7 @@ public function createStream(string $content = ''): StreamInterface
      *
      * @param string $filename The filename or stream URI to use as basis of
      *                         stream.
-     * @param string $mode     The mode with which to open the underlying
+     * @param string $mode The mode with which to open the underlying
      *                         filename/stream.
      *
      * @return StreamInterface
@@ -54,5 +54,4 @@ public function createStreamFromFile(string $filename, string $mode = 'r+b'): St
     public function createStreamFromResource($phpResource): StreamInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/UploadedFile.php b/src/Phalcon/http/message/UploadedFile.php
index b55dd5dc..fa61d185 100644
--- a/src/Phalcon/http/message/UploadedFile.php
+++ b/src/Phalcon/http/message/UploadedFile.php
@@ -156,10 +156,10 @@ public function getSize(): ?int
      * UploadedFile constructor.
      *
      * @param StreamInterface|string|null $stream
-     * @param int|null                    $size
-     * @param int                         $error
-     * @param string|null                 $clientFilename
-     * @param string|null                 $clientMediaType
+     * @param int|null $size
+     * @param int $error
+     * @param string|null $clientFilename
+     * @param string|null $clientMediaType
      */
     public function __construct($stream, int $size = null, int $error = 0, string $clientFilename = null, string $clientMediaType = null)
     {
@@ -235,7 +235,7 @@ private function checkError(int $error)
      * Checks the passed error code and if not in the range throws an exception
      *
      * @param StreamInterface|resource|string $stream
-     * @param int                             $error
+     * @param int $error
      */
     private function checkStream($stream, int $error)
     {
@@ -260,5 +260,4 @@ private function getErrorDescription(int $error): string
     private function storeFile(string $targetPath)
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/UploadedFileFactory.php b/src/Phalcon/http/message/UploadedFileFactory.php
index ab9752fe..fe2c233e 100644
--- a/src/Phalcon/http/message/UploadedFileFactory.php
+++ b/src/Phalcon/http/message/UploadedFileFactory.php
@@ -21,12 +21,12 @@ final class UploadedFileFactory implements \Psr\Http\Message\UploadedFileFactory
      * @link http://php.net/manual/features.file-upload.post-method.php
      * @link http://php.net/manual/features.file-upload.errors.php
      *
-     * @param StreamInterface $stream          The underlying stream representing the
+     * @param StreamInterface $stream The underlying stream representing the
      *                                         uploaded file content.
-     * @param int             $size            The size of the file in bytes.
-     * @param int             $error           The PHP file upload error.
-     * @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.
+     * @param int $size The size of the file in bytes.
+     * @param int $error The PHP file upload error.
+     * @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.
      * @return \Psr\Http\Message\UploadedFileInterface
@@ -34,5 +34,4 @@ final class UploadedFileFactory implements \Psr\Http\Message\UploadedFileFactory
     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 2383c16e..ab67acd2 100644
--- a/src/Phalcon/http/message/Uri.php
+++ b/src/Phalcon/http/message/Uri.php
@@ -317,7 +317,7 @@ public function withScheme($scheme): Uri
     /**
      * Return an instance with the specified user information.
      *
-     * @param string      $user
+     * @param string $user
      * @param string|null $password
      *
      * @return Uri
@@ -465,5 +465,4 @@ private function filterScheme(string $scheme): string
     private function splitQueryValue(string $element): array
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/UriFactory.php b/src/Phalcon/http/message/UriFactory.php
index d42587c7..e3ba04cf 100644
--- a/src/Phalcon/http/message/UriFactory.php
+++ b/src/Phalcon/http/message/UriFactory.php
@@ -21,5 +21,4 @@ final class UriFactory implements \Psr\Http\Message\UriFactoryInterface
     public function createUri(string $uri = ''): UriInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/stream/Input.php b/src/Phalcon/http/message/stream/Input.php
index 209f8511..88c39025 100644
--- a/src/Phalcon/http/message/stream/Input.php
+++ b/src/Phalcon/http/message/stream/Input.php
@@ -52,12 +52,12 @@ public function __toString(): string
     /**
      * Returns the remaining contents in a string
      *
-     * @throws RuntimeException if unable to read.
-     * @throws RuntimeException if error occurs while reading.
-     *
      * @param int $length
      *
      * @return string
+     * @throws RuntimeException if unable to read.
+     * @throws RuntimeException if error occurs while reading.
+     *
      */
     public function getContents(int $length = -1): string
     {
@@ -82,5 +82,4 @@ public function isWritable(): bool
     public function read($length): string
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/stream/Memory.php b/src/Phalcon/http/message/stream/Memory.php
index 42e6f127..f325bf53 100644
--- a/src/Phalcon/http/message/stream/Memory.php
+++ b/src/Phalcon/http/message/stream/Memory.php
@@ -22,5 +22,4 @@ class Memory extends Stream
     public function __construct($mode = 'rb')
     {
     }
-
 }
diff --git a/src/Phalcon/http/message/stream/Temp.php b/src/Phalcon/http/message/stream/Temp.php
index 49c23084..8f9b6650 100644
--- a/src/Phalcon/http/message/stream/Temp.php
+++ b/src/Phalcon/http/message/stream/Temp.php
@@ -22,5 +22,4 @@ class Temp extends Stream
     public function __construct($mode = 'rb')
     {
     }
-
 }
diff --git a/src/Phalcon/http/request/File.php b/src/Phalcon/http/request/File.php
index 7e042032..e3fc6ff0 100644
--- a/src/Phalcon/http/request/File.php
+++ b/src/Phalcon/http/request/File.php
@@ -153,5 +153,4 @@ public function isUploadedFile(): bool
     public function moveTo(string $destination): bool
     {
     }
-
 }
diff --git a/src/Phalcon/http/request/FileInterface.php b/src/Phalcon/http/request/FileInterface.php
index 69f37a10..8353aca4 100644
--- a/src/Phalcon/http/request/FileInterface.php
+++ b/src/Phalcon/http/request/FileInterface.php
@@ -53,5 +53,4 @@ public function getType(): string;
      * @return bool
      */
     public function moveTo(string $destination): bool;
-
 }
diff --git a/src/Phalcon/http/response/Cookies.php b/src/Phalcon/http/response/Cookies.php
index efc67a51..a08fb7e8 100644
--- a/src/Phalcon/http/response/Cookies.php
+++ b/src/Phalcon/http/response/Cookies.php
@@ -191,9 +191,9 @@ public function set(string $name, $value = null, int $expire = 0, string $path =
      *
      * Use NULL to disable cookie signing.
      *
-     * @see \Phalcon\Security\Random
      * @param string $signKey
      * @return \Phalcon\Http\CookieInterface
+     * @see \Phalcon\Security\Random
      */
     public function setSignKey(string $signKey = null): CookieInterface
     {
@@ -208,5 +208,4 @@ public function setSignKey(string $signKey = null): CookieInterface
     public function useEncryption(bool $useEncryption): CookiesInterface
     {
     }
-
 }
diff --git a/src/Phalcon/http/response/CookiesInterface.php b/src/Phalcon/http/response/CookiesInterface.php
index ea1910f3..63093998 100644
--- a/src/Phalcon/http/response/CookiesInterface.php
+++ b/src/Phalcon/http/response/CookiesInterface.php
@@ -79,5 +79,4 @@ public function set(string $name, $value = null, int $expire = 0, string $path =
      * @return CookiesInterface
      */
     public function useEncryption(bool $useEncryption): CookiesInterface;
-
 }
diff --git a/src/Phalcon/http/response/Headers.php b/src/Phalcon/http/response/Headers.php
index abb21da9..47b88b13 100644
--- a/src/Phalcon/http/response/Headers.php
+++ b/src/Phalcon/http/response/Headers.php
@@ -88,5 +88,4 @@ public function setRaw(string $header): HeadersInterface
     public function toArray(): array
     {
     }
-
 }
diff --git a/src/Phalcon/http/response/HeadersInterface.php b/src/Phalcon/http/response/HeadersInterface.php
index a2b439a8..0e178f64 100644
--- a/src/Phalcon/http/response/HeadersInterface.php
+++ b/src/Phalcon/http/response/HeadersInterface.php
@@ -52,5 +52,4 @@ public function set(string $name, string $value);
      * @param string $header
      */
     public function setRaw(string $header);
-
 }
diff --git a/src/Phalcon/http/server/AbstractMiddleware.php b/src/Phalcon/http/server/AbstractMiddleware.php
index d031fdc2..1dd1de4b 100644
--- a/src/Phalcon/http/server/AbstractMiddleware.php
+++ b/src/Phalcon/http/server/AbstractMiddleware.php
@@ -29,5 +29,4 @@ abstract class AbstractMiddleware implements \Psr\Http\Server\MiddlewareInterfac
      * @return \Psr\Http\Message\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 7e4b2131..9d08bce7 100644
--- a/src/Phalcon/http/server/AbstractRequestHandler.php
+++ b/src/Phalcon/http/server/AbstractRequestHandler.php
@@ -24,5 +24,4 @@ abstract class AbstractRequestHandler implements \Psr\Http\Server\RequestHandler
      * @return \Psr\Http\Message\ResponseInterface
      */
     abstract public function handle(\Psr\Http\Message\ServerRequestInterface $request): ResponseInterface;
-
 }
diff --git a/src/Phalcon/image/Enum.php b/src/Phalcon/image/Enum.php
index fcd64fb1..2a1a2ca5 100644
--- a/src/Phalcon/image/Enum.php
+++ b/src/Phalcon/image/Enum.php
@@ -38,6 +38,4 @@ class Enum
 
 
     const VERTICAL = 12;
-
-
 }
diff --git a/src/Phalcon/image/ImageFactory.php b/src/Phalcon/image/ImageFactory.php
index a3b9df97..a1c1fb96 100644
--- a/src/Phalcon/image/ImageFactory.php
+++ b/src/Phalcon/image/ImageFactory.php
@@ -49,5 +49,4 @@ public function newInstance(string $name, string $file, int $width = null, int $
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/image/adapter/AbstractAdapter.php b/src/Phalcon/image/adapter/AbstractAdapter.php
index 5ce3311a..253757e4 100644
--- a/src/Phalcon/image/adapter/AbstractAdapter.php
+++ b/src/Phalcon/image/adapter/AbstractAdapter.php
@@ -12,7 +12,7 @@
 abstract class AbstractAdapter implements \Phalcon\Image\Adapter\AdapterInterface
 {
 
-    static protected $checked = false;
+    protected static $checked = false;
 
 
     protected $file;
@@ -150,8 +150,8 @@ public function flip(int $direction): AdapterInterface
      * This method scales the images using liquid rescaling method. Only support
      * Imagick
      *
-     * @param int $width   new width
-     * @param int $height  new height
+     * @param int $width new width
+     * @param int $height new height
      * @param int $deltaX How much the seam can traverse on x-axis. Passing 0 causes the seams to be straight.
      * @param int $rigidity Introduces a bias for non-straight seams. This parameter is typically 0.
      * @return AbstractAdapter
@@ -274,5 +274,4 @@ public function text(string $text, $offsetX = false, $offsetY = false, int $opac
     public function watermark(AdapterInterface $watermark, int $offsetX = 0, int $offsetY = 0, int $opacity = 100): AdapterInterface
     {
     }
-
 }
diff --git a/src/Phalcon/image/adapter/AdapterInterface.php b/src/Phalcon/image/adapter/AdapterInterface.php
index a938d689..d6c1dd93 100644
--- a/src/Phalcon/image/adapter/AdapterInterface.php
+++ b/src/Phalcon/image/adapter/AdapterInterface.php
@@ -117,5 +117,4 @@ public function text(string $text, int $offsetX = 0, int $offsetY = 0, int $opac
      * @return AdapterInterface
      */
     public function watermark(AdapterInterface $watermark, int $offsetX = 0, int $offsetY = 0, int $opacity = 100): AdapterInterface;
-
 }
diff --git a/src/Phalcon/image/adapter/Gd.php b/src/Phalcon/image/adapter/Gd.php
index a82dd39c..01ed1339 100644
--- a/src/Phalcon/image/adapter/Gd.php
+++ b/src/Phalcon/image/adapter/Gd.php
@@ -13,7 +13,7 @@
 class Gd extends AbstractAdapter
 {
 
-    static protected $checked = false;
+    protected static $checked = false;
 
 
     /**
@@ -171,5 +171,4 @@ protected function processText(string $text, int $offsetX, int $offsetY, int $op
     protected function processWatermark(AdapterInterface $watermark, int $offsetX, int $offsetY, int $opacity)
     {
     }
-
 }
diff --git a/src/Phalcon/image/adapter/Imagick.php b/src/Phalcon/image/adapter/Imagick.php
index 27e65bda..41cf51c9 100644
--- a/src/Phalcon/image/adapter/Imagick.php
+++ b/src/Phalcon/image/adapter/Imagick.php
@@ -21,10 +21,10 @@
 class Imagick extends AbstractAdapter
 {
 
-    static protected $checked = false;
+    protected static $checked = false;
 
 
-    static protected $version = 0;
+    protected static $version = 0;
 
 
     /**
@@ -120,8 +120,8 @@ protected function processFlip(int $direction)
      * This method scales the images using liquid rescaling method. Only support
      * Imagick
      *
-     * @param int $width   new width
-     * @param int $height  new height
+     * @param int $width new width
+     * @param int $height new height
      * @param int $deltaX How much the seam can traverse on x-axis. Passing 0 causes the seams to be straight.
      * @param int $rigidity Introduces a bias for non-straight seams. This parameter is typically 0.
      */
@@ -235,5 +235,4 @@ protected function processText(string $text, $offsetX, $offsetY, int $opacity, i
     protected function processWatermark(AdapterInterface $image, int $offsetX, int $offsetY, int $opacity)
     {
     }
-
 }
diff --git a/src/Phalcon/logger/AdapterFactory.php b/src/Phalcon/logger/AdapterFactory.php
index 4027925b..690af95f 100644
--- a/src/Phalcon/logger/AdapterFactory.php
+++ b/src/Phalcon/logger/AdapterFactory.php
@@ -43,5 +43,4 @@ public function newInstance(string $name, string $fileName, array $options = arr
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/logger/Item.php b/src/Phalcon/logger/Item.php
index 33d11398..0b66a8ff 100644
--- a/src/Phalcon/logger/Item.php
+++ b/src/Phalcon/logger/Item.php
@@ -41,7 +41,6 @@ class Item
     protected $type;
 
 
-
     public function getContext()
     {
     }
@@ -94,5 +93,4 @@ public function getType()
     public function __construct(string $message, string $name, int $type, int $time = 0, $context = array())
     {
     }
-
 }
diff --git a/src/Phalcon/logger/LoggerFactory.php b/src/Phalcon/logger/LoggerFactory.php
index 47b541c8..99c61357 100644
--- a/src/Phalcon/logger/LoggerFactory.php
+++ b/src/Phalcon/logger/LoggerFactory.php
@@ -38,12 +38,11 @@ public function load($config)
      * Returns a Logger object
      *
      * @param string $name
-     * @param array  $adapters
+     * @param array $adapters
      *
      * @return Logger
      */
     public function newInstance(string $name, array $adapters = array()): Logger
     {
     }
-
 }
diff --git a/src/Phalcon/logger/adapter/AbstractAdapter.php b/src/Phalcon/logger/adapter/AbstractAdapter.php
index d9409e48..3fe967ae 100644
--- a/src/Phalcon/logger/adapter/AbstractAdapter.php
+++ b/src/Phalcon/logger/adapter/AbstractAdapter.php
@@ -119,5 +119,4 @@ public function rollback(): 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 ad3c9c30..b93635a8 100644
--- a/src/Phalcon/logger/adapter/AdapterInterface.php
+++ b/src/Phalcon/logger/adapter/AdapterInterface.php
@@ -69,5 +69,4 @@ public function rollback(): AdapterInterface;
      * @return 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 deb3c209..bf2b4978 100644
--- a/src/Phalcon/logger/adapter/Noop.php
+++ b/src/Phalcon/logger/adapter/Noop.php
@@ -36,5 +36,4 @@ public function close(): bool
     public function process(\Phalcon\Logger\Item $item)
     {
     }
-
 }
diff --git a/src/Phalcon/logger/adapter/Stream.php b/src/Phalcon/logger/adapter/Stream.php
index 948c2c85..c61052d7 100644
--- a/src/Phalcon/logger/adapter/Stream.php
+++ b/src/Phalcon/logger/adapter/Stream.php
@@ -84,5 +84,4 @@ public function close(): bool
     public function process(\Phalcon\Logger\Item $item)
     {
     }
-
 }
diff --git a/src/Phalcon/logger/adapter/Syslog.php b/src/Phalcon/logger/adapter/Syslog.php
index eafc5bb7..382cf89e 100644
--- a/src/Phalcon/logger/adapter/Syslog.php
+++ b/src/Phalcon/logger/adapter/Syslog.php
@@ -92,5 +92,4 @@ public function process(\Phalcon\Logger\Item $item)
     private function logLevelToSyslog(string $level): int
     {
     }
-
 }
diff --git a/src/Phalcon/logger/formatter/AbstractFormatter.php b/src/Phalcon/logger/formatter/AbstractFormatter.php
index e302fe8b..5b00a527 100644
--- a/src/Phalcon/logger/formatter/AbstractFormatter.php
+++ b/src/Phalcon/logger/formatter/AbstractFormatter.php
@@ -23,5 +23,4 @@ abstract class AbstractFormatter implements \Phalcon\Logger\Formatter\FormatterI
     public function interpolate(string $message, $context = null)
     {
     }
-
 }
diff --git a/src/Phalcon/logger/formatter/FormatterInterface.php b/src/Phalcon/logger/formatter/FormatterInterface.php
index 0aaf8bd2..bf4239f3 100644
--- a/src/Phalcon/logger/formatter/FormatterInterface.php
+++ b/src/Phalcon/logger/formatter/FormatterInterface.php
@@ -17,5 +17,4 @@ interface FormatterInterface
      * @return string|array
      */
     public function format(\Phalcon\Logger\Item $item);
-
 }
diff --git a/src/Phalcon/logger/formatter/Json.php b/src/Phalcon/logger/formatter/Json.php
index 51ac45ae..18029e00 100644
--- a/src/Phalcon/logger/formatter/Json.php
+++ b/src/Phalcon/logger/formatter/Json.php
@@ -53,5 +53,4 @@ public function __construct(string $dateFormat = 'D, d M y H:i:s O')
     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 d2eeaea4..9f516272 100644
--- a/src/Phalcon/logger/formatter/Line.php
+++ b/src/Phalcon/logger/formatter/Line.php
@@ -81,5 +81,4 @@ public function __construct(string $format = '[%date%][%type%] %message%', strin
     public function format(\Phalcon\Logger\Item $item): string
     {
     }
-
 }
diff --git a/src/Phalcon/logger/formatter/Syslog.php b/src/Phalcon/logger/formatter/Syslog.php
index 71f34d2a..377c89eb 100644
--- a/src/Phalcon/logger/formatter/Syslog.php
+++ b/src/Phalcon/logger/formatter/Syslog.php
@@ -19,5 +19,4 @@ class Syslog extends AbstractFormatter
     public function format(\Phalcon\Logger\Item $item): array
     {
     }
-
 }
diff --git a/src/Phalcon/messages/Message.php b/src/Phalcon/messages/Message.php
index df13faea..7f1ac8b6 100644
--- a/src/Phalcon/messages/Message.php
+++ b/src/Phalcon/messages/Message.php
@@ -150,5 +150,4 @@ public function setMetaData(array $metaData): MessageInterface
     public function setType(string $type): MessageInterface
     {
     }
-
 }
diff --git a/src/Phalcon/messages/MessageInterface.php b/src/Phalcon/messages/MessageInterface.php
index 550abcfa..4eb1cdba 100644
--- a/src/Phalcon/messages/MessageInterface.php
+++ b/src/Phalcon/messages/MessageInterface.php
@@ -91,5 +91,4 @@ public function setMetaData(array $metaData): MessageInterface;
      * @return MessageInterface
      */
     public function setType(string $type): MessageInterface;
-
 }
diff --git a/src/Phalcon/messages/Messages.php b/src/Phalcon/messages/Messages.php
index 014efcae..230bc5af 100644
--- a/src/Phalcon/messages/Messages.php
+++ b/src/Phalcon/messages/Messages.php
@@ -190,5 +190,4 @@ public function rewind()
     public function valid(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/Application.php b/src/Phalcon/mvc/Application.php
index 992b3cf1..a0bb0045 100644
--- a/src/Phalcon/mvc/Application.php
+++ b/src/Phalcon/mvc/Application.php
@@ -102,5 +102,4 @@ public function sendHeadersOnHandleRequest(bool $sendHeaders): Application
     public function useImplicitView(bool $implicitView): Application
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/Controller.php b/src/Phalcon/mvc/Controller.php
index fa83767b..bf38986f 100644
--- a/src/Phalcon/mvc/Controller.php
+++ b/src/Phalcon/mvc/Controller.php
@@ -53,5 +53,4 @@ abstract class Controller extends Injectable implements \Phalcon\Mvc\ControllerI
     final public function __construct()
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/Dispatcher.php b/src/Phalcon/mvc/Dispatcher.php
index fb4b14e8..3d851dec 100644
--- a/src/Phalcon/mvc/Dispatcher.php
+++ b/src/Phalcon/mvc/Dispatcher.php
@@ -206,5 +206,4 @@ protected function handleException(\Exception $exception)
     protected function throwDispatchException(string $message, int $exceptionCode = 0)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/DispatcherInterface.php b/src/Phalcon/mvc/DispatcherInterface.php
index 3019e142..61c4366e 100644
--- a/src/Phalcon/mvc/DispatcherInterface.php
+++ b/src/Phalcon/mvc/DispatcherInterface.php
@@ -51,5 +51,4 @@ public function setControllerName(string $controllerName);
      * @param string $controllerName
      */
     public function setDefaultController(string $controllerName);
-
 }
diff --git a/src/Phalcon/mvc/EntityInterface.php b/src/Phalcon/mvc/EntityInterface.php
index c8eecd35..1d14a5df 100644
--- a/src/Phalcon/mvc/EntityInterface.php
+++ b/src/Phalcon/mvc/EntityInterface.php
@@ -25,5 +25,4 @@ public function readAttribute(string $attribute);
      * @param mixed $value
      */
     public function writeAttribute(string $attribute, $value);
-
 }
diff --git a/src/Phalcon/mvc/Micro.php b/src/Phalcon/mvc/Micro.php
index b03bbd2a..fe66be93 100644
--- a/src/Phalcon/mvc/Micro.php
+++ b/src/Phalcon/mvc/Micro.php
@@ -234,8 +234,8 @@ public function getRouter(): RouterInterface
     /**
      * Obtains a service from the DI
      *
-     * @return object
      * @param string $serviceName
+     * @return object
      */
     public function getService(string $serviceName)
     {
@@ -244,8 +244,8 @@ public function getService(string $serviceName)
     /**
      * Obtains a shared service from the DI
      *
-     * @return mixed
      * @param string $serviceName
+     * @return mixed
      */
     public function getSharedService(string $serviceName)
     {
@@ -479,5 +479,4 @@ public function setService(string $serviceName, $definition, bool $shared = fals
     public function stop()
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/Model.php b/src/Phalcon/mvc/Model.php
index d830dfc8..130ed03a 100644
--- a/src/Phalcon/mvc/Model.php
+++ b/src/Phalcon/mvc/Model.php
@@ -117,7 +117,6 @@ abstract class Model extends AbstractInjectionAware implements \Phalcon\Mvc\Enti
     protected $uniqueTypes;
 
 
-
     public function getTransaction()
     {
     }
@@ -136,10 +135,10 @@ final public function __construct($data = null, \Phalcon\Di\DiInterface $contain
     /**
      * 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 \Phalcon\Mvc\Model\Exception If the method doesn't exist
      */
     public function __call(string $method, array $arguments)
     {
@@ -148,10 +147,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 \Phalcon\Mvc\Model\Exception If the method doesn't exist
      */
     public static function __callStatic(string $method, array $arguments)
     {
@@ -161,8 +160,8 @@ public static function __callStatic(string $method, array $arguments)
      * Magic method to get related records using the relation alias as a
      * property
      *
-     * @return mixed
      * @param string $property
+     * @return mixed
      */
     public function __get(string $property)
     {
@@ -385,9 +384,9 @@ public static function cloneResultMap($base, array $data, $columnMap, int $dirty
      * Returns an hydrated result based on the data and the column map
      *
      * @param array $columnMap
-     * @return mixed
      * @param array $data
      * @param int $hydrationMode
+     * @return mixed
      */
     public static function cloneResultMapHydrate(array $data, $columnMap, int $hydrationMode)
     {
@@ -877,8 +876,8 @@ final public function getReadConnectionService(): string
      * Returns related records based on defined relations
      *
      * @param array $arguments
-     * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|false
      * @param string $alias
+     * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|false
      */
     public function getRelated(string $alias, $arguments = null)
     {
@@ -1496,11 +1495,11 @@ protected static function _groupResult(string $functionName, string $alias, $par
     /**
      * Try to check if the query must invoke a finder
      *
-     * @return \Phalcon\Mvc\ModelInterface[]|\Phalcon\Mvc\ModelInterface|bool
      * @param string $method
      * @param array $arguments
+     * @return \Phalcon\Mvc\ModelInterface[]|\Phalcon\Mvc\ModelInterface|bool
      */
-    protected final static function _invokeFinder(string $method, array $arguments)
+    final protected static function _invokeFinder(string $method, array $arguments)
     {
     }
 
@@ -1554,7 +1553,7 @@ 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 Phalcon\Mvc\ModelInterface[] related
      * @param \Phalcon\Db\Adapter\AdapterInterface $connection
      * @param mixed $related
      * @param Phalcon\Mvc\ModelInterface  [] related
@@ -1941,5 +1940,4 @@ public function validationHasFailed(): bool
     private static function caseInsensitiveColumnMap($columnMap, $key): string
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/ModelInterface.php b/src/Phalcon/mvc/ModelInterface.php
index 36d21548..91ccf067 100644
--- a/src/Phalcon/mvc/ModelInterface.php
+++ b/src/Phalcon/mvc/ModelInterface.php
@@ -58,10 +58,10 @@ public static function cloneResult(ModelInterface $base, array $data, int $dirty
      *
      * @param \Phalcon\Mvc\Model $base
      * @param array $columnMap
-     * @return \Phalcon\Mvc\Model result
      * @param array $data
      * @param int $dirtyState
      * @param bool $keepSnapshots
+     * @return \Phalcon\Mvc\Model result
      */
     public static function cloneResultMap($base, array $data, $columnMap, int $dirtyState = 0, bool $keepSnapshots = null): ModelInterface;
 
@@ -181,8 +181,8 @@ public function getReadConnectionService(): string;
      * Returns related records based on defined relations
      *
      * @param array $arguments
-     * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|false
      * @param string $alias
+     * @return \Phalcon\Mvc\Model\Resultset\Simple|Phalcon\Mvc\Model\Resultset\Simple|false
      */
     public function getRelated(string $alias, $arguments = null);
 
@@ -332,5 +332,4 @@ public function validationHasFailed(): bool;
      * @return bool
      */
     public function update(): bool;
-
 }
diff --git a/src/Phalcon/mvc/ModuleDefinitionInterface.php b/src/Phalcon/mvc/ModuleDefinitionInterface.php
index fe59a300..04605ce1 100644
--- a/src/Phalcon/mvc/ModuleDefinitionInterface.php
+++ b/src/Phalcon/mvc/ModuleDefinitionInterface.php
@@ -23,5 +23,4 @@ public function registerAutoloaders(\Phalcon\Di\DiInterface $container = null);
      * @param \Phalcon\Di\DiInterface $container
      */
     public function registerServices(\Phalcon\Di\DiInterface $container);
-
 }
diff --git a/src/Phalcon/mvc/Router.php b/src/Phalcon/mvc/Router.php
index af0f47dd..6054ff5c 100644
--- a/src/Phalcon/mvc/Router.php
+++ b/src/Phalcon/mvc/Router.php
@@ -103,7 +103,6 @@ class Router extends AbstractInjectionAware implements \Phalcon\Mvc\RouterInterf
     protected $wasMatched = false;
 
 
-
     public function getKeyRouteNames()
     {
     }
@@ -565,5 +564,4 @@ public function setEventsManager(\Phalcon\Events\ManagerInterface $eventsManager
     public function wasMatched(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/RouterInterface.php b/src/Phalcon/mvc/RouterInterface.php
index 3cae5db4..7ab02262 100644
--- a/src/Phalcon/mvc/RouterInterface.php
+++ b/src/Phalcon/mvc/RouterInterface.php
@@ -250,5 +250,4 @@ public function setDefaults(array $defaults): RouterInterface;
      * @return bool
      */
     public function wasMatched(): bool;
-
 }
diff --git a/src/Phalcon/mvc/View.php b/src/Phalcon/mvc/View.php
index 740183b5..ea069d7d 100644
--- a/src/Phalcon/mvc/View.php
+++ b/src/Phalcon/mvc/View.php
@@ -133,7 +133,6 @@ class View extends Injectable implements \Phalcon\Mvc\ViewInterface, \Phalcon\Ev
     protected $viewParams = array();
 
 
-
     public function getCurrentRenderLevel()
     {
     }
@@ -813,5 +812,4 @@ protected function loadTemplateEngines(): array
     public function processRender(string $controllerName, string $actionName, array $params = array(), bool $fireEvents = true): bool
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/ViewBaseInterface.php b/src/Phalcon/mvc/ViewBaseInterface.php
index a88fca68..0495848b 100644
--- a/src/Phalcon/mvc/ViewBaseInterface.php
+++ b/src/Phalcon/mvc/ViewBaseInterface.php
@@ -69,5 +69,4 @@ public function setVar(string $key, $value);
      * @param string $viewsDir
      */
     public function setViewsDir(string $viewsDir);
-
 }
diff --git a/src/Phalcon/mvc/ViewInterface.php b/src/Phalcon/mvc/ViewInterface.php
index c27c5ca3..94305bb5 100644
--- a/src/Phalcon/mvc/ViewInterface.php
+++ b/src/Phalcon/mvc/ViewInterface.php
@@ -195,5 +195,4 @@ public function setTemplateBefore($templateBefore);
      * Starts rendering process enabling the output buffering
      */
     public function start();
-
 }
diff --git a/src/Phalcon/mvc/controller/BindModelInterface.php b/src/Phalcon/mvc/controller/BindModelInterface.php
index 84e98de1..7df463ff 100644
--- a/src/Phalcon/mvc/controller/BindModelInterface.php
+++ b/src/Phalcon/mvc/controller/BindModelInterface.php
@@ -16,5 +16,4 @@ interface BindModelInterface
      * @return string
      */
     public static function getModelName(): string;
-
 }
diff --git a/src/Phalcon/mvc/micro/Collection.php b/src/Phalcon/mvc/micro/Collection.php
index 08aa0968..ff9801d6 100644
--- a/src/Phalcon/mvc/micro/Collection.php
+++ b/src/Phalcon/mvc/micro/Collection.php
@@ -233,5 +233,4 @@ public function setPrefix(string $prefix): CollectionInterface
     protected function addMap($method, string $routePattern, $handler, string $name)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/micro/CollectionInterface.php b/src/Phalcon/mvc/micro/CollectionInterface.php
index 8254ccc9..878f6c72 100644
--- a/src/Phalcon/mvc/micro/CollectionInterface.php
+++ b/src/Phalcon/mvc/micro/CollectionInterface.php
@@ -142,5 +142,4 @@ public function setLazy(bool $lazy): CollectionInterface;
      * @return CollectionInterface
      */
     public function setPrefix(string $prefix): CollectionInterface;
-
 }
diff --git a/src/Phalcon/mvc/micro/LazyLoader.php b/src/Phalcon/mvc/micro/LazyLoader.php
index 30ea8868..ab704b4f 100644
--- a/src/Phalcon/mvc/micro/LazyLoader.php
+++ b/src/Phalcon/mvc/micro/LazyLoader.php
@@ -16,7 +16,6 @@ class LazyLoader
     protected $definition;
 
 
-
     public function getDefinition()
     {
     }
@@ -34,12 +33,11 @@ public function __construct(string $definition)
      * Calling __call method
      *
      * @param array $arguments
-     * @return mixed
      * @param string $method
      * @param \Phalcon\Mvc\Model\BinderInterface $modelBinder
+     * @return mixed
      */
     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 daa73549..e3fe446c 100644
--- a/src/Phalcon/mvc/micro/MiddlewareInterface.php
+++ b/src/Phalcon/mvc/micro/MiddlewareInterface.php
@@ -14,5 +14,4 @@ interface MiddlewareInterface
      * @param \Phalcon\Mvc\Micro $application
      */
     public function call(\Phalcon\Mvc\Micro $application);
-
 }
diff --git a/src/Phalcon/mvc/model/Behavior.php b/src/Phalcon/mvc/model/Behavior.php
index 8540cc60..a22c6289 100644
--- a/src/Phalcon/mvc/model/Behavior.php
+++ b/src/Phalcon/mvc/model/Behavior.php
@@ -27,8 +27,8 @@ public function __construct(array $options = array())
     /**
      * Returns the behavior options related to an event
      *
-     * @return array
      * @param string $eventName
+     * @return array
      */
     protected function getOptions(string $eventName = null)
     {
@@ -64,5 +64,4 @@ protected function mustTakeAction(string $eventName): bool
     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 77ed3cc6..a6a61047 100644
--- a/src/Phalcon/mvc/model/BehaviorInterface.php
+++ b/src/Phalcon/mvc/model/BehaviorInterface.php
@@ -26,5 +26,4 @@ public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $method
      * @param \Phalcon\Mvc\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 5028f77c..243ee36a 100644
--- a/src/Phalcon/mvc/model/Binder.php
+++ b/src/Phalcon/mvc/model/Binder.php
@@ -124,5 +124,4 @@ protected function getParamsFromReflection($handler, array $params, string $cach
     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 a0321410..8ce5d24a 100644
--- a/src/Phalcon/mvc/model/BinderInterface.php
+++ b/src/Phalcon/mvc/model/BinderInterface.php
@@ -44,5 +44,4 @@ public function getCache(): AdapterInterface;
      * @return 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 757aee59..0eebabeb 100644
--- a/src/Phalcon/mvc/model/Criteria.php
+++ b/src/Phalcon/mvc/model/Criteria.php
@@ -528,5 +528,4 @@ public function createBuilder(): BuilderInterface
     public function execute(): ResultsetInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/CriteriaInterface.php b/src/Phalcon/mvc/model/CriteriaInterface.php
index 80a6f15d..09adbbdb 100644
--- a/src/Phalcon/mvc/model/CriteriaInterface.php
+++ b/src/Phalcon/mvc/model/CriteriaInterface.php
@@ -322,5 +322,4 @@ public function sharedLock(bool $sharedLock = true): CriteriaInterface;
      * @return CriteriaInterface
      */
     public function where(string $conditions): CriteriaInterface;
-
 }
diff --git a/src/Phalcon/mvc/model/Manager.php b/src/Phalcon/mvc/model/Manager.php
index d98d4157..99d4af9e 100644
--- a/src/Phalcon/mvc/model/Manager.php
+++ b/src/Phalcon/mvc/model/Manager.php
@@ -625,11 +625,11 @@ 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 \Phalcon\Mvc\Model\RelationInterface $relation
      * @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(\Phalcon\Mvc\Model\RelationInterface $relation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null)
     {
@@ -829,5 +829,4 @@ public function getLastQuery(): QueryInterface
     public function __destruct()
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/ManagerInterface.php b/src/Phalcon/mvc/model/ManagerInterface.php
index f9138275..04b666e8 100644
--- a/src/Phalcon/mvc/model/ManagerInterface.php
+++ b/src/Phalcon/mvc/model/ManagerInterface.php
@@ -145,11 +145,11 @@ public function getBelongsTo(\Phalcon\Mvc\ModelInterface $model): array;
     /**
      * Gets belongsTo related records from a model
      *
-     * @param string            $modelName
-     * @param string            $modelRelation
+     * @param string $modelName
+     * @param string $modelRelation
      * @param array|string|null $parameters
-     * @param ModelInterface    $record
-     * @param string|null       $method
+     * @param ModelInterface $record
+     * @param string|null $method
      * @return bool|ResultsetInterface
      */
     public function getBelongsToRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null);
@@ -165,11 +165,11 @@ public function getHasMany(\Phalcon\Mvc\ModelInterface $model): array;
     /**
      * Gets hasMany related records from a model
      *
-     * @param string            $modelName
-     * @param string            $modelRelation
+     * @param string $modelName
+     * @param string $modelRelation
      * @param array|string|null $parameters
-     * @param ModelInterface    $record
-     * @param string|null       $method
+     * @param ModelInterface $record
+     * @param string|null $method
      * @return bool|ResultsetInterface
      */
     public function getHasManyRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null);
@@ -201,11 +201,11 @@ public function getHasOneAndHasMany(\Phalcon\Mvc\ModelInterface $model): array;
     /**
      * Gets belongsTo related records from a model
      *
-     * @param string            $modelName
-     * @param string            $modelRelation
+     * @param string $modelName
+     * @param string $modelRelation
      * @param array|string|null $parameters
-     * @param ModelInterface    $record
-     * @param string|null       $method
+     * @param ModelInterface $record
+     * @param string|null $method
      * @return bool|\Phalcon\Mvc\ModelInterface
      */
     public function getHasOneRecords(string $modelName, string $modelRelation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null);
@@ -268,11 +268,11 @@ 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 \Phalcon\Mvc\Model\RelationInterface $relation
      * @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(\Phalcon\Mvc\Model\RelationInterface $relation, \Phalcon\Mvc\ModelInterface $record, $parameters = null, string $method = null);
 
@@ -378,9 +378,9 @@ public function keepSnapshots(\Phalcon\Mvc\ModelInterface $model, bool $keepSnap
      * meaning that a least one is implemented
      *
      * @param array $data
-     * @return bool
      * @param \Phalcon\Mvc\ModelInterface $model
      * @param string $eventName
+     * @return bool
      */
     public function missingMethod(\Phalcon\Mvc\ModelInterface $model, string $eventName, $data);
 
@@ -440,5 +440,4 @@ public function setWriteConnectionService(\Phalcon\Mvc\ModelInterface $model, st
      * @param 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 4822a1ec..60d9f426 100644
--- a/src/Phalcon/mvc/model/MetaData.php
+++ b/src/Phalcon/mvc/model/MetaData.php
@@ -621,5 +621,4 @@ final protected function initialize(\Phalcon\Mvc\ModelInterface $model, $key, $t
     private function throwWriteException($option)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/MetaDataInterface.php b/src/Phalcon/mvc/model/MetaDataInterface.php
index eea0df3e..3818ede4 100644
--- a/src/Phalcon/mvc/model/MetaDataInterface.php
+++ b/src/Phalcon/mvc/model/MetaDataInterface.php
@@ -240,5 +240,4 @@ public function setStrategy(\Phalcon\Mvc\Model\MetaData\Strategy\StrategyInterfa
      * @param array $data
      */
     public function write(string $key, array $data);
-
 }
diff --git a/src/Phalcon/mvc/model/Query.php b/src/Phalcon/mvc/model/Query.php
index f0a5b215..bb8ffd26 100644
--- a/src/Phalcon/mvc/model/Query.php
+++ b/src/Phalcon/mvc/model/Query.php
@@ -138,7 +138,7 @@ class Query implements \Phalcon\Mvc\Model\QueryInterface, \Phalcon\Di\InjectionA
     protected $uniqueRow;
 
 
-    static protected $_irPhqlCache;
+    protected static $_irPhqlCache;
 
     /**
      * TransactionInterface so that the query can wrap a transaction
@@ -276,9 +276,9 @@ final protected function _getSelectColumn(array $column): array
     /**
      * Resolves a table in a SELECT statement checking if the model exists
      *
-     * @return string
      * @param \Phalcon\Mvc\Model\ManagerInterface $manager
      * @param array $qualifiedName
+     * @return string
      */
     final protected function _getTable(\Phalcon\Mvc\Model\ManagerInterface $manager, array $qualifiedName)
     {
@@ -504,9 +504,9 @@ final protected function _getRelatedRecords(\Phalcon\Mvc\ModelInterface $model,
     /**
      * Executes a parsed PHQL statement
      *
-     * @return mixed
      * @param array $bindParams
      * @param array $bindTypes
+     * @return mixed
      */
     public function execute(array $bindParams = array(), array $bindTypes = array())
     {
@@ -684,5 +684,4 @@ protected function getWriteConnection(\Phalcon\Mvc\ModelInterface $model, array
     public function setTransaction(\Phalcon\Mvc\Model\TransactionInterface $transaction): QueryInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/QueryInterface.php b/src/Phalcon/mvc/model/QueryInterface.php
index 9ac7210c..83e2d6a6 100644
--- a/src/Phalcon/mvc/model/QueryInterface.php
+++ b/src/Phalcon/mvc/model/QueryInterface.php
@@ -23,9 +23,9 @@ public function cache(array $cacheOptions): QueryInterface;
     /**
      * Executes a parsed PHQL statement
      *
-     * @return mixed
      * @param array $bindParams
      * @param array $bindTypes
+     * @return mixed
      */
     public function execute(array $bindParams = array(), array $bindTypes = array());
 
@@ -114,5 +114,4 @@ public function setSharedLock(bool $sharedLock = false): QueryInterface;
      * @return QueryInterface
      */
     public function setUniqueRow(bool $uniqueRow): QueryInterface;
-
 }
diff --git a/src/Phalcon/mvc/model/Relation.php b/src/Phalcon/mvc/model/Relation.php
index ec914296..655e4598 100644
--- a/src/Phalcon/mvc/model/Relation.php
+++ b/src/Phalcon/mvc/model/Relation.php
@@ -208,5 +208,4 @@ public function isReusable(): bool
     public function setIntermediateRelation($intermediateFields, string $intermediateModel, $intermediateReferencedFields)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/RelationInterface.php b/src/Phalcon/mvc/model/RelationInterface.php
index c3c45f6a..f8c565d0 100644
--- a/src/Phalcon/mvc/model/RelationInterface.php
+++ b/src/Phalcon/mvc/model/RelationInterface.php
@@ -117,5 +117,4 @@ public function isThrough(): bool;
      * @param string $intermediateModel
      */
     public function setIntermediateRelation($intermediateFields, string $intermediateModel, $intermediateReferencedFields);
-
 }
diff --git a/src/Phalcon/mvc/model/ResultInterface.php b/src/Phalcon/mvc/model/ResultInterface.php
index 9ba8f10b..58bdb6d5 100644
--- a/src/Phalcon/mvc/model/ResultInterface.php
+++ b/src/Phalcon/mvc/model/ResultInterface.php
@@ -17,5 +17,4 @@ interface ResultInterface
      * @return bool|\Phalcon\Mvc\ModelInterface
      */
     public function setDirtyState(int $dirtyState);
-
 }
diff --git a/src/Phalcon/mvc/model/Resultset.php b/src/Phalcon/mvc/model/Resultset.php
index c9e8c416..b4e6fbc3 100644
--- a/src/Phalcon/mvc/model/Resultset.php
+++ b/src/Phalcon/mvc/model/Resultset.php
@@ -335,5 +335,4 @@ public function update($data, \Closure $conditionCallback = null): bool
     public function valid(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/ResultsetInterface.php b/src/Phalcon/mvc/model/ResultsetInterface.php
index d9448f08..f95ac27c 100644
--- a/src/Phalcon/mvc/model/ResultsetInterface.php
+++ b/src/Phalcon/mvc/model/ResultsetInterface.php
@@ -120,5 +120,4 @@ public function toArray(): array;
      * @return 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 1d768b98..6c8eae16 100644
--- a/src/Phalcon/mvc/model/Row.php
+++ b/src/Phalcon/mvc/model/Row.php
@@ -66,8 +66,8 @@ public function offsetUnset($offset)
      * echo $robot->readAttribute("name");
      * ```
      *
-     * @return mixed
      * @param string $attribute
+     * @return mixed
      */
     public function readAttribute(string $attribute)
     {
@@ -105,5 +105,4 @@ public function toArray(): array
     public function writeAttribute(string $attribute, $value)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/Transaction.php b/src/Phalcon/mvc/model/Transaction.php
index 2b1b124c..4ab0dc7d 100644
--- a/src/Phalcon/mvc/model/Transaction.php
+++ b/src/Phalcon/mvc/model/Transaction.php
@@ -194,5 +194,4 @@ public function setTransactionManager(\Phalcon\Mvc\Model\Transaction\ManagerInte
     public function throwRollbackException(bool $status): TransactionInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/TransactionInterface.php b/src/Phalcon/mvc/model/TransactionInterface.php
index da437029..2499aebe 100644
--- a/src/Phalcon/mvc/model/TransactionInterface.php
+++ b/src/Phalcon/mvc/model/TransactionInterface.php
@@ -96,5 +96,4 @@ public function setTransactionManager(\Phalcon\Mvc\Model\Transaction\ManagerInte
      * @return TransactionInterface
      */
     public function throwRollbackException(bool $status): TransactionInterface;
-
 }
diff --git a/src/Phalcon/mvc/model/ValidationFailed.php b/src/Phalcon/mvc/model/ValidationFailed.php
index 2c4348fa..200baf2c 100644
--- a/src/Phalcon/mvc/model/ValidationFailed.php
+++ b/src/Phalcon/mvc/model/ValidationFailed.php
@@ -48,5 +48,4 @@ public function getMessages(): array
     public function getModel(): ModelInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/behavior/SoftDelete.php b/src/Phalcon/mvc/model/behavior/SoftDelete.php
index 4a75fb86..53c93099 100644
--- a/src/Phalcon/mvc/model/behavior/SoftDelete.php
+++ b/src/Phalcon/mvc/model/behavior/SoftDelete.php
@@ -22,5 +22,4 @@ class SoftDelete extends Behavior
     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 14bb9034..e6eb4f72 100644
--- a/src/Phalcon/mvc/model/behavior/Timestampable.php
+++ b/src/Phalcon/mvc/model/behavior/Timestampable.php
@@ -29,5 +29,4 @@ public function notify(string $type, \Phalcon\Mvc\ModelInterface $model)
     private function getTimestamp(array $options)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/binder/BindableInterface.php b/src/Phalcon/mvc/model/binder/BindableInterface.php
index 48208879..d0b643e6 100644
--- a/src/Phalcon/mvc/model/binder/BindableInterface.php
+++ b/src/Phalcon/mvc/model/binder/BindableInterface.php
@@ -17,5 +17,4 @@ interface BindableInterface
      * @return string|array
      */
     public function getModelName();
-
 }
diff --git a/src/Phalcon/mvc/model/metadata/Apcu.php b/src/Phalcon/mvc/model/metadata/Apcu.php
index afadb39b..612da494 100644
--- a/src/Phalcon/mvc/model/metadata/Apcu.php
+++ b/src/Phalcon/mvc/model/metadata/Apcu.php
@@ -34,5 +34,4 @@ class Apcu extends MetaData
     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 9117318d..fcd40dc2 100644
--- a/src/Phalcon/mvc/model/metadata/Libmemcached.php
+++ b/src/Phalcon/mvc/model/metadata/Libmemcached.php
@@ -30,5 +30,4 @@ public function __construct(\Phalcon\Cache\AdapterFactory $factory, array $optio
     public function reset()
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/metadata/Memory.php b/src/Phalcon/mvc/model/metadata/Memory.php
index b6f86087..456302dd 100644
--- a/src/Phalcon/mvc/model/metadata/Memory.php
+++ b/src/Phalcon/mvc/model/metadata/Memory.php
@@ -40,5 +40,4 @@ public function read(string $key): ?array
     public function write(string $key, array $data)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/metadata/Redis.php b/src/Phalcon/mvc/model/metadata/Redis.php
index a8139c10..0a72aa37 100644
--- a/src/Phalcon/mvc/model/metadata/Redis.php
+++ b/src/Phalcon/mvc/model/metadata/Redis.php
@@ -44,5 +44,4 @@ public function __construct(\Phalcon\Cache\AdapterFactory $factory, array $optio
     public function reset()
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/metadata/Stream.php b/src/Phalcon/mvc/model/metadata/Stream.php
index 0db905df..97092b45 100644
--- a/src/Phalcon/mvc/model/metadata/Stream.php
+++ b/src/Phalcon/mvc/model/metadata/Stream.php
@@ -60,5 +60,4 @@ public function write(string $key, array $data)
     private function throwWriteException($option)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/metadata/strategy/Annotations.php b/src/Phalcon/mvc/model/metadata/strategy/Annotations.php
index 47b0bd5a..8b941252 100644
--- a/src/Phalcon/mvc/model/metadata/strategy/Annotations.php
+++ b/src/Phalcon/mvc/model/metadata/strategy/Annotations.php
@@ -34,5 +34,4 @@ final public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon
     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 a5800990..d1974e36 100644
--- a/src/Phalcon/mvc/model/metadata/strategy/Introspection.php
+++ b/src/Phalcon/mvc/model/metadata/strategy/Introspection.php
@@ -31,5 +31,4 @@ final public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon
     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 1be70b21..57a22db3 100644
--- a/src/Phalcon/mvc/model/metadata/strategy/StrategyInterface.php
+++ b/src/Phalcon/mvc/model/metadata/strategy/StrategyInterface.php
@@ -16,10 +16,10 @@ interface StrategyInterface
     /**
      * Read the model's column map, this can't be inferred
      *
-     * @todo Not implemented
      * @param \Phalcon\Mvc\ModelInterface $model
      * @param \Phalcon\Di\DiInterface $container
      * @return array
+     * @todo Not implemented
      */
     public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array;
 
@@ -31,5 +31,4 @@ public function getColumnMaps(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\Di
      * @return array
      */
     public function getMetaData(\Phalcon\Mvc\ModelInterface $model, \Phalcon\Di\DiInterface $container): array;
-
 }
diff --git a/src/Phalcon/mvc/model/query/Builder.php b/src/Phalcon/mvc/model/query/Builder.php
index b32077d7..6fec223c 100644
--- a/src/Phalcon/mvc/model/query/Builder.php
+++ b/src/Phalcon/mvc/model/query/Builder.php
@@ -909,5 +909,4 @@ protected function conditionNotBetween(string $clause, string $operator, string
     protected function conditionNotIn(string $clause, string $operator, string $expr, array $values): BuilderInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/query/BuilderInterface.php b/src/Phalcon/mvc/model/query/BuilderInterface.php
index a7a307bb..1b77025f 100644
--- a/src/Phalcon/mvc/model/query/BuilderInterface.php
+++ b/src/Phalcon/mvc/model/query/BuilderInterface.php
@@ -343,5 +343,4 @@ public function setBindTypes(array $bindTypes, bool $merge = false): BuilderInte
      * @return BuilderInterface
      */
     public function where(string $conditions, array $bindParams = array(), array $bindTypes = array()): BuilderInterface;
-
 }
diff --git a/src/Phalcon/mvc/model/query/Lang.php b/src/Phalcon/mvc/model/query/Lang.php
index 6e5f1ed7..4f574562 100644
--- a/src/Phalcon/mvc/model/query/Lang.php
+++ b/src/Phalcon/mvc/model/query/Lang.php
@@ -35,5 +35,4 @@ abstract class Lang
     public static function parsePHQL(string $phql): array
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/query/Status.php b/src/Phalcon/mvc/model/query/Status.php
index 60fb2039..027decdf 100644
--- a/src/Phalcon/mvc/model/query/Status.php
+++ b/src/Phalcon/mvc/model/query/Status.php
@@ -76,5 +76,4 @@ public function getModel(): ModelInterface
     public function success(): bool
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/query/StatusInterface.php b/src/Phalcon/mvc/model/query/StatusInterface.php
index fcea5a8b..a333a915 100644
--- a/src/Phalcon/mvc/model/query/StatusInterface.php
+++ b/src/Phalcon/mvc/model/query/StatusInterface.php
@@ -32,5 +32,4 @@ public function getModel(): ModelInterface;
      * @return bool
      */
     public function success(): bool;
-
 }
diff --git a/src/Phalcon/mvc/model/resultset/Complex.php b/src/Phalcon/mvc/model/resultset/Complex.php
index 40da46b1..cc90a156 100644
--- a/src/Phalcon/mvc/model/resultset/Complex.php
+++ b/src/Phalcon/mvc/model/resultset/Complex.php
@@ -69,5 +69,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/resultset/Simple.php b/src/Phalcon/mvc/model/resultset/Simple.php
index eafacb10..1cd3e083 100644
--- a/src/Phalcon/mvc/model/resultset/Simple.php
+++ b/src/Phalcon/mvc/model/resultset/Simple.php
@@ -78,5 +78,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/transaction/Failed.php b/src/Phalcon/mvc/model/transaction/Failed.php
index f58e2159..21c32947 100644
--- a/src/Phalcon/mvc/model/transaction/Failed.php
+++ b/src/Phalcon/mvc/model/transaction/Failed.php
@@ -42,5 +42,4 @@ public function getRecord(): ModelInterface
     public function getRecordMessages(): array
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/model/transaction/Manager.php b/src/Phalcon/mvc/model/transaction/Manager.php
index 80b26ac7..70953823 100644
--- a/src/Phalcon/mvc/model/transaction/Manager.php
+++ b/src/Phalcon/mvc/model/transaction/Manager.php
@@ -229,5 +229,4 @@ public function setRollbackPendent(bool $rollbackPendent): ManagerInterface
     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 f081fefa..fc07bdbc 100644
--- a/src/Phalcon/mvc/model/transaction/ManagerInterface.php
+++ b/src/Phalcon/mvc/model/transaction/ManagerInterface.php
@@ -93,5 +93,4 @@ public function setDbService(string $service): ManagerInterface;
      * @return ManagerInterface
      */
     public function setRollbackPendent(bool $rollbackPendent): ManagerInterface;
-
 }
diff --git a/src/Phalcon/mvc/router/Annotations.php b/src/Phalcon/mvc/router/Annotations.php
index 3c939af1..565a5564 100644
--- a/src/Phalcon/mvc/router/Annotations.php
+++ b/src/Phalcon/mvc/router/Annotations.php
@@ -125,5 +125,4 @@ public function setActionSuffix(string $actionSuffix)
     public function setControllerSuffix(string $controllerSuffix)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/router/Group.php b/src/Phalcon/mvc/router/Group.php
index 4b8cf75b..b1a49f19 100644
--- a/src/Phalcon/mvc/router/Group.php
+++ b/src/Phalcon/mvc/router/Group.php
@@ -308,5 +308,4 @@ public function setPrefix(string $prefix): GroupInterface
     protected function addRoute(string $pattern, $paths = null, $httpMethods = null): RouteInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/router/GroupInterface.php b/src/Phalcon/mvc/router/GroupInterface.php
index 33d59115..c504e20c 100644
--- a/src/Phalcon/mvc/router/GroupInterface.php
+++ b/src/Phalcon/mvc/router/GroupInterface.php
@@ -228,5 +228,4 @@ public function setPaths($paths): GroupInterface;
      * @return GroupInterface
      */
     public function setPrefix(string $prefix): GroupInterface;
-
 }
diff --git a/src/Phalcon/mvc/router/Route.php b/src/Phalcon/mvc/router/Route.php
index b47b0db0..7eb8bf76 100644
--- a/src/Phalcon/mvc/router/Route.php
+++ b/src/Phalcon/mvc/router/Route.php
@@ -43,8 +43,7 @@ class Route implements \Phalcon\Mvc\Router\RouteInterface
     protected $pattern;
 
 
-    static protected $uniqueId = 0;
-
+    protected static $uniqueId = 0;
 
 
     public function getId()
@@ -364,5 +363,4 @@ public function setName(string $name): RouteInterface
     public function via($httpMethods): RouteInterface
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/router/RouteInterface.php b/src/Phalcon/mvc/router/RouteInterface.php
index 0baf83d1..39e2d5cf 100644
--- a/src/Phalcon/mvc/router/RouteInterface.php
+++ b/src/Phalcon/mvc/router/RouteInterface.php
@@ -127,5 +127,4 @@ public static function reset();
      * @return RouteInterface
      */
     public function via($httpMethods): RouteInterface;
-
 }
diff --git a/src/Phalcon/mvc/view/Simple.php b/src/Phalcon/mvc/view/Simple.php
index c5d8ab5c..9a93d03b 100644
--- a/src/Phalcon/mvc/view/Simple.php
+++ b/src/Phalcon/mvc/view/Simple.php
@@ -320,5 +320,4 @@ protected function loadTemplateEngines(): array
     final protected function internalRender(string $path, $params)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/view/engine/AbstractEngine.php b/src/Phalcon/mvc/view/engine/AbstractEngine.php
index dadd9bab..b67caa74 100644
--- a/src/Phalcon/mvc/view/engine/AbstractEngine.php
+++ b/src/Phalcon/mvc/view/engine/AbstractEngine.php
@@ -52,5 +52,4 @@ public function getView(): ViewBaseInterface
     public function partial(string $partialPath, $params = null)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/view/engine/EngineInterface.php b/src/Phalcon/mvc/view/engine/EngineInterface.php
index 28526844..7f0d981f 100644
--- a/src/Phalcon/mvc/view/engine/EngineInterface.php
+++ b/src/Phalcon/mvc/view/engine/EngineInterface.php
@@ -31,5 +31,4 @@ public function partial(string $partialPath, $params = null);
      * @param bool $mustClean
      */
     public function render(string $path, $params, bool $mustClean = false);
-
 }
diff --git a/src/Phalcon/mvc/view/engine/Php.php b/src/Phalcon/mvc/view/engine/Php.php
index f1eb2e5f..0e6d1a5a 100644
--- a/src/Phalcon/mvc/view/engine/Php.php
+++ b/src/Phalcon/mvc/view/engine/Php.php
@@ -18,5 +18,4 @@ class Php extends AbstractEngine
     public function render(string $path, $params, bool $mustClean = false)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/view/engine/Volt.php b/src/Phalcon/mvc/view/engine/Volt.php
index f02f178c..d4e83800 100644
--- a/src/Phalcon/mvc/view/engine/Volt.php
+++ b/src/Phalcon/mvc/view/engine/Volt.php
@@ -143,5 +143,4 @@ public function slice($value, int $start = 0, $end = null)
     public function sort(array $value): array
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/view/engine/volt/Compiler.php b/src/Phalcon/mvc/view/engine/volt/Compiler.php
index 15bb2038..8c89fc49 100644
--- a/src/Phalcon/mvc/view/engine/volt/Compiler.php
+++ b/src/Phalcon/mvc/view/engine/volt/Compiler.php
@@ -232,10 +232,10 @@ public function compileElseIf(array $statement): string
      * );
      * ```
      *
-     * @return string|array
      * @param string $path
      * @param string $compiledPath
      * @param bool $extendsMode
+     * @return string|array
      */
     public function compileFile(string $path, string $compiledPath, bool $extendsMode = false)
     {
@@ -353,8 +353,8 @@ final public function expression(array $expr): string
      * Fires an event to registered extensions
      *
      * @param array $arguments
-     * @return mixed
      * @param string $name
+     * @return mixed
      */
     final public function fireExtensionEvent(string $name, $arguments = null)
     {
@@ -418,8 +418,8 @@ public function getFunctions(): array
     /**
      * Returns a compiler's option
      *
-     * @return string
      * @param string $option
+     * @return string
      */
     public function getOption(string $option)
     {
@@ -462,8 +462,8 @@ public function getUniquePrefix(): string
      * );
      * ```
      *
-     * @return array
      * @param string $viewCode
+     * @return array
      */
     public function parse(string $viewCode)
     {
@@ -569,5 +569,4 @@ final protected function statementList(array $statements, bool $extendsMode = fa
     final protected function statementListOrExtends($statements)
     {
     }
-
 }
diff --git a/src/Phalcon/mvc/view/engine/volt/Exception.php b/src/Phalcon/mvc/view/engine/volt/Exception.php
index efc6bc20..915f73b0 100644
--- a/src/Phalcon/mvc/view/engine/volt/Exception.php
+++ b/src/Phalcon/mvc/view/engine/volt/Exception.php
@@ -31,5 +31,4 @@ public function __construct(string $message = '', array $statement = array(), in
     public function getStatement(): array
     {
     }
-
 }
diff --git a/src/Phalcon/paginator/PaginatorFactory.php b/src/Phalcon/paginator/PaginatorFactory.php
index fa63b1a2..598bfcd6 100644
--- a/src/Phalcon/paginator/PaginatorFactory.php
+++ b/src/Phalcon/paginator/PaginatorFactory.php
@@ -72,5 +72,4 @@ public function newInstance(string $name, array $options = array()): AdapterInte
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/paginator/Repository.php b/src/Phalcon/paginator/Repository.php
index 323eb2c8..14a0eadf 100644
--- a/src/Phalcon/paginator/Repository.php
+++ b/src/Phalcon/paginator/Repository.php
@@ -160,5 +160,4 @@ protected function getProperty(string $property, $defaultValue = null)
     protected function getRealNameProperty(string $property): string
     {
     }
-
 }
diff --git a/src/Phalcon/paginator/RepositoryInterface.php b/src/Phalcon/paginator/RepositoryInterface.php
index 94b41503..7eeac3db 100644
--- a/src/Phalcon/paginator/RepositoryInterface.php
+++ b/src/Phalcon/paginator/RepositoryInterface.php
@@ -113,5 +113,4 @@ public function setAliases(array $aliases): RepositoryInterface;
      * @return RepositoryInterface
      */
     public function setProperties(array $properties): RepositoryInterface;
-
 }
diff --git a/src/Phalcon/paginator/adapter/AbstractAdapter.php b/src/Phalcon/paginator/adapter/AbstractAdapter.php
index 29eae036..6dfb374e 100644
--- a/src/Phalcon/paginator/adapter/AbstractAdapter.php
+++ b/src/Phalcon/paginator/adapter/AbstractAdapter.php
@@ -89,5 +89,4 @@ public function setRepository(\Phalcon\Paginator\RepositoryInterface $repository
     protected function getRepository(array $properties = null): RepositoryInterface
     {
     }
-
 }
diff --git a/src/Phalcon/paginator/adapter/AdapterInterface.php b/src/Phalcon/paginator/adapter/AdapterInterface.php
index 73410d01..b577dc1e 100644
--- a/src/Phalcon/paginator/adapter/AdapterInterface.php
+++ b/src/Phalcon/paginator/adapter/AdapterInterface.php
@@ -39,5 +39,4 @@ public function setCurrentPage(int $page);
      * @param int $limit
      */
     public function setLimit(int $limit);
-
 }
diff --git a/src/Phalcon/paginator/adapter/Model.php b/src/Phalcon/paginator/adapter/Model.php
index d829cdf3..0b51d673 100644
--- a/src/Phalcon/paginator/adapter/Model.php
+++ b/src/Phalcon/paginator/adapter/Model.php
@@ -35,5 +35,4 @@ class Model extends AbstractAdapter
     public function paginate(): RepositoryInterface
     {
     }
-
 }
diff --git a/src/Phalcon/paginator/adapter/NativeArray.php b/src/Phalcon/paginator/adapter/NativeArray.php
index 4efd8617..b3e7fe96 100644
--- a/src/Phalcon/paginator/adapter/NativeArray.php
+++ b/src/Phalcon/paginator/adapter/NativeArray.php
@@ -38,5 +38,4 @@ class NativeArray extends AbstractAdapter
     public function paginate(): RepositoryInterface
     {
     }
-
 }
diff --git a/src/Phalcon/paginator/adapter/QueryBuilder.php b/src/Phalcon/paginator/adapter/QueryBuilder.php
index 7c6a7ac0..9d95c134 100644
--- a/src/Phalcon/paginator/adapter/QueryBuilder.php
+++ b/src/Phalcon/paginator/adapter/QueryBuilder.php
@@ -85,5 +85,4 @@ public function paginate(): RepositoryInterface
     public function setQueryBuilder(\Phalcon\Mvc\Model\Query\Builder $builder): QueryBuilder
     {
     }
-
 }
diff --git a/src/Phalcon/security/Random.php b/src/Phalcon/security/Random.php
index c7c782b3..08449196 100644
--- a/src/Phalcon/security/Random.php
+++ b/src/Phalcon/security/Random.php
@@ -86,11 +86,11 @@ class Random
      * echo $random->base58(); // 4kUgL2pdQMSCQtjE
      * ```
      *
-     * @see    \Phalcon\Security\Random:base64
-     * @link   https://en.wikipedia.org/wiki/Base58
-     * @throws Exception If secure random number generator is not available or unexpected partial read
      * @param int $len
      * @return string
+     * @throws Exception If secure random number generator is not available or unexpected partial read
+     * @link   https://en.wikipedia.org/wiki/Base58
+     * @see    \Phalcon\Security\Random:base64
      */
     public function base58(int $len = null): string
     {
@@ -112,10 +112,10 @@ public function base58(int $len = null): string
      * echo $random->base62(); // z0RkwHfh8ErDM1xw
      * ```
      *
-     * @see    \Phalcon\Security\Random:base58
-     * @throws Exception If secure random number generator is not available or unexpected partial read
      * @param int $len
      * @return string
+     * @throws Exception If secure random number generator is not available or unexpected partial read
+     * @see    \Phalcon\Security\Random:base58
      */
     public function base62(int $len = null): string
     {
@@ -134,9 +134,9 @@ public function base62(int $len = null): string
      * echo $random->base64(12); // 3rcq39QzGK9fUqh8
      * ```
      *
-     * @throws Exception If secure random number generator is not available or unexpected partial read
      * @param int $len
      * @return string
+     * @throws Exception If secure random number generator is not available or unexpected partial read
      */
     public function base64(int $len = null): string
     {
@@ -186,9 +186,9 @@ public function base64Safe(int $len = null, bool $padding = false): string
      * // Possible output: string(32) "00f6c04b144b41fad6a59111c126e1ee"
      * ```
      *
-     * @throws Exception If secure random number generator is not available or unexpected partial read
      * @param int $len
      * @return string
+     * @throws Exception If secure random number generator is not available or unexpected partial read
      */
     public function bytes(int $len = 16): string
     {
@@ -206,9 +206,9 @@ public function bytes(int $len = 16): string
      * echo $random->hex(10); // a29f470508d5ccb8e289
      * ```
      *
-     * @throws Exception If secure random number generator is not available or unexpected partial read
      * @param int $len
      * @return string
+     * @throws Exception If secure random number generator is not available or unexpected partial read
      */
     public function hex(int $len = null): string
     {
@@ -225,9 +225,9 @@ public function hex(int $len = null): string
      * echo $random->number(16); // 8
      * ```
      *
-     * @throws Exception If secure random number generator is not available, unexpected partial read or $len <= 0
      * @param int $len
      * @return int
+     * @throws Exception If secure random number generator is not available, unexpected partial read or $len <= 0
      */
     public function number(int $len): int
     {
@@ -266,14 +266,13 @@ public function uuid(): string
      *
      * If $n is not specified, 16 is assumed. It may be larger in future.
      *
-     * @throws Exception If secure random number generator is not available or unexpected partial read
      * @param string $alphabet
      * @param int $base
      * @param mixed $n
      * @return string
+     * @throws Exception If secure random number generator is not available or unexpected partial read
      */
     protected function base(string $alphabet, int $base, $n = null): string
     {
     }
-
 }
diff --git a/src/Phalcon/session/Bag.php b/src/Phalcon/session/Bag.php
index dde60d01..14ae6175 100644
--- a/src/Phalcon/session/Bag.php
+++ b/src/Phalcon/session/Bag.php
@@ -92,5 +92,4 @@ public function set(string $element, $value)
     public function setDI(\Phalcon\Di\DiInterface $container)
     {
     }
-
 }
diff --git a/src/Phalcon/session/Manager.php b/src/Phalcon/session/Manager.php
index a844db65..83df12cc 100644
--- a/src/Phalcon/session/Manager.php
+++ b/src/Phalcon/session/Manager.php
@@ -210,9 +210,9 @@ public function setId(string $id): ManagerInterface
      * and do not allow poop names
      *
      * @param string $name *
+     * @return Manager
      * @throws InvalidArgumentException
      *
-     * @return Manager
      */
     public function setName(string $name): ManagerInterface
     {
@@ -255,5 +255,4 @@ public function status(): int
     private function getUniqueKey(string $key): string
     {
     }
-
 }
diff --git a/src/Phalcon/session/ManagerInterface.php b/src/Phalcon/session/ManagerInterface.php
index c654990e..2d0e35b5 100644
--- a/src/Phalcon/session/ManagerInterface.php
+++ b/src/Phalcon/session/ManagerInterface.php
@@ -146,9 +146,9 @@ public function setId(string $id): ManagerInterface;
      * Set the session name. Throw exception if the session has started
      * and do not allow poop names
      *
-     * @throws InvalidArgumentException
      * @param string $name
      * @return ManagerInterface
+     * @throws InvalidArgumentException
      */
     public function setName(string $name): ManagerInterface;
 
@@ -181,5 +181,4 @@ public function start(): bool;
      * @return ManagerInterface
      */
     public function regenerateId($deleteOldSession = true): ManagerInterface;
-
 }
diff --git a/src/Phalcon/session/adapter/AbstractAdapter.php b/src/Phalcon/session/adapter/AbstractAdapter.php
index 9360162f..7b73851e 100644
--- a/src/Phalcon/session/adapter/AbstractAdapter.php
+++ b/src/Phalcon/session/adapter/AbstractAdapter.php
@@ -80,5 +80,4 @@ public function open($savePath, $sessionName): bool
     public function write($id, $data): bool
     {
     }
-
 }
diff --git a/src/Phalcon/session/adapter/Libmemcached.php b/src/Phalcon/session/adapter/Libmemcached.php
index 87c51ebf..7ebded2f 100644
--- a/src/Phalcon/session/adapter/Libmemcached.php
+++ b/src/Phalcon/session/adapter/Libmemcached.php
@@ -17,5 +17,4 @@ class Libmemcached extends AbstractAdapter
     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 39f90f92..d324e104 100644
--- a/src/Phalcon/session/adapter/Noop.php
+++ b/src/Phalcon/session/adapter/Noop.php
@@ -126,5 +126,4 @@ public function write($id, $data): bool
     protected function getPrefixedName($name): string
     {
     }
-
 }
diff --git a/src/Phalcon/session/adapter/Redis.php b/src/Phalcon/session/adapter/Redis.php
index 15dbcbb0..12df0d78 100644
--- a/src/Phalcon/session/adapter/Redis.php
+++ b/src/Phalcon/session/adapter/Redis.php
@@ -17,5 +17,4 @@ class Redis extends AbstractAdapter
     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 b7e68132..8ab1e0bf 100644
--- a/src/Phalcon/session/adapter/Stream.php
+++ b/src/Phalcon/session/adapter/Stream.php
@@ -56,9 +56,9 @@ public function gc($maxlifetime): bool
     /**
      * Ignore the savePath and use local defined path
      *
-     * @return bool
      * @param mixed $savePath
      * @param mixed $sessionName
+     * @return bool
      */
     public function open($savePath, $sessionName): bool
     {
@@ -80,5 +80,4 @@ public function read($id): string
     public function write($id, $data): bool
     {
     }
-
 }
diff --git a/src/Phalcon/storage/AdapterFactory.php b/src/Phalcon/storage/AdapterFactory.php
index 2a4c9420..dd7887d1 100644
--- a/src/Phalcon/storage/AdapterFactory.php
+++ b/src/Phalcon/storage/AdapterFactory.php
@@ -48,5 +48,4 @@ public function newInstance(string $name, array $options = array()): AdapterInte
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/storage/SerializerFactory.php b/src/Phalcon/storage/SerializerFactory.php
index f9705f0d..a2d1ccd9 100644
--- a/src/Phalcon/storage/SerializerFactory.php
+++ b/src/Phalcon/storage/SerializerFactory.php
@@ -40,5 +40,4 @@ public function newInstance(string $name): SerializerInterface
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/storage/adapter/AbstractAdapter.php b/src/Phalcon/storage/adapter/AbstractAdapter.php
index 3f8a3d98..94256425 100644
--- a/src/Phalcon/storage/adapter/AbstractAdapter.php
+++ b/src/Phalcon/storage/adapter/AbstractAdapter.php
@@ -213,5 +213,4 @@ protected function getUnserializedData($content, $defaultValue = null)
     protected function initSerializer()
     {
     }
-
 }
diff --git a/src/Phalcon/storage/adapter/AdapterInterface.php b/src/Phalcon/storage/adapter/AdapterInterface.php
index a7f35523..5e182da4 100644
--- a/src/Phalcon/storage/adapter/AdapterInterface.php
+++ b/src/Phalcon/storage/adapter/AdapterInterface.php
@@ -88,5 +88,4 @@ public function increment(string $key, int $value = 1);
      * @return bool
      */
     public function set(string $key, $value, $ttl = null): bool;
-
 }
diff --git a/src/Phalcon/storage/adapter/Apcu.php b/src/Phalcon/storage/adapter/Apcu.php
index b4d60d72..48c4b88b 100644
--- a/src/Phalcon/storage/adapter/Apcu.php
+++ b/src/Phalcon/storage/adapter/Apcu.php
@@ -36,7 +36,7 @@ public function clear(): bool
      * Decrements a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      */
@@ -59,7 +59,7 @@ public function delete(string $key): bool
      * Reads data from the adapter
      *
      * @param string $key
-     * @param null   $defaultValue
+     * @param null $defaultValue
      *
      * @return mixed
      */
@@ -101,7 +101,7 @@ public function has(string $key): bool
      * Increments a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      */
@@ -113,8 +113,8 @@ public function increment(string $key, int $value = 1)
      * Stores data in the adapter
      *
      * @param string $key
-     * @param mixed  $value
-     * @param null   $ttl
+     * @param mixed $value
+     * @param null $ttl
      *
      * @return bool
      * @throws \Exception
@@ -122,5 +122,4 @@ public function increment(string $key, int $value = 1)
     public function set(string $key, $value, $ttl = null): bool
     {
     }
-
 }
diff --git a/src/Phalcon/storage/adapter/Libmemcached.php b/src/Phalcon/storage/adapter/Libmemcached.php
index babf6205..0ea8caee 100644
--- a/src/Phalcon/storage/adapter/Libmemcached.php
+++ b/src/Phalcon/storage/adapter/Libmemcached.php
@@ -62,7 +62,7 @@ public function delete(string $key): bool
      * Reads data from the adapter
      *
      * @param string $key
-     * @param null   $defaultValue
+     * @param null $defaultValue
      *
      * @return mixed
      * @throws Exception
@@ -108,7 +108,7 @@ public function has(string $key): bool
      * Increments a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      * @throws Exception
@@ -121,8 +121,8 @@ public function increment(string $key, int $value = 1)
      * Stores data in the adapter
      *
      * @param string $key
-     * @param mixed  $value
-     * @param null   $ttl
+     * @param mixed $value
+     * @param null $ttl
      *
      * @return bool
      * @throws Exception
@@ -140,5 +140,4 @@ public function set(string $key, $value, $ttl = null): bool
     private function setSerializer(\Memcached $connection)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/adapter/Memory.php b/src/Phalcon/storage/adapter/Memory.php
index c2aa28b0..10c77db9 100644
--- a/src/Phalcon/storage/adapter/Memory.php
+++ b/src/Phalcon/storage/adapter/Memory.php
@@ -43,7 +43,7 @@ public function clear(): bool
      * Decrements a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      */
@@ -65,7 +65,7 @@ public function delete(string $key): bool
     /**
      * Reads data from the adapter
      *
-     * @param string     $key
+     * @param string $key
      * @param mixed|null $defaultValue
      *
      * @return mixed
@@ -108,7 +108,7 @@ public function has(string $key): bool
      * Increments a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      */
@@ -120,13 +120,12 @@ public function increment(string $key, int $value = 1)
      * Stores data in the adapter
      *
      * @param string $key
-     * @param mixed  $value
-     * @param null   $ttl
+     * @param mixed $value
+     * @param null $ttl
      *
      * @return bool
      */
     public function set(string $key, $value, $ttl = null): bool
     {
     }
-
 }
diff --git a/src/Phalcon/storage/adapter/Redis.php b/src/Phalcon/storage/adapter/Redis.php
index 21c96133..e110d1a2 100644
--- a/src/Phalcon/storage/adapter/Redis.php
+++ b/src/Phalcon/storage/adapter/Redis.php
@@ -39,7 +39,7 @@ public function clear(): bool
      * Decrements a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      * @throws Exception
@@ -64,7 +64,7 @@ public function delete(string $key): bool
      * Reads data from the adapter
      *
      * @param string $key
-     * @param null   $defaultValue
+     * @param null $defaultValue
      *
      * @return mixed
      * @throws Exception
@@ -110,7 +110,7 @@ public function has(string $key): bool
      * Increments a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      * @throws Exception
@@ -123,8 +123,8 @@ public function increment(string $key, int $value = 1)
      * Stores data in the adapter
      *
      * @param string $key
-     * @param mixed  $value
-     * @param null   $ttl
+     * @param mixed $value
+     * @param null $ttl
      *
      * @return bool
      * @throws Exception
@@ -142,5 +142,4 @@ public function set(string $key, $value, $ttl = null): bool
     private function setSerializer(\Redis $connection)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/adapter/Stream.php b/src/Phalcon/storage/adapter/Stream.php
index 4151c3cc..6279bd5e 100644
--- a/src/Phalcon/storage/adapter/Stream.php
+++ b/src/Phalcon/storage/adapter/Stream.php
@@ -31,8 +31,8 @@ class Stream extends AbstractAdapter
      *
      * @param array $options
      *
-     * @throws Exception
      * @param \Phalcon\Storage\SerializerFactory $factory
+     * @throws Exception
      */
     public function __construct(\Phalcon\Storage\SerializerFactory $factory = null, array $options = array())
     {
@@ -51,7 +51,7 @@ public function clear(): bool
      * Decrements a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      * @throws \Exception
@@ -75,7 +75,7 @@ public function delete(string $key): bool
      * Reads data from the adapter
      *
      * @param string $key
-     * @param null   $defaultValue
+     * @param null $defaultValue
      *
      * @return mixed|null
      */
@@ -117,7 +117,7 @@ public function has(string $key): bool
      * Increments a stored number
      *
      * @param string $key
-     * @param int    $value
+     * @param int $value
      *
      * @return bool|int
      * @throws \Exception
@@ -130,8 +130,8 @@ public function increment(string $key, int $value = 1)
      * Stores data in the adapter
      *
      * @param string $key
-     * @param mixed  $value
-     * @param null   $ttl
+     * @param mixed $value
+     * @param null $ttl
      *
      * @return bool
      * @throws \Exception
@@ -192,5 +192,4 @@ private function getPayload(string $filepath): array
     private function isExpired(array $payload): bool
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/AbstractSerializer.php b/src/Phalcon/storage/serializer/AbstractSerializer.php
index d81e734d..205118eb 100644
--- a/src/Phalcon/storage/serializer/AbstractSerializer.php
+++ b/src/Phalcon/storage/serializer/AbstractSerializer.php
@@ -50,5 +50,4 @@ public function getData()
     public function setData($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/Base64.php b/src/Phalcon/storage/serializer/Base64.php
index 67b662fb..ac8ebb63 100644
--- a/src/Phalcon/storage/serializer/Base64.php
+++ b/src/Phalcon/storage/serializer/Base64.php
@@ -30,5 +30,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/Igbinary.php b/src/Phalcon/storage/serializer/Igbinary.php
index 18c5e581..5ae29919 100644
--- a/src/Phalcon/storage/serializer/Igbinary.php
+++ b/src/Phalcon/storage/serializer/Igbinary.php
@@ -30,5 +30,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/Json.php b/src/Phalcon/storage/serializer/Json.php
index 03406141..98601157 100644
--- a/src/Phalcon/storage/serializer/Json.php
+++ b/src/Phalcon/storage/serializer/Json.php
@@ -30,5 +30,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/Msgpack.php b/src/Phalcon/storage/serializer/Msgpack.php
index 54d03c8f..7b5cc9f0 100644
--- a/src/Phalcon/storage/serializer/Msgpack.php
+++ b/src/Phalcon/storage/serializer/Msgpack.php
@@ -30,5 +30,4 @@ public function serialize(): ?string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/None.php b/src/Phalcon/storage/serializer/None.php
index 36e121e1..4887eb92 100644
--- a/src/Phalcon/storage/serializer/None.php
+++ b/src/Phalcon/storage/serializer/None.php
@@ -30,5 +30,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/Php.php b/src/Phalcon/storage/serializer/Php.php
index 2ddd36be..07a289c5 100644
--- a/src/Phalcon/storage/serializer/Php.php
+++ b/src/Phalcon/storage/serializer/Php.php
@@ -30,5 +30,4 @@ public function serialize(): string
     public function unserialize($data)
     {
     }
-
 }
diff --git a/src/Phalcon/storage/serializer/SerializerInterface.php b/src/Phalcon/storage/serializer/SerializerInterface.php
index 8d733b48..e70bde5d 100644
--- a/src/Phalcon/storage/serializer/SerializerInterface.php
+++ b/src/Phalcon/storage/serializer/SerializerInterface.php
@@ -22,5 +22,4 @@ public function getData();
      * @param mixed $data
      */
     public function setData($data);
-
 }
diff --git a/src/Phalcon/tag/Select.php b/src/Phalcon/tag/Select.php
index 94ca10d9..4d7fbcef 100644
--- a/src/Phalcon/tag/Select.php
+++ b/src/Phalcon/tag/Select.php
@@ -46,5 +46,4 @@ private static function optionsFromArray(array $data, $value, string $closeOptio
     private static function optionsFromResultset(\Phalcon\Mvc\Model\ResultsetInterface $resultset, $using, $value, string $closeOption): string
     {
     }
-
 }
diff --git a/src/Phalcon/translate/InterpolatorFactory.php b/src/Phalcon/translate/InterpolatorFactory.php
index 35171fe5..2b8f0d68 100644
--- a/src/Phalcon/translate/InterpolatorFactory.php
+++ b/src/Phalcon/translate/InterpolatorFactory.php
@@ -51,5 +51,4 @@ public function newInstance(string $name): AdapterInterface
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/translate/TranslateFactory.php b/src/Phalcon/translate/TranslateFactory.php
index c4b4da98..bb89fff5 100644
--- a/src/Phalcon/translate/TranslateFactory.php
+++ b/src/Phalcon/translate/TranslateFactory.php
@@ -58,5 +58,4 @@ public function newInstance(string $name, array $options = array()): AdapterInte
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/translate/adapter/AbstractAdapter.php b/src/Phalcon/translate/adapter/AbstractAdapter.php
index 3b9e7ba3..61eb811a 100644
--- a/src/Phalcon/translate/adapter/AbstractAdapter.php
+++ b/src/Phalcon/translate/adapter/AbstractAdapter.php
@@ -101,5 +101,4 @@ public function t(string $translateKey, array $placeholders = array()): string
     protected function replacePlaceholders(string $translation, array $placeholders = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/translate/adapter/AdapterInterface.php b/src/Phalcon/translate/adapter/AdapterInterface.php
index 748dbfc3..d3e246e6 100644
--- a/src/Phalcon/translate/adapter/AdapterInterface.php
+++ b/src/Phalcon/translate/adapter/AdapterInterface.php
@@ -35,5 +35,4 @@ public function query(string $translateKey, array $placeholders = array()): stri
      * @return string
      */
     public function t(string $translateKey, array $placeholders = array()): string;
-
 }
diff --git a/src/Phalcon/translate/adapter/Csv.php b/src/Phalcon/translate/adapter/Csv.php
index 5a1ce803..42cf4523 100644
--- a/src/Phalcon/translate/adapter/Csv.php
+++ b/src/Phalcon/translate/adapter/Csv.php
@@ -57,5 +57,4 @@ public function query(string $index, array $placeholders = array()): string
     private function load(string $file, int $length, string $delimiter, string $enclosure)
     {
     }
-
 }
diff --git a/src/Phalcon/translate/adapter/Gettext.php b/src/Phalcon/translate/adapter/Gettext.php
index 52cf5d2a..9c4cfd96 100644
--- a/src/Phalcon/translate/adapter/Gettext.php
+++ b/src/Phalcon/translate/adapter/Gettext.php
@@ -208,5 +208,4 @@ protected function getOptionsDefault(): array
     protected function prepareOptions(array $options)
     {
     }
-
 }
diff --git a/src/Phalcon/translate/adapter/NativeArray.php b/src/Phalcon/translate/adapter/NativeArray.php
index 76a70ccf..b61536af 100644
--- a/src/Phalcon/translate/adapter/NativeArray.php
+++ b/src/Phalcon/translate/adapter/NativeArray.php
@@ -60,5 +60,4 @@ public function notFound(string $index): string
     public function query(string $index, array $placeholders = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/translate/interpolator/AssociativeArray.php b/src/Phalcon/translate/interpolator/AssociativeArray.php
index 2666724d..f38fa2ff 100644
--- a/src/Phalcon/translate/interpolator/AssociativeArray.php
+++ b/src/Phalcon/translate/interpolator/AssociativeArray.php
@@ -23,5 +23,4 @@ class AssociativeArray implements \Phalcon\Translate\Interpolator\InterpolatorIn
     public function replacePlaceholders(string $translation, array $placeholders = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/translate/interpolator/IndexedArray.php b/src/Phalcon/translate/interpolator/IndexedArray.php
index b9c7f3c7..d1bf80ab 100644
--- a/src/Phalcon/translate/interpolator/IndexedArray.php
+++ b/src/Phalcon/translate/interpolator/IndexedArray.php
@@ -23,5 +23,4 @@ class IndexedArray implements \Phalcon\Translate\Interpolator\InterpolatorInterf
     public function replacePlaceholders(string $translation, array $placeholders = array()): string
     {
     }
-
 }
diff --git a/src/Phalcon/translate/interpolator/InterpolatorInterface.php b/src/Phalcon/translate/interpolator/InterpolatorInterface.php
index 4adb6a41..81c5972a 100644
--- a/src/Phalcon/translate/interpolator/InterpolatorInterface.php
+++ b/src/Phalcon/translate/interpolator/InterpolatorInterface.php
@@ -18,5 +18,4 @@ interface InterpolatorInterface
      * @return string
      */
     public function replacePlaceholders(string $translation, array $placeholders = array()): string;
-
 }
diff --git a/src/Phalcon/url/UrlInterface.php b/src/Phalcon/url/UrlInterface.php
index e67b5ed5..c7d6b3a6 100644
--- a/src/Phalcon/url/UrlInterface.php
+++ b/src/Phalcon/url/UrlInterface.php
@@ -55,5 +55,4 @@ public function setBaseUri(string $baseUri): UrlInterface;
      * @return string
      */
     public function path(string $path = null): string;
-
 }
diff --git a/src/Phalcon/validation/AbstractValidator.php b/src/Phalcon/validation/AbstractValidator.php
index 9028834e..1a0bc25b 100644
--- a/src/Phalcon/validation/AbstractValidator.php
+++ b/src/Phalcon/validation/AbstractValidator.php
@@ -39,9 +39,9 @@ public function __construct(array $options = array())
     /**
      * Get the template message
      *
+     * @param string $field
      * @return string
      * @throw InvalidArgumentException When the field does not exists
-     * @param string $field
      */
     public function getTemplate(string $field = null): string
     {
@@ -59,8 +59,8 @@ public function getTemplates(): array
     /**
      * Clear current templates and set new from an array,
      *
-     * @return ValidatorInterface
      * @param array $templates
+     * @return ValidatorInterface
      */
     public function setTemplates(array $templates): ValidatorInterface
     {
@@ -69,8 +69,8 @@ public function setTemplates(array $templates): ValidatorInterface
     /**
      * Set a new template message
      *
-     * @return ValidatorInterface
      * @param string $template
+     * @return ValidatorInterface
      */
     public function setTemplate(string $template): ValidatorInterface
     {
@@ -141,15 +141,14 @@ protected function prepareLabel(\Phalcon\Validation $validation, string $field)
     /**
      * Create a default message by factory
      *
-     * @return Message
-     *
-     * @throw Exception
      * @param \Phalcon\Validation $validation
      * @param mixed $field
      * @param array $replacements
+     * @return Message
+     *
+     * @throw Exception
      */
     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 a78ef5e2..842ec995 100644
--- a/src/Phalcon/validation/AbstractValidatorComposite.php
+++ b/src/Phalcon/validation/AbstractValidatorComposite.php
@@ -30,5 +30,4 @@ public function getValidators(): array
     public function validate(\Phalcon\Validation $validation, $field): bool
     {
     }
-
 }
diff --git a/src/Phalcon/validation/ValidationInterface.php b/src/Phalcon/validation/ValidationInterface.php
index c874fe26..260f0862 100644
--- a/src/Phalcon/validation/ValidationInterface.php
+++ b/src/Phalcon/validation/ValidationInterface.php
@@ -124,5 +124,4 @@ public function setLabels(array $labels);
      * @return \Phalcon\Messages\Messages
      */
     public function validate($data = null, $entity = null): Messages;
-
 }
diff --git a/src/Phalcon/validation/ValidatorCompositeInterface.php b/src/Phalcon/validation/ValidatorCompositeInterface.php
index 7798b58b..602bef4d 100644
--- a/src/Phalcon/validation/ValidatorCompositeInterface.php
+++ b/src/Phalcon/validation/ValidatorCompositeInterface.php
@@ -23,5 +23,4 @@ public function getValidators(): array;
      * @return bool
      */
     public function validate(\Phalcon\Validation $validation, $field): bool;
-
 }
diff --git a/src/Phalcon/validation/ValidatorFactory.php b/src/Phalcon/validation/ValidatorFactory.php
index 95e5ca1b..955bd259 100644
--- a/src/Phalcon/validation/ValidatorFactory.php
+++ b/src/Phalcon/validation/ValidatorFactory.php
@@ -40,5 +40,4 @@ public function newInstance(string $name)
     protected function getAdapters(): array
     {
     }
-
 }
diff --git a/src/Phalcon/validation/ValidatorInterface.php b/src/Phalcon/validation/ValidatorInterface.php
index ec192dcf..f1848f02 100644
--- a/src/Phalcon/validation/ValidatorInterface.php
+++ b/src/Phalcon/validation/ValidatorInterface.php
@@ -12,35 +12,35 @@ interface ValidatorInterface
      * Returns an option in the validator's options
      * Returns null if the option hasn't set
      *
-     * @return mixed
      * @param string $key
      * @param mixed $defaultValue
+     * @return mixed
      */
     public function getOption(string $key, $defaultValue = null);
 
     /**
      * Checks if an option is defined
      *
-     * @return boolean
      * @param string $key
+     * @return boolean
      */
     public function hasOption(string $key): bool;
 
     /**
      * Executes the validation
      *
-     * @return boolean
      * @param \Phalcon\Validation $validation
      * @param mixed $field
+     * @return boolean
      */
     public function validate(\Phalcon\Validation $validation, $field): bool;
 
     /**
      * Get the template message
      *
+     * @param string $field
      * @return string
      * @throw InvalidArgumentException When the field does not exists
-     * @param string $field
      */
     public function getTemplate(string $field): string;
 
@@ -54,17 +54,16 @@ public function getTemplates(): array;
     /**
      * Clear current template and set new from an array,
      *
-     * @return ValidatorInterface
      * @param array $templates
+     * @return ValidatorInterface
      */
     public function setTemplates(array $templates): ValidatorInterface;
 
     /**
      * Set a new temlate message
      *
-     * @return ValidatorInterface
      * @param string $template
+     * @return ValidatorInterface
      */
     public function setTemplate(string $template): ValidatorInterface;
-
 }
diff --git a/src/Phalcon/validation/validator/Alnum.php b/src/Phalcon/validation/validator/Alnum.php
index 093344c8..c42de8bd 100644
--- a/src/Phalcon/validation/validator/Alnum.php
+++ b/src/Phalcon/validation/validator/Alnum.php
@@ -54,5 +54,4 @@ class Alnum extends AbstractValidator
     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 403f8658..890bd985 100644
--- a/src/Phalcon/validation/validator/Alpha.php
+++ b/src/Phalcon/validation/validator/Alpha.php
@@ -54,5 +54,4 @@ class Alpha extends AbstractValidator
     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 2f84550b..8c59ea02 100644
--- a/src/Phalcon/validation/validator/Between.php
+++ b/src/Phalcon/validation/validator/Between.php
@@ -65,5 +65,4 @@ class Between extends AbstractValidator
     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 712ac062..d9ed74af 100644
--- a/src/Phalcon/validation/validator/Callback.php
+++ b/src/Phalcon/validation/validator/Callback.php
@@ -64,5 +64,4 @@ class Callback extends AbstractValidator
     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 f81d5ebe..294f6d93 100644
--- a/src/Phalcon/validation/validator/Confirmation.php
+++ b/src/Phalcon/validation/validator/Confirmation.php
@@ -70,5 +70,4 @@ public function validate(\Phalcon\Validation $validation, $field): bool
     final protected function compare(string $a, string $b): bool
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/CreditCard.php b/src/Phalcon/validation/validator/CreditCard.php
index 4028f411..bfc588b7 100644
--- a/src/Phalcon/validation/validator/CreditCard.php
+++ b/src/Phalcon/validation/validator/CreditCard.php
@@ -65,5 +65,4 @@ public function validate(\Phalcon\Validation $validation, $field): bool
     private function verifyByLuhnAlgorithm(string $number): bool
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/Date.php b/src/Phalcon/validation/validator/Date.php
index f40c4065..538b51c1 100644
--- a/src/Phalcon/validation/validator/Date.php
+++ b/src/Phalcon/validation/validator/Date.php
@@ -68,5 +68,4 @@ public function validate(\Phalcon\Validation $validation, $field): bool
     private function checkDate($value, $format): bool
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/Digit.php b/src/Phalcon/validation/validator/Digit.php
index bd1d2c3b..c09dc3cc 100644
--- a/src/Phalcon/validation/validator/Digit.php
+++ b/src/Phalcon/validation/validator/Digit.php
@@ -54,5 +54,4 @@ class Digit extends AbstractValidator
     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 f70b51cb..1b537ecb 100644
--- a/src/Phalcon/validation/validator/Email.php
+++ b/src/Phalcon/validation/validator/Email.php
@@ -54,5 +54,4 @@ class Email extends AbstractValidator
     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 ebeebbd3..4933c82a 100644
--- a/src/Phalcon/validation/validator/ExclusionIn.php
+++ b/src/Phalcon/validation/validator/ExclusionIn.php
@@ -65,5 +65,4 @@ class ExclusionIn extends AbstractValidator
     public function validate(\Phalcon\Validation $validation, $field): bool
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/File.php b/src/Phalcon/validation/validator/File.php
index d43d2447..9aef43c4 100644
--- a/src/Phalcon/validation/validator/File.php
+++ b/src/Phalcon/validation/validator/File.php
@@ -82,5 +82,4 @@ class File extends AbstractValidatorComposite
     public function __construct(array $options = array())
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/Identical.php b/src/Phalcon/validation/validator/Identical.php
index 4d8d5bce..b3299ff1 100644
--- a/src/Phalcon/validation/validator/Identical.php
+++ b/src/Phalcon/validation/validator/Identical.php
@@ -59,5 +59,4 @@ class Identical extends AbstractValidator
     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 1b7f3b1a..05a1c725 100644
--- a/src/Phalcon/validation/validator/InclusionIn.php
+++ b/src/Phalcon/validation/validator/InclusionIn.php
@@ -59,5 +59,4 @@ class InclusionIn extends AbstractValidator
     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 2d2f6540..ccfddd67 100644
--- a/src/Phalcon/validation/validator/Ip.php
+++ b/src/Phalcon/validation/validator/Ip.php
@@ -77,5 +77,4 @@ class Ip extends AbstractValidator
     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 6bc8defa..d991fcb4 100644
--- a/src/Phalcon/validation/validator/Numericality.php
+++ b/src/Phalcon/validation/validator/Numericality.php
@@ -54,5 +54,4 @@ class Numericality extends AbstractValidator
     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 8f1348c9..c0002357 100644
--- a/src/Phalcon/validation/validator/PresenceOf.php
+++ b/src/Phalcon/validation/validator/PresenceOf.php
@@ -54,5 +54,4 @@ class PresenceOf extends AbstractValidator
     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 997f75e9..c25b6ecf 100644
--- a/src/Phalcon/validation/validator/Regex.php
+++ b/src/Phalcon/validation/validator/Regex.php
@@ -59,5 +59,4 @@ class Regex extends AbstractValidator
     public function validate(\Phalcon\Validation $validation, $field): bool
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/StringLength.php b/src/Phalcon/validation/validator/StringLength.php
index a1f62149..b3b7a984 100644
--- a/src/Phalcon/validation/validator/StringLength.php
+++ b/src/Phalcon/validation/validator/StringLength.php
@@ -77,5 +77,4 @@ class StringLength extends AbstractValidatorComposite
     public function __construct(array $options = array())
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/Uniqueness.php b/src/Phalcon/validation/validator/Uniqueness.php
index d023f486..dd3b39cf 100644
--- a/src/Phalcon/validation/validator/Uniqueness.php
+++ b/src/Phalcon/validation/validator/Uniqueness.php
@@ -124,5 +124,4 @@ protected function isUniqueness(\Phalcon\Validation $validation, $field): bool
     protected function isUniquenessModel($record, array $field, array $values)
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/Url.php b/src/Phalcon/validation/validator/Url.php
index 086626cc..3872318a 100644
--- a/src/Phalcon/validation/validator/Url.php
+++ b/src/Phalcon/validation/validator/Url.php
@@ -54,5 +54,4 @@ class Url extends AbstractValidator
     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 629fbf86..a787dddc 100644
--- a/src/Phalcon/validation/validator/file/AbstractFile.php
+++ b/src/Phalcon/validation/validator/file/AbstractFile.php
@@ -174,5 +174,4 @@ public function checkUploadIsValid(\Phalcon\Validation $validation, $field): boo
     public function getFileSizeInBytes(string $size): float
     {
     }
-
 }
diff --git a/src/Phalcon/validation/validator/file/MimeType.php b/src/Phalcon/validation/validator/file/MimeType.php
index 85f42aa9..777c08be 100644
--- a/src/Phalcon/validation/validator/file/MimeType.php
+++ b/src/Phalcon/validation/validator/file/MimeType.php
@@ -68,5 +68,4 @@ class MimeType extends AbstractFile
     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 3ded3092..8c266d16 100644
--- a/src/Phalcon/validation/validator/file/resolution/Equal.php
+++ b/src/Phalcon/validation/validator/file/resolution/Equal.php
@@ -59,5 +59,4 @@ class Equal extends AbstractFile
     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 aa3f5623..af9715d6 100644
--- a/src/Phalcon/validation/validator/file/resolution/Max.php
+++ b/src/Phalcon/validation/validator/file/resolution/Max.php
@@ -64,5 +64,4 @@ class Max extends AbstractFile
     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 bd0caee3..75e48df5 100644
--- a/src/Phalcon/validation/validator/file/resolution/Min.php
+++ b/src/Phalcon/validation/validator/file/resolution/Min.php
@@ -64,5 +64,4 @@ class Min extends AbstractFile
     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 3dbcd702..852b0144 100644
--- a/src/Phalcon/validation/validator/file/size/Equal.php
+++ b/src/Phalcon/validation/validator/file/size/Equal.php
@@ -64,5 +64,4 @@ class Equal extends AbstractFile
     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 9c4459bb..7465186a 100644
--- a/src/Phalcon/validation/validator/file/size/Max.php
+++ b/src/Phalcon/validation/validator/file/size/Max.php
@@ -64,5 +64,4 @@ class Max extends AbstractFile
     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 e241f58f..01383b3b 100644
--- a/src/Phalcon/validation/validator/file/size/Min.php
+++ b/src/Phalcon/validation/validator/file/size/Min.php
@@ -64,5 +64,4 @@ class Min extends AbstractFile
     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 d9848924..6dfb16a1 100644
--- a/src/Phalcon/validation/validator/stringlength/Max.php
+++ b/src/Phalcon/validation/validator/stringlength/Max.php
@@ -66,5 +66,4 @@ class Max extends AbstractValidator
     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 28091a84..5c77a755 100644
--- a/src/Phalcon/validation/validator/stringlength/Min.php
+++ b/src/Phalcon/validation/validator/stringlength/Min.php
@@ -66,5 +66,4 @@ class Min extends AbstractValidator
     public function validate(\Phalcon\Validation $validation, $field): bool
     {
     }
-
 }