From 7effe5b966ac399be4d862ededa8c4bc9dbbb584 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 15:59:41 -0500
Subject: [PATCH 1/8] reorganizing cli tests

---
 tests/cli/Cli/Router/HandleCest.php           | 307 +++++++-----------
 tests/cli/Cli/Task/UnderscoreGetCest.php      |   6 +-
 .../Di/FactoryDefault/Cli/ConstructCest.php   |  69 +---
 tests/cli/Di/FactoryDefault/Cli/GetCest.php   |   2 +-
 .../Cli/GetInternalEventsManagerCest.php      |   2 +-
 ...ultCest.php => GetSetDefaultResetCest.php} |  25 +-
 .../Di/FactoryDefault/Cli/GetSharedCest.php   |   2 +-
 .../Di/FactoryDefault/Cli/OffsetSetCest.php   |   2 +-
 tests/cli/Di/FactoryDefault/Cli/ResetCest.php |  46 ---
 tests/cli/Di/FactoryDefault/Cli/SetCest.php   |   2 +-
 .../Di/FactoryDefault/Cli/SetDefaultCest.php  |  46 ---
 11 files changed, 145 insertions(+), 364 deletions(-)
 rename tests/cli/Di/FactoryDefault/Cli/{GetDefaultCest.php => GetSetDefaultResetCest.php} (51%)
 delete mode 100644 tests/cli/Di/FactoryDefault/Cli/ResetCest.php
 delete mode 100644 tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php

diff --git a/tests/cli/Cli/Router/HandleCest.php b/tests/cli/Cli/Router/HandleCest.php
index b6a62c5fb14..2f97762dcce 100644
--- a/tests/cli/Cli/Router/HandleCest.php
+++ b/tests/cli/Cli/Router/HandleCest.php
@@ -64,101 +64,10 @@ public function cliRouterHandleRouter(CliTester $I, Example $example)
         Route::reset();
 
         $router = new Router();
-
-        $router->add(
-            ' ',
-            [
-                'module' => 'devtools',
-                'task'   => 'main',
-                'action' => 'hello',
-            ]
-        );
-
-        $router->add(
-            'system :task a :action :params',
-            [
-                'task'   => 1,
-                'action' => 2,
-                'params' => 3,
-            ]
-        );
-
-        $router->add(
-            '([a-z]{2}) :task',
-            [
-                'task'     => 2,
-                'action'   => 'index',
-                'language' => 1,
-            ]
-        );
-
-        $router->add(
-            'admin :task :action :int',
-            [
-                'module' => 'admin',
-                'task'   => 1,
-                'action' => 2,
-                'id'     => 3,
-            ]
-        );
-
-        $router->add(
-            'posts ([0-9]{4}) ([0-9]{2}) ([0-9]{2}) :params',
-            [
-                'task'   => 'posts',
-                'action' => 'show',
-                'year'   => 1,
-                'month'  => 2,
-                'day'    => 3,
-                'params' => 4,
-            ]
-        );
-
-        $router->add(
-            'manual ([a-z]{2}) ([a-z\.]+)\.txt',
-            [
-                'task'     => 'manual',
-                'action'   => 'show',
-                'language' => 1,
-                'file'     => 2,
-            ]
-        );
-
-        $router->add(
-            'named-manual {language:([a-z]{2})} {file:[a-z\.]+}\.txt',
-            [
-                'task'   => 'manual',
-                'action' => 'show',
-            ]
-        );
-
-        $router->add(
-            'very static route',
-            [
-                'task'   => 'static',
-                'action' => 'route',
-            ]
-        );
-
-        $router->add(
-            "feed {lang:[a-z]+} blog {blog:[a-z\-]+}\.{type:[a-z\-]+}",
-            'Feed::get'
-        );
-
-        $router->add(
-            "posts {year:[0-9]+} s {title:[a-z\-]+}",
-            'Posts::show'
-        );
-
-        $router->add(
-            'posts delete {id}',
-            'Posts::delete'
-        );
-
-        $router->add(
-            "show {id:video([0-9]+)} {title:[a-z\-]+}",
-            'Videos::show'
-        );
+        $routes = $this->setupRoutes('router');
+        foreach ($routes as $pattern => $parameters) {
+            $router->add($pattern, $parameters);
+        }
 
         $this->assertParameters($I, $router, $example);
     }
@@ -186,107 +95,16 @@ public function cliRouterHandleRouterParams(CliTester $I, Example $example)
      * @return void
      * @throws Exception
      */
-    public function testDelimiter(CliTester $I, Example $example)
+    public function cliRouterHandleRouterDelimiter(CliTester $I, Example $example)
     {
         Route::reset();
         Route::delimiter('/');
 
         $router = new Router();
-
-        $router->add(
-            '/',
-            [
-                'module' => 'devtools',
-                'task'   => 'main',
-                'action' => 'hello',
-            ]
-        );
-
-        $router->add(
-            '/system/:task/a/:action/:params',
-            [
-                'task'   => 1,
-                'action' => 2,
-                'params' => 3,
-            ]
-        );
-
-        $router->add(
-            '/([a-z]{2})/:task',
-            [
-                'task'     => 2,
-                'action'   => 'index',
-                'language' => 1,
-            ]
-        );
-
-        $router->add(
-            '/admin/:task/:action/:int',
-            [
-                'module' => 'admin',
-                'task'   => 1,
-                'action' => 2,
-                'id'     => 3,
-            ]
-        );
-
-        $router->add(
-            '/posts/([0-9]{4})/([0-9]{2})/([0-9]{2})/:params',
-            [
-                'task'   => 'posts',
-                'action' => 'show',
-                'year'   => 1,
-                'month'  => 2,
-                'day'    => 3,
-                'params' => 4,
-            ]
-        );
-
-        $router->add(
-            '/manual/([a-z]{2})/([a-z\.]+)\.txt',
-            [
-                'task'     => 'manual',
-                'action'   => 'show',
-                'language' => 1,
-                'file'     => 2,
-            ]
-        );
-
-        $router->add(
-            '/named-manual/{language:([a-z]{2})}/{file:[a-z\.]+}\.txt',
-            [
-                'task'   => 'manual',
-                'action' => 'show',
-            ]
-        );
-
-        $router->add(
-            '/very/static/route',
-            [
-                'task'   => 'static',
-                'action' => 'route',
-            ]
-        );
-
-        $router->add(
-            "/feed/{lang:[a-z]+}/blog/{blog:[a-z\-]+}\.{type:[a-z\-]+}",
-            'Feed::get'
-        );
-
-        $router->add(
-            "/posts/{year:[0-9]+}/s/{title:[a-z\-]+}",
-            'Posts::show'
-        );
-
-        $router->add(
-            '/posts/delete/{id}',
-            'Posts::delete'
-        );
-
-        $router->add(
-            "/show/{id:video([0-9]+)}/{title:[a-z\-]+}",
-            'Videos::show'
-        );
+        $routes = $this->setupRoutes('delimiter');
+        foreach ($routes as $pattern => $parameters) {
+            $router->add($pattern, $parameters);
+        }
 
         $this->assertParameters($I, $router, $example);
     }
@@ -743,4 +561,111 @@ private function getExamplesDelimiter(): array
             ],
         ];
     }
+
+    private function setupRoutes(string $test): array
+    {
+        $routes = [
+            'router'    => [
+                ' '                                                        => [
+                    'module' => 'devtools',
+                    'task'   => 'main',
+                    'action' => 'hello',
+                ],
+                'system :task a :action :params'                           => [
+                    'task'   => 1,
+                    'action' => 2,
+                    'params' => 3,
+                ],
+                '([a-z]{2}) :task'                                         => [
+                    'task'     => 2,
+                    'action'   => 'index',
+                    'language' => 1,
+                ],
+                'admin :task :action :int'                                 => [
+                    'module' => 'admin',
+                    'task'   => 1,
+                    'action' => 2,
+                    'id'     => 3,
+                ],
+                'posts ([0-9]{4}) ([0-9]{2}) ([0-9]{2}) :params'           => [
+                    'task'   => 'posts',
+                    'action' => 'show',
+                    'year'   => 1,
+                    'month'  => 2,
+                    'day'    => 3,
+                    'params' => 4,
+                ],
+                'manual ([a-z]{2}) ([a-z\.]+)\.txt'                        => [
+                    'task'     => 'manual',
+                    'action'   => 'show',
+                    'language' => 1,
+                    'file'     => 2,
+                ],
+                'named-manual {language:([a-z]{2})} {file:[a-z\.]+}\.txt'  => [
+                    'task'   => 'manual',
+                    'action' => 'show',
+                ],
+                'very static route'                                        => [
+                    'task'   => 'static',
+                    'action' => 'route',
+                ],
+                "feed {lang:[a-z]+} blog {blog:[a-z\-]+}\.{type:[a-z\-]+}" => 'Feed::get',
+                "posts {year:[0-9]+} s {title:[a-z\-]+}"                   => 'Posts::show',
+                'posts delete {id}'                                        => 'Posts::delete',
+                "show {id:video([0-9]+)} {title:[a-z\-]+}"                 => 'Videos::show',
+            ],
+            'delimiter' => [
+                '/'                                                         => [
+                    'module' => 'devtools',
+                    'task'   => 'main',
+                    'action' => 'hello',
+                ],
+                '/system/:task/a/:action/:params'                           => [
+                    'task'   => 1,
+                    'action' => 2,
+                    'params' => 3,
+                ],
+                '/([a-z]{2})/:task'                                         => [
+                    'task'     => 2,
+                    'action'   => 'index',
+                    'language' => 1,
+                ],
+                '/admin/:task/:action/:int'                                 => [
+                    'module' => 'admin',
+                    'task'   => 1,
+                    'action' => 2,
+                    'id'     => 3,
+                ],
+                '/posts/([0-9]{4})/([0-9]{2})/([0-9]{2})/:params'           => [
+                    'task'   => 'posts',
+                    'action' => 'show',
+                    'year'   => 1,
+                    'month'  => 2,
+                    'day'    => 3,
+                    'params' => 4,
+                ],
+                '/manual/([a-z]{2})/([a-z\.]+)\.txt'                        => [
+                    'task'     => 'manual',
+                    'action'   => 'show',
+                    'language' => 1,
+                    'file'     => 2,
+                ],
+                '/named-manual/{language:([a-z]{2})}/{file:[a-z\.]+}\.txt'  => [
+                    'task'   => 'manual',
+                    'action' => 'show',
+                ],
+                '/very/static/route'                                        => [
+                    'task'   => 'static',
+                    'action' => 'route',
+                ],
+                "/feed/{lang:[a-z]+}/blog/{blog:[a-z\-]+}\.{type:[a-z\-]+}" => 'Feed::get',
+                "/posts/{year:[0-9]+}/s/{title:[a-z\-]+}"                   => 'Posts::show',
+                '/posts/delete/{id}'                                        => 'Posts::delete',
+                "/show/{id:video([0-9]+)}/{title:[a-z\-]+}"                 => 'Videos::show',
+
+            ],
+        ];
+
+        return $routes[$test] ?? [];
+    }
 }
diff --git a/tests/cli/Cli/Task/UnderscoreGetCest.php b/tests/cli/Cli/Task/UnderscoreGetCest.php
index cf0d8d542b7..d4d517244d0 100644
--- a/tests/cli/Cli/Task/UnderscoreGetCest.php
+++ b/tests/cli/Cli/Task/UnderscoreGetCest.php
@@ -41,8 +41,8 @@ public function cliTaskUnderscoreGet(CliTester $I)
         $actual   = $task->di;
         $I->assertSame($expected, $actual);
 
-        $class  = Manager::class;
-        $actual = $task->eventsManager;
-        $I->assertInstanceOf($class, $actual);
+        $expected = $eventsManager;
+        $actual   = $task->eventsManager;
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php b/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php
index 92feffbf263..19149a28edd 100644
--- a/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php
@@ -15,22 +15,13 @@
 
 use CliTester;
 use Codeception\Example;
-use Phalcon\Annotations\Adapter\Memory as AnnotationsMemory;
-use Phalcon\Cli\Dispatcher;
-use Phalcon\Cli\Router;
 use Phalcon\Di\FactoryDefault\Cli;
-use Phalcon\Html\Escaper;
-use Phalcon\Events\Manager as EventsManager;
-use Phalcon\Filter\Filter;
-use Phalcon\Html\TagFactory;
-use Phalcon\Mvc\Model\Manager as ModelsManager;
-use Phalcon\Mvc\Model\MetaData\Memory;
-use Phalcon\Mvc\Model\Transaction\Manager;
-use Phalcon\Encryption\Security;
-use Phalcon\Support\HelperFactory;
+use Phalcon\Tests\Fixtures\Traits\CliTrait;
 
 class ConstructCest
 {
+    use CliTrait;
+
     /**
      * Tests Phalcon\Di\FactoryDefault\Cli :: __construct()
      *
@@ -73,58 +64,4 @@ public function diFactoryDefaultCliConstructServices(CliTester $I, Example $exam
         $actual = $container->get($example['service'], $params);
         $I->assertInstanceOf($class, $actual);
     }
-
-    private function getServices(): array
-    {
-        return [
-            [
-                'service' => 'annotations',
-                'class'   => AnnotationsMemory::class,
-            ],
-            [
-                'service' => 'dispatcher',
-                'class'   => Dispatcher::class,
-            ],
-            [
-                'service' => 'escaper',
-                'class'   => Escaper::class,
-            ],
-            [
-                'service' => 'eventsManager',
-                'class'   => EventsManager::class,
-            ],
-            [
-                'service' => 'filter',
-                'class'   => Filter::class,
-            ],
-            [
-                'service' => 'helper',
-                'class'   => HelperFactory::class,
-            ],
-            [
-                'service' => 'modelsManager',
-                'class'   => ModelsManager::class,
-            ],
-            [
-                'service' => 'modelsMetadata',
-                'class'   => Memory::class,
-            ],
-            [
-                'service' => 'router',
-                'class'   => Router::class,
-            ],
-            [
-                'service' => 'security',
-                'class'   => Security::class,
-            ],
-            [
-                'service' => 'tag',
-                'class'   => TagFactory::class,
-            ],
-            [
-                'service' => 'transactionManager',
-                'class'   => Manager::class,
-            ],
-        ];
-    }
 }
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetCest.php b/tests/cli/Di/FactoryDefault/Cli/GetCest.php
index b8385940012..eeecee331e3 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetCest.php
@@ -41,7 +41,7 @@ public function diFactorydefaultCliGet(CliTester $I)
         $I->assertFalse($actual->isShared());
 
         // get escaper service
-        $actual   = $di->get('escaper');
+        $actual = $di->get('escaper');
         $expected = new Escaper();
 
         $I->assertInstanceOf(Escaper::class, $actual);
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php b/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php
index dfaa3e3bd31..3607eb95e06 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetInternalEventsManagerCest.php
@@ -37,7 +37,7 @@ public function diFactorydefaultCliGetInternalEventsManager(CliTester $I)
 
         $di->setInternalEventsManager(new Manager());
 
-        $class = ManagerInterface::class;
+        $class  = ManagerInterface::class;
         $actual = $di->getInternalEventsManager();
         $I->assertInstanceOf($class, $actual);
     }
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php b/tests/cli/Di/FactoryDefault/Cli/GetSetDefaultResetCest.php
similarity index 51%
rename from tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php
rename to tests/cli/Di/FactoryDefault/Cli/GetSetDefaultResetCest.php
index cac24e0da5a..a00324c5104 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetDefaultCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetSetDefaultResetCest.php
@@ -16,31 +16,42 @@
 use CliTester;
 use Phalcon\Di\FactoryDefault\Cli as Di;
 
-class GetDefaultCest
+use function spl_object_hash;
+
+class GetSetDefaultResetCest
 {
     /**
-     * Tests Phalcon\Di\FactoryDefault\Cli :: getDefault()
+     * Tests Phalcon\Di\FactoryDefault\Cli :: getDefault()/setDefault()/reset()
      *
      * @author Phalcon Team <team@phalcon.io>
      * @since  2018-11-13
      */
     public function diFactorydefaultCliGetDefault(CliTester $I)
     {
-        $I->wantToTest('Di\FactoryDefault\Cli - getDefault()');
+        $I->wantToTest('Di\FactoryDefault\Cli - getDefault()/setDefault()/reset()');
 
         // there is a DI container
         $I->assertInstanceOf(Di::class, Di::getDefault());
 
-        $di = Di::getDefault();
+        $container = Di::getDefault();
 
         // delete it
         Di::reset();
 
-        $I->assertNull(Di::getDefault());
+        // Get a new container
+        $new = Di::getDefault();
+
+        $I->assertNull($new);
 
         // set it again
-        Di::setDefault($di);
+        Di::setDefault($container);
 
-        $I->assertInstanceOf(Di::class, Di::getDefault());
+        $class  = Di::class;
+        $actual = Di::getDefault();
+        $I->assertInstanceOf($class, $actual);
+
+        $containerHash = spl_object_hash($container);
+        $currentHash   = spl_object_hash($actual);
+        $I->assertSame($containerHash, $currentHash);
     }
 }
diff --git a/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php b/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php
index 302117cf31f..18f0d4d81d9 100644
--- a/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/GetSharedCest.php
@@ -14,8 +14,8 @@
 namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
-use Phalcon\Encryption\Crypt;
 use Phalcon\Di\FactoryDefault\Cli as Di;
+use Phalcon\Encryption\Crypt;
 use Phalcon\Html\Escaper;
 
 class GetSharedCest
diff --git a/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php b/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php
index 9572b2cb7c2..acc00e93c15 100644
--- a/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/OffsetSetCest.php
@@ -14,8 +14,8 @@
 namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
-use Phalcon\Encryption\Crypt;
 use Phalcon\Di\FactoryDefault\Cli as Di;
+use Phalcon\Encryption\Crypt;
 use Phalcon\Html\Escaper;
 
 class OffsetSetCest
diff --git a/tests/cli/Di/FactoryDefault/Cli/ResetCest.php b/tests/cli/Di/FactoryDefault/Cli/ResetCest.php
deleted file mode 100644
index 8d58ed1523d..00000000000
--- a/tests/cli/Di/FactoryDefault/Cli/ResetCest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
-
-use CliTester;
-use Phalcon\Di\FactoryDefault\Cli as Di;
-
-class ResetCest
-{
-    /**
-     * Tests Phalcon\Di\FactoryDefault\Cli :: reset()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function diFactorydefaultCliReset(CliTester $I)
-    {
-        $I->wantToTest('Di\FactoryDefault\Cli - reset()');
-
-        // there is a DI container
-        $I->assertInstanceOf(Di::class, Di::getDefault());
-
-        $di = Di::getDefault();
-
-        // delete it
-        Di::reset();
-
-        $I->assertNull(Di::getDefault());
-
-        // set it again
-        Di::setDefault($di);
-
-        $I->assertInstanceOf(Di::class, Di::getDefault());
-    }
-}
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetCest.php b/tests/cli/Di/FactoryDefault/Cli/SetCest.php
index 3abe83a05a9..7f8804e63aa 100644
--- a/tests/cli/Di/FactoryDefault/Cli/SetCest.php
+++ b/tests/cli/Di/FactoryDefault/Cli/SetCest.php
@@ -14,8 +14,8 @@
 namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
 
 use CliTester;
-use Phalcon\Encryption\Crypt;
 use Phalcon\Di\FactoryDefault\Cli as Di;
+use Phalcon\Encryption\Crypt;
 use Phalcon\Html\Escaper;
 
 class SetCest
diff --git a/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php b/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php
deleted file mode 100644
index a1f10e62279..00000000000
--- a/tests/cli/Di/FactoryDefault/Cli/SetDefaultCest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * This file is part of the Phalcon Framework.
- *
- * (c) Phalcon Team <team@phalcon.io>
- *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Phalcon\Tests\Cli\Di\FactoryDefault\Cli;
-
-use CliTester;
-use Phalcon\Di\FactoryDefault\Cli as Di;
-
-class SetDefaultCest
-{
-    /**
-     * Tests Phalcon\Di\FactoryDefault\Cli :: setDefault()
-     *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
-     */
-    public function diFactorydefaultCliSetDefault(CliTester $I)
-    {
-        $I->wantToTest('Di\FactoryDefault\Cli - setDefault()');
-
-        // there is a DI container
-        $I->assertInstanceOf(Di::class, Di::getDefault());
-
-        $di = Di::getDefault();
-
-        // delete it
-        Di::reset();
-
-        $I->assertNull(Di::getDefault());
-
-        // set it again
-        Di::setDefault($di);
-
-        $I->assertInstanceOf(Di::class, Di::getDefault());
-    }
-}

From c00630b100e19671b7f844fe41136d21fae15415 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 16:00:06 -0500
Subject: [PATCH 2/8] phpcs on tests

---
 tests/_data/fixtures/Http/PhpStream.php       | 41 +++++++-----
 tests/_data/fixtures/Tasks/MainTask.php       |  2 +-
 .../Acl/Adapter/Memory/AddInheritCest.php     |  3 +-
 .../unit/Acl/Adapter/Memory/IsAllowedCest.php | 29 ++++++---
 .../Security/JWT/Token/Parser/ParseCest.php   | 63 +++++++++++++------
 tests/unit/Flash/Direct/OutputCest.php        |  1 -
 tests/unit/Flash/Session/OutputCest.php       |  2 +-
 7 files changed, 94 insertions(+), 47 deletions(-)

diff --git a/tests/_data/fixtures/Http/PhpStream.php b/tests/_data/fixtures/Http/PhpStream.php
index eb0a7741873..763f1ccee38 100644
--- a/tests/_data/fixtures/Http/PhpStream.php
+++ b/tests/_data/fixtures/Http/PhpStream.php
@@ -36,6 +36,9 @@ class PhpStream
      */
     protected $data = '';
 
+    /**
+     * Constructor
+     */
     public function __construct()
     {
         if (file_exists($this->getBufferFilename())) {
@@ -48,26 +51,21 @@ public function __construct()
         $this->length = strlen($this->data);
     }
 
-    protected function getBufferFilename(): string
-    {
-        return codecept_output_dir('tests/stream/php_input.txt');
-    }
-
-    public function stream_open($path, $mode, $options, &$opened_path)
+    public function stream_close()
     {
-        return true;
     }
 
-    public function stream_close()
+    public function stream_eof()
     {
+        return ($this->index >= $this->length);
     }
 
-    public function stream_stat()
+    public function stream_flush()
     {
-        return [];
+        return true;
     }
 
-    public function stream_flush()
+    public function stream_open($path, $mode, $options, &$opened_path)
     {
         return true;
     }
@@ -89,11 +87,6 @@ public function stream_read($count)
         return $data;
     }
 
-    public function stream_eof()
-    {
-        return ($this->index >= $this->length);
-    }
-
     public function stream_seek($offset, $whence)
     {
         if (null === $this->length) {
@@ -133,6 +126,17 @@ public function stream_seek($offset, $whence)
         }
     }
 
+    public function stream_stat()
+    {
+        return [];
+    }
+
+    public function stream_tell()
+    {
+        return $this->index;
+    }
+
+
     public function stream_write($data)
     {
         return file_put_contents(
@@ -153,4 +157,9 @@ public function unlink()
         $this->index  = 0;
         $this->length = 0;
     }
+
+    protected function getBufferFilename(): string
+    {
+        return codecept_output_dir('tests/stream/php_input.txt');
+    }
 }
diff --git a/tests/_data/fixtures/Tasks/MainTask.php b/tests/_data/fixtures/Tasks/MainTask.php
index cca2638d309..c3f2fd4d5df 100644
--- a/tests/_data/fixtures/Tasks/MainTask.php
+++ b/tests/_data/fixtures/Tasks/MainTask.php
@@ -45,7 +45,7 @@ public function argumentsAction(
         string $world,
         string $symbol,
         string $country,
-        $last
+        mixed $last
     ) {
         return '-' . $world . '-' . $symbol . '-' . $country . '-' . (string) $last . '-';
     }
diff --git a/tests/unit/Acl/Adapter/Memory/AddInheritCest.php b/tests/unit/Acl/Adapter/Memory/AddInheritCest.php
index bc048ace411..b8989817d9d 100644
--- a/tests/unit/Acl/Adapter/Memory/AddInheritCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AddInheritCest.php
@@ -150,7 +150,8 @@ function () {
     }
 
     /**
-     * Tests Phalcon\Acl\Adapter\Memory :: addInherit() - infinite loop exception
+     * Tests Phalcon\Acl\Adapter\Memory :: addInherit() - infinite loop
+     * exception
      *
      * @param UnitTester $I
      *
diff --git a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
index 521beb38771..b142b3ee06b 100644
--- a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
+++ b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php
@@ -128,7 +128,10 @@ public function aclAdapterMemoryIsAllowedSameClass(UnitTester $I)
             'Admin',
             'User',
             ['update'],
-            function (TestRoleComponentAware $admin, TestRoleComponentAware $user) {
+            function (
+                TestRoleComponentAware $admin,
+                TestRoleComponentAware $user
+            ) {
                 return $admin->getUser() == $user->getUser();
             }
         );
@@ -182,8 +185,9 @@ function () {
      * @author  Phalcon Team <team@phalcon.io>
      * @since   2021-09-27
      */
-    public function aclAdapterMemoryIsAllowedFunctionMoreParameters(UnitTester $I)
-    {
+    public function aclAdapterMemoryIsAllowedFunctionMoreParameters(
+        UnitTester $I
+    ) {
         $I->wantToTest('Acl\Adapter\Memory - isAllowed() - more parameters');
 
         $errorMessage = "Number of parameters in array is higher than the "
@@ -239,16 +243,19 @@ function ($parameter) {
      * @author  Phalcon Team <team@phalcon.io>
      * @since   2019-06-16
      */
-    public function aclAdapterMemoryIsAllowedFunctionNotEnoughParameters(UnitTester $I)
-    {
-        $I->wantToTest('Acl\Adapter\Memory - isAllowed() - not enough parameters');
+    public function aclAdapterMemoryIsAllowedFunctionNotEnoughParameters(
+        UnitTester $I
+    ) {
+        $I->wantToTest(
+            'Acl\Adapter\Memory - isAllowed() - not enough parameters'
+        );
 
         $I->expectThrowable(
             new AclException(
                 "You did not provide all necessary parameters for the " .
                 "defined function when checking if 'Members' can 'update' for 'Post'."
             ),
-            function () use ($I) {
+            function () {
                 $acl = new Memory();
 
                 $acl->setDefaultAction(Enum::ALLOW);
@@ -335,7 +342,9 @@ function () {
      */
     public function aclAdapterMemoryIsAllowedFireEventFalse(UnitTester $I)
     {
-        $I->wantToTest('Acl\Adapter\Memory - isAllowed() - fireEvent returns false');
+        $I->wantToTest(
+            'Acl\Adapter\Memory - isAllowed() - fireEvent returns false'
+        );
 
         $acl = Stub::make(
             Memory::class,
@@ -362,7 +371,9 @@ public function aclAdapterMemoryIsAllowedFireEventFalse(UnitTester $I)
      */
     public function aclAdapterMemoryIsAllowedDocumentationExample(UnitTester $I)
     {
-        $I->wantToTest('Acl\Adapter\Memory - isAllowed() - documentation example');
+        $I->wantToTest(
+            'Acl\Adapter\Memory - isAllowed() - documentation example'
+        );
 
         $acl = new Memory();
 
diff --git a/tests/unit/Encryption/Security/JWT/Token/Parser/ParseCest.php b/tests/unit/Encryption/Security/JWT/Token/Parser/ParseCest.php
index ba2ce20ac64..2018ae720b5 100644
--- a/tests/unit/Encryption/Security/JWT/Token/Parser/ParseCest.php
+++ b/tests/unit/Encryption/Security/JWT/Token/Parser/ParseCest.php
@@ -66,14 +66,23 @@ public function encryptionSecurityJWTTokenParserParse(UnitTester $I)
         $I->assertTrue($claims->has('sub'));
 
         $I->assertSame(['my-audience'], $claims->get('aud'));
-        $I->assertSame($token->getClaims()
-                             ->get('exp'), $claims->get('exp'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('exp'),
+            $claims->get('exp')
+        );
         $I->assertSame('PH-JWT', $claims->get('jti'));
-        $I->assertSame($token->getClaims()
-                             ->get('iat'), $claims->get('iat'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('iat'),
+            $claims->get('iat')
+        );
         $I->assertSame('Phalcon JWT', $claims->get('iss'));
-        $I->assertSame($token->getClaims()
-                             ->get('nbf'), $claims->get('nbf'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('nbf'),
+            $claims->get('nbf')
+        );
         $I->assertSame('Mary had a little lamb', $claims->get('sub'));
     }
 
@@ -116,14 +125,23 @@ public function encryptionSecurityJWTTokenParserParseNoSignature(UnitTester $I)
         $I->assertTrue($claims->has('sub'));
 
         $I->assertSame(['my-audience'], $claims->get('aud'));
-        $I->assertSame($token->getClaims()
-                             ->get('exp'), $claims->get('exp'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('exp'),
+            $claims->get('exp')
+        );
         $I->assertSame('PH-JWT', $claims->get('jti'));
-        $I->assertSame($token->getClaims()
-                             ->get('iat'), $claims->get('iat'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('iat'),
+            $claims->get('iat')
+        );
         $I->assertSame('Phalcon JWT', $claims->get('iss'));
-        $I->assertSame($token->getClaims()
-                             ->get('nbf'), $claims->get('nbf'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('nbf'),
+            $claims->get('nbf')
+        );
         $I->assertSame('Mary had a little lamb', $claims->get('sub'));
 
         $I->assertEmpty($signature->getEncoded());
@@ -175,14 +193,23 @@ public function encryptionSecurityJWTTokenParserParseAudNotAnArray(UnitTester $I
         $I->assertTrue($claims->has('sub'));
 
         $I->assertSame(['my-audience'], $claims->get('aud'));
-        $I->assertSame($token->getClaims()
-                             ->get('exp'), $claims->get('exp'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('exp'),
+            $claims->get('exp')
+        );
         $I->assertSame('PH-JWT', $claims->get('jti'));
-        $I->assertSame($token->getClaims()
-                             ->get('iat'), $claims->get('iat'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('iat'),
+            $claims->get('iat')
+        );
         $I->assertSame('Phalcon JWT', $claims->get('iss'));
-        $I->assertSame($token->getClaims()
-                             ->get('nbf'), $claims->get('nbf'));
+        $I->assertSame(
+            $token->getClaims()
+                  ->get('nbf'),
+            $claims->get('nbf')
+        );
         $I->assertSame('Mary had a little lamb', $claims->get('sub'));
     }
 
diff --git a/tests/unit/Flash/Direct/OutputCest.php b/tests/unit/Flash/Direct/OutputCest.php
index 083353d8ae8..5863f260226 100644
--- a/tests/unit/Flash/Direct/OutputCest.php
+++ b/tests/unit/Flash/Direct/OutputCest.php
@@ -18,7 +18,6 @@
 use Phalcon\Html\Escaper;
 use UnitTester;
 
-use function MongoDB\BSON\toRelaxedExtendedJSON;
 use function ob_end_clean;
 use function ob_get_contents;
 use function ob_start;
diff --git a/tests/unit/Flash/Session/OutputCest.php b/tests/unit/Flash/Session/OutputCest.php
index c5e1db0d18a..b7c7b2f66a3 100644
--- a/tests/unit/Flash/Session/OutputCest.php
+++ b/tests/unit/Flash/Session/OutputCest.php
@@ -128,7 +128,7 @@ public function flashSessionOutputWithCustomTemplate(UnitTester $I)
         $flash = new Session();
         $flash->setDI($this->container);
 
-        $message1 = uniqid('m-');
+        $message1       = uniqid('m-');
         $customTemplate = "
 <div class='%cssClass%' role='alert'>
     <button type='button' class='close' data-dismiss='alert' aria-label='Close'>

From e47b39ca030e7303c47fffdf1f4c7b7060d7fbe7 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 16:00:22 -0500
Subject: [PATCH 3/8] added interpolation for logger messages

---
 .../Logger/Formatter/AbstractFormatter.zep    | 42 ++++++++++++++-----
 phalcon/Logger/Formatter/Json.zep             | 19 +++++----
 phalcon/Logger/Formatter/Line.zep             | 27 ++++++------
 3 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/phalcon/Logger/Formatter/AbstractFormatter.zep b/phalcon/Logger/Formatter/AbstractFormatter.zep
index 5bb2d0612db..3fa169bb6b9 100644
--- a/phalcon/Logger/Formatter/AbstractFormatter.zep
+++ b/phalcon/Logger/Formatter/AbstractFormatter.zep
@@ -27,13 +27,29 @@ abstract class AbstractFormatter extends AbstractStr implements FormatterInterfa
     protected dateFormat = "c";
 
     /**
-     * Return the default date format
-     *
+     * @var string
+     */
+    protected interpolatorLeft = "%";
+
+    /**
+     * @var string
+     */
+    protected interpolatorRight = "%";
+
+    /**
      * @return string
      */
     public function getDateFormat() -> string
     {
-        return this->dateFormat;
+        return $this->dateFormat;
+    }
+
+    /**
+     * @param string $format
+     */
+    public function setDateFormat(string $format) -> void
+    {
+        let this->dateFormat = $format;
     }
 
     /**
@@ -49,14 +65,20 @@ abstract class AbstractFormatter extends AbstractStr implements FormatterInterfa
     }
 
     /**
-     * Set the default date format
+     * @param Item   $item
+     * @param string $message
      *
-     * @param string $format
-     *
-     * @return void
+     * @return string
      */
-    public function setDateFormat(string format) -> void
-    {
-        let this->dateFormat = format;
+    protected function getInterpolatedMessage(
+        <Item> item,
+        string message
+    ) -> string {
+        return $this->toInterpolate(
+            message,
+            item->getContext(),
+            this->interpolatorLeft,
+            this->interpolatorRight
+        );
     }
 }
diff --git a/phalcon/Logger/Formatter/Json.zep b/phalcon/Logger/Formatter/Json.zep
index d6b9ab78e76..28405fe1581 100644
--- a/phalcon/Logger/Formatter/Json.zep
+++ b/phalcon/Logger/Formatter/Json.zep
@@ -22,10 +22,17 @@ class Json extends AbstractFormatter
      * Json constructor.
      *
      * @param string $dateFormat
+     * @param string $interpolatorLeft
+     * @param string $interpolatorRight
      */
-    public function __construct(string dateFormat = "c")
-    {
-        let this->dateFormat = dateFormat;
+    public function __construct(
+        string dateFormat = 'c',
+        string interpolatorLeft = '%',
+        string interpolatorRight = '%'
+    ) {
+        let this->dateFormat        = dateFormat;
+        let this->interpolatorLeft  = interpolatorLeft;
+        let this->interpolatorRight = interpolatorRight;
     }
 
     /**
@@ -40,6 +47,7 @@ class Json extends AbstractFormatter
     {
         var message, options;
 
+        let message = $this->getInterpolatedMessage($item, $item->getMessage());
         let options = JSON_HEX_TAG
             + JSON_HEX_APOS
             + JSON_HEX_AMP
@@ -47,11 +55,6 @@ class Json extends AbstractFormatter
             + JSON_UNESCAPED_SLASHES
             + JSON_THROW_ON_ERROR;
 
-        let message = this->toInterpolate(
-            item->getMessage(),
-            item->getContext()
-        );
-
         return json_encode(
             [
                 "level"     : item->getLevelName(),
diff --git a/phalcon/Logger/Formatter/Line.zep b/phalcon/Logger/Formatter/Line.zep
index b0fd06c34df..15a6a390a19 100644
--- a/phalcon/Logger/Formatter/Line.zep
+++ b/phalcon/Logger/Formatter/Line.zep
@@ -18,25 +18,24 @@ use Phalcon\Logger\Item;
  */
 class Line extends AbstractFormatter
 {
-    /**
-     * Format applied to each message
-     *
-     * @var string
-     */
-    protected format;
-
     /**
      * Line constructor.
      *
      * @param string $format
      * @param string $dateFormat
+     * @param string $interpolatorLeft
+     * @param string $interpolatorRight
      */
     public function __construct(
         string format = "[%date%][%level%] %message%",
-        string dateFormat = "c"
+        string dateFormat = "c",
+        string interpolatorLeft = "%",
+        string interpolatorRight = "%"
     ) {
-        let this->format     = format,
-            this->dateFormat = dateFormat;
+        let this->format            = format;
+        let this->dateFormat        = dateFormat;
+        let this->interpolatorLeft  = interpolatorLeft;
+        let this->interpolatorRight = interpolatorRight;
     }
 
     /**
@@ -54,13 +53,13 @@ class Line extends AbstractFormatter
         let message = strtr(
             this->format,
             [
-                "%date%"    : this->getFormattedDate(item),
-                "%level%"   : item->getLevelName(),
-                "%message%" : item->getMessage()
+                this->interpolatorLeft . "date"    . this->interpolatorRight : this->getFormattedDate(item),
+                this->interpolatorLeft . "level"   . this->interpolatorRight : item->getLevelName(),
+                this->interpolatorLeft . "message" . this->interpolatorRight : item->getMessage()
             ]
         );
 
-        return this->toInterpolate(message, item->getContext());
+        return this->getInterpolatedMessage(item, message);
     }
 
     /**

From 2ef4a929df103c52cbb4d90a01ced9332a420aae Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 16:00:29 -0500
Subject: [PATCH 4/8] added tests

---
 tests/unit/Logger/Adapter/Syslog/AddCest.php |  1 +
 tests/unit/Logger/Logger/LogCest.php         | 51 ++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/tests/unit/Logger/Adapter/Syslog/AddCest.php b/tests/unit/Logger/Adapter/Syslog/AddCest.php
index 3bbc6de20a7..3fbeacaef9b 100644
--- a/tests/unit/Logger/Adapter/Syslog/AddCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/AddCest.php
@@ -24,6 +24,7 @@
 use Phalcon\Logger\Enum;
 use Phalcon\Logger\Item;
 use UnitTester;
+
 use function date_default_timezone_get;
 
 class AddCest
diff --git a/tests/unit/Logger/Logger/LogCest.php b/tests/unit/Logger/Logger/LogCest.php
index 0cfdf8210d7..b8efd68be48 100644
--- a/tests/unit/Logger/Logger/LogCest.php
+++ b/tests/unit/Logger/Logger/LogCest.php
@@ -138,6 +138,7 @@ public function loggerLogLogLevel(UnitTester $I)
             'notice'      => 'notice',
             'warning'     => 'warning',
             'custom'      => 'custom',
+            99            => 'custom',
         ];
 
         foreach ($levelsYes as $level => $levelName) {
@@ -220,4 +221,54 @@ public function loggerLogLogInterpolator(UnitTester $I)
         $adapter->close();
         $I->safeDeleteFile($fileName);
     }
+
+    /**
+     * Tests Phalcon\Logger :: log() - interpolator custom
+     *
+     * @param UnitTester $I
+     *
+     * @author Phalcon Team <team@phalcon.io>
+     * @since  2022-09-11
+     */
+    public function loggerLogLogInterpolatorCustom(UnitTester $I)
+    {
+        $I->wantToTest('Logger - log() - interpolator custom');
+
+        $logPath   = logsDir();
+        $fileName  = $I->getNewFileName('log', 'log');
+        $formatter = new Line(
+            '{message}-[{level}]-{server}:{user}',
+            'U.u',
+            '{',
+            '}'
+        );
+        $context  = [
+            'server' => uniqid('srv-'),
+            'user'   => uniqid('usr-'),
+        ];
+        $adapter  = new Stream($logPath . $fileName);
+        $adapter->setFormatter($formatter);
+
+        $logger = new Logger(
+            'my-logger',
+            [
+                'one' => $adapter,
+            ]
+        );
+
+        $logger->log(Enum::DEBUG, 'log message', $context);
+
+        $I->amInPath($logPath);
+        $I->openFile($fileName);
+
+        $expected = sprintf(
+            'log message-[DEBUG]-%s:%s',
+            $context['server'],
+            $context['user']
+        );
+        $I->seeInThisFile($expected);
+
+        $adapter->close();
+        $I->safeDeleteFile($fileName);
+    }
 }

From 3771a705672451ae0032441b8c297df8fcafe171 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 16:07:28 -0500
Subject: [PATCH 5/8] corrections

---
 phalcon/Logger/Formatter/Json.zep | 6 +++---
 phalcon/Logger/Formatter/Line.zep | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/phalcon/Logger/Formatter/Json.zep b/phalcon/Logger/Formatter/Json.zep
index 28405fe1581..9b605c69669 100644
--- a/phalcon/Logger/Formatter/Json.zep
+++ b/phalcon/Logger/Formatter/Json.zep
@@ -26,9 +26,9 @@ class Json extends AbstractFormatter
      * @param string $interpolatorRight
      */
     public function __construct(
-        string dateFormat = 'c',
-        string interpolatorLeft = '%',
-        string interpolatorRight = '%'
+        string dateFormat = "c",
+        string interpolatorLeft = "%",
+        string interpolatorRight = "%"
     ) {
         let this->dateFormat        = dateFormat;
         let this->interpolatorLeft  = interpolatorLeft;
diff --git a/phalcon/Logger/Formatter/Line.zep b/phalcon/Logger/Formatter/Line.zep
index 15a6a390a19..0d474e8c409 100644
--- a/phalcon/Logger/Formatter/Line.zep
+++ b/phalcon/Logger/Formatter/Line.zep
@@ -18,6 +18,13 @@ use Phalcon\Logger\Item;
  */
 class Line extends AbstractFormatter
 {
+    /**
+     * Format applied to each message
+     *
+     * @var string
+     */
+    protected format;
+
     /**
      * Line constructor.
      *

From d290fa317f78e81601cb71e3fb95e6b39f360f61 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 16:08:02 -0500
Subject: [PATCH 6/8] phpcs

---
 .../Adapter/Memory/AddComponentAccessCest.php |   2 +-
 .../Adapter/Memory/GetActiveFunctionCest.php  |   2 +-
 tests/unit/Acl/Component/ToStringCest.php     |   2 +-
 tests/unit/Acl/Role/ToStringCest.php          |   2 +-
 tests/unit/Annotations/ReflectionCest.php     |   4 +-
 tests/unit/Assets/Manager/GetSetCest.php      |   2 +-
 .../Config/Adapter/Grouped/ConstructCest.php  |   2 +-
 .../unit/Config/Adapter/Ini/ConstructCest.php |   2 +-
 tests/unit/Config/Config/ConfigCest.php       |   2 +-
 tests/unit/Config/Config/GetCest.php          |   3 +-
 tests/unit/Config/Config/MergeCest.php        |  30 +++--
 tests/unit/Config/ConfigFactory/LoadCest.php  |   6 +-
 .../unit/Di/FactoryDefault/ConstructCest.php  |   8 +-
 tests/unit/Di/GetDICest.php                   |   8 +-
 tests/unit/Di/GetServiceCest.php              |   2 +-
 .../unit/Di/Injectable/UnderscoreGetCest.php  |   2 +-
 tests/unit/Di/OffsetGetCest.php               |   2 +-
 tests/unit/Di/SetCest.php                     |   6 +-
 .../Dispatcher/GetSetEventsManagerCest.php    |   2 +-
 .../Dispatcher/GetSetHandlerSuffixCest.php    |   2 +-
 tests/unit/Dispatcher/GetSetParamsCest.php    |   2 +-
 .../Encryption/Crypt/DecryptBase64Cest.php    |   4 +-
 .../Crypt/IsValidDecryptLengthCest.php        |   2 +-
 .../Security/JWT/Builder/GetTokenCest.php     |   4 +-
 .../Security/JWT/Token/Token/VerifyCest.php   |   4 +-
 tests/unit/Events/Manager/DetachAllCest.php   |   4 +-
 tests/unit/Filter/SanitizeCest.php            |   2 +-
 tests/unit/Forms/FormEntityCest.php           |   4 +-
 tests/unit/Html/Attributes/ToStringCest.php   |   2 +-
 tests/unit/Html/Escaper/AttributesCest.php    |  20 +--
 tests/unit/Html/Escaper/CssCest.php           |   4 +-
 tests/unit/Html/Escaper/JsCest.php            |   2 +-
 .../unit/Html/Helper/Doctype/ToStringCest.php |   2 +-
 .../Helper/Doctype/UnderscoreInvokeCest.php   |   2 +-
 .../Input/CheckboxUnderscoreInvokeCest.php    |   4 +-
 .../Input/SelectUnderscoreInvokeCest.php      |   4 +-
 .../Helper/Input/UnderscoreInvokeCest.php     |   9 +-
 tests/unit/Html/Helper/Link/ToStringCest.php  |   2 +-
 .../Html/Helper/Link/UnderscoreInvokeCest.php |   4 +-
 tests/unit/Html/Helper/Meta/ToStringCest.php  |   2 +-
 .../Html/Helper/Meta/UnderscoreInvokeCest.php |  10 +-
 tests/unit/Html/Helper/Ol/ToStringCest.php    |   2 +-
 .../Html/Helper/Ol/UnderscoreInvokeCest.php   |   4 +-
 .../unit/Html/Helper/Script/ToStringCest.php  |   2 +-
 .../Helper/Script/UnderscoreInvokeCest.php    |   4 +-
 tests/unit/Html/Helper/Style/ToStringCest.php |   2 +-
 .../Helper/Style/UnderscoreInvokeCest.php     |   4 +-
 .../Helper/Title/UnderscoreInvokeCest.php     |  16 +--
 .../Html/Helper/Ul/UnderscoreInvokeCest.php   |   4 +-
 tests/unit/Http/Cookie/ToStringCest.php       |   2 +-
 tests/unit/Http/Helper/HttpBase.php           |   1 -
 tests/unit/Http/Request/AuthHeaderCest.php    |   3 +-
 .../unit/Http/Request/GetBestCharsetCest.php  |   2 +-
 .../unit/Http/Request/GetBestLanguageCest.php |   2 +-
 .../Http/Request/GetFilteredPatchCest.php     |   3 +-
 .../unit/Http/Request/GetFilteredPostCest.php |   3 +-
 .../unit/Http/Request/GetFilteredPutCest.php  |   3 +-
 tests/unit/Http/Request/GetHeadersCest.php    |   6 +-
 .../unit/Http/Request/GetJsonRawBodyCest.php  |   5 +-
 tests/unit/Http/Response/ConstructCest.php    |  10 +-
 .../unit/Http/Response/Cookies/DeleteCest.php |   1 +
 .../unit/Http/Response/Cookies/GetSetCest.php |   6 +-
 .../Http/Response/Cookies/SetSignKeyCest.php  |   1 +
 .../unit/Http/Response/GetSetContentCest.php  |   2 +-
 .../Http/Response/GetSetStatusCodeCest.php    |   6 +-
 .../Http/Response/SetContentLengthCest.php    |   4 +-
 tests/unit/Http/Response/SetEtagCest.php      |   2 +-
 .../unit/Image/Adapter/Gd/ReflectionCest.php  |   2 +-
 tests/unit/Image/Adapter/Gd/RotateCest.php    | 100 +++++++-------
 .../Stream/SerializeUnserializeCest.php       |   4 +-
 .../unit/Logger/Formatter/Line/FormatCest.php |  10 +-
 tests/unit/Logger/Logger/ConstructCest.php    |   4 +-
 tests/unit/Logger/Logger/LogCest.php          |   8 +-
 .../Logger/LoggerFactory/NewInstanceCest.php  |   8 +-
 tests/unit/Messages/Message/ToStringCest.php  |   2 +-
 tests/unit/Mvc/GlobalsCest.php                |   6 +-
 .../Mvc/Model/Query/GetExpressionCest.php     |  19 +--
 tests/unit/Session/ManagerCest.php            |   4 +-
 .../ReadOnlyCollection/RemoveCest.php         |   4 +-
 tests/unit/Support/Helper/Arr/OrderCest.php   |  12 +-
 tests/unit/Support/Helper/Arr/PluckCest.php   |   4 +-
 .../Support/Helper/Arr/ValidateAllCest.php    |   4 +-
 .../Support/Helper/Arr/ValidateAnyCest.php    |   4 +-
 tests/unit/Support/Helper/Json/DecodeCest.php |   6 +-
 tests/unit/Support/Helper/Json/EncodeCest.php |   6 +-
 .../Support/HelperFactory/NewInstanceCest.php | 124 +++++++++---------
 tests/unit/Support/Version/GetPartCest.php    |  12 +-
 .../Translate/Adapter/Csv/OffsetSetCest.php   |   2 +-
 .../Translate/Adapter/Csv/OffsetUnsetCest.php |   2 +-
 .../Adapter/Gettext/ConstructCest.php         |   2 +-
 .../IndexedArray/ReplacePlaceholdersCest.php  |   4 +-
 91 files changed, 323 insertions(+), 314 deletions(-)

diff --git a/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php b/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php
index 2262b2f4805..bfe2c61536f 100644
--- a/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php
+++ b/tests/unit/Acl/Adapter/Memory/AddComponentAccessCest.php
@@ -84,7 +84,7 @@ public function aclAdapterMemoryAddComponentAccessWrongAccessList(UnitTester $I)
         $I->expectThrowable(
             new Exception('Invalid value for the accessList'),
             function () {
-                $acl  = new Memory();
+                $acl = new Memory();
                 $post = new Component('Post');
 
                 $acl->addComponent($post, ['update']);
diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php
index 98ec54c1102..275790b6682 100644
--- a/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php
+++ b/tests/unit/Acl/Adapter/Memory/GetActiveFunctionCest.php
@@ -63,7 +63,7 @@ public function aclAdapterMemoryGetActiveFunction(UnitTester $I)
 
         $returnedFunction = $acl->getActiveFunction();
 
-        $class  = Closure::class;
+        $class = Closure::class;
         $actual = $returnedFunction;
         $I->assertInstanceOf($class, $actual);
 
diff --git a/tests/unit/Acl/Component/ToStringCest.php b/tests/unit/Acl/Component/ToStringCest.php
index 22a556cd410..fbe187896ba 100644
--- a/tests/unit/Acl/Component/ToStringCest.php
+++ b/tests/unit/Acl/Component/ToStringCest.php
@@ -38,6 +38,6 @@ public function aclComponentToString(UnitTester $I)
         $component = new Component('Customers');
 
         $I->assertSame('Customers', $component->__toString());
-        $I->assertSame('Customers', (string) $component);
+        $I->assertSame('Customers', (string)$component);
     }
 }
diff --git a/tests/unit/Acl/Role/ToStringCest.php b/tests/unit/Acl/Role/ToStringCest.php
index ae1ef60b5e5..ac94a5429bc 100644
--- a/tests/unit/Acl/Role/ToStringCest.php
+++ b/tests/unit/Acl/Role/ToStringCest.php
@@ -38,6 +38,6 @@ public function aclRoleToString(UnitTester $I)
         $role = new Role('Administrator');
 
         $I->assertSame('Administrator', $role->__toString());
-        $I->assertSame('Administrator', (string) $role);
+        $I->assertSame('Administrator', (string)$role);
     }
 }
diff --git a/tests/unit/Annotations/ReflectionCest.php b/tests/unit/Annotations/ReflectionCest.php
index 6aa95e85869..17aeac7e65e 100644
--- a/tests/unit/Annotations/ReflectionCest.php
+++ b/tests/unit/Annotations/ReflectionCest.php
@@ -22,7 +22,7 @@ class ReflectionCest
     /**
      * Executed before each test.
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      */
     protected function _before(UnitTester $I)
     {
@@ -32,7 +32,7 @@ protected function _before(UnitTester $I)
     /**
      * Tests parsing class annotations
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Phalcon Team <team@phalcon.io>
      * @since  2016-01-26
diff --git a/tests/unit/Assets/Manager/GetSetCest.php b/tests/unit/Assets/Manager/GetSetCest.php
index 4d90cdaea3e..8bfff9e0af5 100644
--- a/tests/unit/Assets/Manager/GetSetCest.php
+++ b/tests/unit/Assets/Manager/GetSetCest.php
@@ -34,7 +34,7 @@ public function assetsManagerGetSet(UnitTester $I)
     {
         $I->wantToTest('Assets\Manager - get()/set()');
 
-        $manager    = new Manager(new TagFactory(new Escaper()));
+        $manager = new Manager(new TagFactory(new Escaper()));
         $collection = new Collection();
 
         $manager->set('hangout', $collection);
diff --git a/tests/unit/Config/Adapter/Grouped/ConstructCest.php b/tests/unit/Config/Adapter/Grouped/ConstructCest.php
index b29751522a4..873c58182f4 100644
--- a/tests/unit/Config/Adapter/Grouped/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Grouped/ConstructCest.php
@@ -48,7 +48,7 @@ public function configAdapterGroupedConstructComplexInstance(UnitTester $I)
         $config = [
             dataDir('assets/config/config.php'),
             [
-                'adapter'  => 'json',
+                'adapter' => 'json',
                 'filePath' => dataDir('assets/config/config.json'),
             ],
             [
diff --git a/tests/unit/Config/Adapter/Ini/ConstructCest.php b/tests/unit/Config/Adapter/Ini/ConstructCest.php
index 4f80eb38fed..b2c9c3bb8f9 100644
--- a/tests/unit/Config/Adapter/Ini/ConstructCest.php
+++ b/tests/unit/Config/Adapter/Ini/ConstructCest.php
@@ -43,7 +43,7 @@ public function configAdapterIniConstruct(UnitTester $I)
         $this->config['database']['num6'] = true;
         $this->config['database']['num7'] = null;
         $this->config['database']['num8'] = 123;
-        $this->config['database']['num9'] = (float) 123.45;
+        $this->config['database']['num9'] = (float)123.45;
 
         $config = $this->getConfig('Ini');
 
diff --git a/tests/unit/Config/Config/ConfigCest.php b/tests/unit/Config/Config/ConfigCest.php
index 5698184e92a..8fcdee1f7d8 100644
--- a/tests/unit/Config/Config/ConfigCest.php
+++ b/tests/unit/Config/Config/ConfigCest.php
@@ -107,7 +107,7 @@ public function configConfigConfigInsensitive(UnitTester $I)
             ],
             'other'    => [1, 2, 3, 4],
         ];
-        $config = new Config($settings, false);
+        $config   = new Config($settings, false);
 
         /** @var Config $database */
         $database = $config->get('database');
diff --git a/tests/unit/Config/Config/GetCest.php b/tests/unit/Config/Config/GetCest.php
index 0433409692b..d7267189a6d 100644
--- a/tests/unit/Config/Config/GetCest.php
+++ b/tests/unit/Config/Config/GetCest.php
@@ -49,7 +49,8 @@ public function configGet(UnitTester $I)
 
         $expected = $this->config['database']['adapter'];
         $actual   = $config->get('database')
-                           ->get('adapter');
+                           ->get('adapter')
+        ;
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Config/Config/MergeCest.php b/tests/unit/Config/Config/MergeCest.php
index d7579641e52..f6586b7c88b 100644
--- a/tests/unit/Config/Config/MergeCest.php
+++ b/tests/unit/Config/Config/MergeCest.php
@@ -69,7 +69,8 @@ public function configMergeConfigCases(UnitTester $I, Example $example)
          */
         $expected = $example['expected'];
         $actual   = $source->merge($target)
-                           ->toArray();
+                           ->toArray()
+        ;
         $I->assertSame($expected, $actual);
 
         /**
@@ -78,7 +79,8 @@ public function configMergeConfigCases(UnitTester $I, Example $example)
         $expected = $example['expected'];
         $target   = $example['target'];
         $actual   = $source->merge($target)
-                           ->toArray();
+                           ->toArray()
+        ;
         $I->assertSame($expected, $actual);
     }
 
@@ -94,7 +96,7 @@ public function configMergeExceptions(UnitTester $I)
 
         $config = new Config(
             [
-                'my' => 'config'
+                'my' => 'config',
             ]
         );
 
@@ -355,22 +357,22 @@ private function getExamples(): array
                     'test'     => 123,
                     'empty'    => [],
                     'nonEmpty' => [
-                        5 => 'test'
-                    ]
+                        5 => 'test',
+                    ],
                 ],
                 'target'   => [
                     'empty' => [
-                        3 => 'toEmpty'
+                        3 => 'toEmpty',
                     ],
                 ],
                 'expected' => [
                     'test'     => 123,
                     'empty'    => [
-                        3 => 'toEmpty'
+                        3 => 'toEmpty',
                     ],
                     'nonEmpty' => [
-                        5 => 'test'
-                    ]
+                        5 => 'test',
+                    ],
                 ],
             ],
             [
@@ -379,12 +381,12 @@ private function getExamples(): array
                     'test'     => 123,
                     'empty'    => [],
                     'nonEmpty' => [
-                        5 => 'test'
-                    ]
+                        5 => 'test',
+                    ],
                 ],
                 'target'   => [
                     'nonEmpty' => [
-                        3 => 'toNonEmpty'
+                        3 => 'toNonEmpty',
                     ],
                 ],
                 'expected' => [
@@ -392,8 +394,8 @@ private function getExamples(): array
                     'empty'    => [],
                     'nonEmpty' => [
                         5 => 'test',
-                        3 => 'toNonEmpty'
-                    ]
+                        3 => 'toNonEmpty',
+                    ],
                 ],
             ],
         ];
diff --git a/tests/unit/Config/ConfigFactory/LoadCest.php b/tests/unit/Config/ConfigFactory/LoadCest.php
index 5780a36ec0f..cfbdfe9aa6a 100644
--- a/tests/unit/Config/ConfigFactory/LoadCest.php
+++ b/tests/unit/Config/ConfigFactory/LoadCest.php
@@ -64,8 +64,10 @@ public function configFactoryLoadConfig(UnitTester $I)
         $I->assertInstanceOf($class, $ini);
 
         /** @var Ini $ini */
-        $ini = (new ConfigFactory())->load($ini->get('config')
-                                               ->toArray());
+        $ini = (new ConfigFactory())->load(
+            $ini->get('config')
+                ->toArray()
+        );
         $I->assertInstanceOf($class, $ini);
     }
 
diff --git a/tests/unit/Di/FactoryDefault/ConstructCest.php b/tests/unit/Di/FactoryDefault/ConstructCest.php
index 0fde3286c68..517f45323cc 100644
--- a/tests/unit/Di/FactoryDefault/ConstructCest.php
+++ b/tests/unit/Di/FactoryDefault/ConstructCest.php
@@ -16,15 +16,15 @@
 use Codeception\Example;
 use Phalcon\Annotations\Adapter\Memory as MemoryAnnotations;
 use Phalcon\Assets\Manager as ManagerAssets;
+use Phalcon\Di\FactoryDefault;
 use Phalcon\Encryption\Crypt;
 use Phalcon\Encryption\Security;
-use Phalcon\Di\FactoryDefault;
-use Phalcon\Html\Escaper;
-use Phalcon\Html\TagFactory;
 use Phalcon\Events\Manager as ManagerEvents;
 use Phalcon\Filter\Filter;
 use Phalcon\Flash\Direct;
 use Phalcon\Flash\Session;
+use Phalcon\Html\Escaper;
+use Phalcon\Html\TagFactory;
 use Phalcon\Http\Request;
 use Phalcon\Http\Response;
 use Phalcon\Http\Response\Cookies;
@@ -33,8 +33,8 @@
 use Phalcon\Mvc\Model\MetaData\Memory;
 use Phalcon\Mvc\Model\Transaction\Manager;
 use Phalcon\Mvc\Router;
-use Phalcon\Support\HelperFactory;
 use Phalcon\Mvc\Url;
+use Phalcon\Support\HelperFactory;
 use UnitTester;
 
 class ConstructCest
diff --git a/tests/unit/Di/GetDICest.php b/tests/unit/Di/GetDICest.php
index 43e4397fa93..8e93fe4eb34 100644
--- a/tests/unit/Di/GetDICest.php
+++ b/tests/unit/Di/GetDICest.php
@@ -56,9 +56,9 @@ public function diInjectableGetDIContainer(UnitTester $I)
          */
         $std = $ic->std;
 
-        $className = get_class($ic);
+        $className  = get_class($ic);
         $reflection = new ReflectionClass($className);
-        $prop = $reflection->getProperty('container');
+        $prop       = $reflection->getProperty('container');
         $prop->setAccessible(true);
 
         $I->assertSame($di, $prop->getValue($ic));
@@ -82,7 +82,7 @@ public function diInjectableGetDIOtherContainer(UnitTester $I)
 
         Di::reset();
 
-        $di = new Di();
+        $di    = new Di();
         $other = new Di();
         $other->set('std', function () {
             return new stdClass();
@@ -99,7 +99,7 @@ public function diInjectableGetDIOtherContainer(UnitTester $I)
          */
         $std = $ic->std;
 
-        $className = get_class($ic);
+        $className  = get_class($ic);
         $reflection = new ReflectionClass($className);
 
         $prop = $reflection->getProperty('container');
diff --git a/tests/unit/Di/GetServiceCest.php b/tests/unit/Di/GetServiceCest.php
index 5044413c5be..9de5cc7920f 100644
--- a/tests/unit/Di/GetServiceCest.php
+++ b/tests/unit/Di/GetServiceCest.php
@@ -44,7 +44,7 @@ public function diGetService(UnitTester $I)
         $container = new Di();
 
         // set a service and get it to check
-        $class  = Service::class;
+        $class = Service::class;
         $actual = $container->set('escaper', Escaper::class);
         $I->assertInstanceOf($class, $actual);
 
diff --git a/tests/unit/Di/Injectable/UnderscoreGetCest.php b/tests/unit/Di/Injectable/UnderscoreGetCest.php
index b3821b45016..99fd3d9adc9 100644
--- a/tests/unit/Di/Injectable/UnderscoreGetCest.php
+++ b/tests/unit/Di/Injectable/UnderscoreGetCest.php
@@ -49,7 +49,7 @@ public function diInjectableUnderscoreGetIsset(UnitTester $I)
         $actual    = $component->getDI();
         $I->assertSame($container, $actual);
 
-        $class  = stdClass::class;
+        $class = stdClass::class;
         $actual = $component->std;
         $I->assertInstanceOf($class, $actual);
 
diff --git a/tests/unit/Di/OffsetGetCest.php b/tests/unit/Di/OffsetGetCest.php
index 131d1103a84..3b7d40ce069 100644
--- a/tests/unit/Di/OffsetGetCest.php
+++ b/tests/unit/Di/OffsetGetCest.php
@@ -43,7 +43,7 @@ public function diOffsetGet(UnitTester $I)
 
         $container->set('escaper', Escaper::class);
 
-        $class  = Escaper::class;
+        $class = Escaper::class;
         $actual = $container->offsetGet('escaper');
         $I->assertInstanceOf($class, $actual);
 
diff --git a/tests/unit/Di/SetCest.php b/tests/unit/Di/SetCest.php
index 90360d688f5..3c0d2db8058 100644
--- a/tests/unit/Di/SetCest.php
+++ b/tests/unit/Di/SetCest.php
@@ -127,7 +127,7 @@ private function getExamples(): array
                 'string',
                 'escaper',
                 Escaper::class,
-                Escaper::class
+                Escaper::class,
             ],
             [
                 'anonymous',
@@ -135,7 +135,7 @@ private function getExamples(): array
                 function () {
                     return new Escaper();
                 },
-                Escaper::class
+                Escaper::class,
             ],
             [
                 'array',
@@ -143,7 +143,7 @@ function () {
                 [
                     'className' => Escaper::class,
                 ],
-                Escaper::class
+                Escaper::class,
             ],
         ];
     }
diff --git a/tests/unit/Dispatcher/GetSetEventsManagerCest.php b/tests/unit/Dispatcher/GetSetEventsManagerCest.php
index e18481ccbb2..6f81ab0c49c 100644
--- a/tests/unit/Dispatcher/GetSetEventsManagerCest.php
+++ b/tests/unit/Dispatcher/GetSetEventsManagerCest.php
@@ -37,7 +37,7 @@ public function dispatcherGetSetEventsManager(UnitTester $I)
         $actual = $dispatcher->getEventsManager();
         $I->assertSame($manager, $actual);
 
-        $class  = Manager::class;
+        $class = Manager::class;
         $I->assertInstanceOf($class, $actual);
     }
 }
diff --git a/tests/unit/Dispatcher/GetSetHandlerSuffixCest.php b/tests/unit/Dispatcher/GetSetHandlerSuffixCest.php
index 94a796c6d02..db7cce1fa44 100644
--- a/tests/unit/Dispatcher/GetSetHandlerSuffixCest.php
+++ b/tests/unit/Dispatcher/GetSetHandlerSuffixCest.php
@@ -31,7 +31,7 @@ public function dispatcherGetSetHandlerSuffix(UnitTester $I)
         $dispatcher = new Dispatcher();
 
         $expected = 'Controller';
-        $actual = $dispatcher->getHandlerSuffix();
+        $actual   = $dispatcher->getHandlerSuffix();
         $I->assertSame($expected, $actual);
 
         $dispatcher->setHandlerSuffix('two');
diff --git a/tests/unit/Dispatcher/GetSetParamsCest.php b/tests/unit/Dispatcher/GetSetParamsCest.php
index 3ca4df35fb3..1249fceafd9 100644
--- a/tests/unit/Dispatcher/GetSetParamsCest.php
+++ b/tests/unit/Dispatcher/GetSetParamsCest.php
@@ -69,7 +69,7 @@ public function dispatcherGetParamsKeptBetweenCalls(UnitTester $I)
         $actual = $dispatcher->getParams();
         $I->assertEmpty($actual);
 
-        $params     = [
+        $params = [
             "trace" => [],
         ];
         $dispatcher->setParams($params);
diff --git a/tests/unit/Encryption/Crypt/DecryptBase64Cest.php b/tests/unit/Encryption/Crypt/DecryptBase64Cest.php
index d98afb18361..98359f8627e 100644
--- a/tests/unit/Encryption/Crypt/DecryptBase64Cest.php
+++ b/tests/unit/Encryption/Crypt/DecryptBase64Cest.php
@@ -93,9 +93,9 @@ public function encryptionCryptDecryptBase64DecryptSignedString(UnitTester $I)
             ->setKey('secret')
         ;
 
-        $expected  = 'le text';
+        $expected = 'le text';
         $encrypted = $crypt->encryptBase64($expected);
-        $actual    = $crypt->decryptBase64($encrypted);
+        $actual = $crypt->decryptBase64($encrypted);
 
         $I->assertSame($expected, $actual);
     }
diff --git a/tests/unit/Encryption/Crypt/IsValidDecryptLengthCest.php b/tests/unit/Encryption/Crypt/IsValidDecryptLengthCest.php
index 5be12198a0a..0c42c3c34a0 100644
--- a/tests/unit/Encryption/Crypt/IsValidDecryptLengthCest.php
+++ b/tests/unit/Encryption/Crypt/IsValidDecryptLengthCest.php
@@ -36,7 +36,7 @@ public function encryptionCryptGetSetKey(UnitTester $I)
         $crypt = new Crypt();
         $crypt->setKey('1234');
 
-        $input     = uniqid();
+        $input = uniqid();
         $encrypted = $crypt->encrypt($input);
 
         $actual = $crypt->isValidDecryptLength($encrypted);
diff --git a/tests/unit/Encryption/Security/JWT/Builder/GetTokenCest.php b/tests/unit/Encryption/Security/JWT/Builder/GetTokenCest.php
index 065375ffe44..d6f390340e7 100644
--- a/tests/unit/Encryption/Security/JWT/Builder/GetTokenCest.php
+++ b/tests/unit/Encryption/Security/JWT/Builder/GetTokenCest.php
@@ -65,9 +65,9 @@ public function encryptionSecurityJWTBuilderGetTokenException(UnitTester $I)
                 'Invalid passphrase (empty)'
             ),
             function () {
-                $signer  = new Hmac();
+                $signer = new Hmac();
                 $builder = new Builder($signer);
-                $token   = $builder->getToken();
+                $token = $builder->getToken();
             }
         );
     }
diff --git a/tests/unit/Encryption/Security/JWT/Token/Token/VerifyCest.php b/tests/unit/Encryption/Security/JWT/Token/Token/VerifyCest.php
index 204cffb2877..10eb7ba1d47 100644
--- a/tests/unit/Encryption/Security/JWT/Token/Token/VerifyCest.php
+++ b/tests/unit/Encryption/Security/JWT/Token/Token/VerifyCest.php
@@ -14,8 +14,6 @@
 use Codeception\Stub;
 use Phalcon\Encryption\Security\JWT\Builder;
 use Phalcon\Encryption\Security\JWT\Signer\Hmac;
-use Phalcon\Encryption\Security\JWT\Token\Enum;
-use Phalcon\Encryption\Security\JWT\Validator;
 use UnitTester;
 
 class VerifyCest
@@ -88,7 +86,7 @@ public function encryptionSecurityJWTTokenTokenVerifyWrongAlgo(UnitTester $I)
             ->getToken()
         ;
 
-        $signer     = Stub::make(
+        $signer = Stub::make(
             Hmac::class,
             [
                 'getAlgHeader' => 'xyz',
diff --git a/tests/unit/Events/Manager/DetachAllCest.php b/tests/unit/Events/Manager/DetachAllCest.php
index 90bb55dc381..8dfa9e08868 100644
--- a/tests/unit/Events/Manager/DetachAllCest.php
+++ b/tests/unit/Events/Manager/DetachAllCest.php
@@ -60,9 +60,9 @@ public function eventsManagerDetachAllWithType(UnitTester $I)
     {
         $I->wantToTest('Events\Manager - detachAll() - with type');
 
-        $uploadType   = 'some:upload';
+        $uploadType = 'some:upload';
         $downloadType = 'some:download';
-        $manager      = new Manager();
+        $manager = new Manager();
         $manager->attach(
             $uploadType,
             function () {
diff --git a/tests/unit/Filter/SanitizeCest.php b/tests/unit/Filter/SanitizeCest.php
index 458c57a549d..7b5d2632a34 100644
--- a/tests/unit/Filter/SanitizeCest.php
+++ b/tests/unit/Filter/SanitizeCest.php
@@ -48,7 +48,7 @@ public function filterSanitize(UnitTester $I, Example $example)
                 'Filter\Sanitize\* = %s - %s : "%s"',
                 $class,
                 $label,
-                (is_array($source) ? implode(":", $source) : (string) $source)
+                (is_array($source) ? implode(":", $source) : (string)$source)
             )
         );
 
diff --git a/tests/unit/Forms/FormEntityCest.php b/tests/unit/Forms/FormEntityCest.php
index fcb774116f3..04a1f4422a9 100644
--- a/tests/unit/Forms/FormEntityCest.php
+++ b/tests/unit/Forms/FormEntityCest.php
@@ -2,12 +2,12 @@
 
 namespace Phalcon\Tests\Unit\Forms;
 
+use Phalcon\Filter\Validation;
+use Phalcon\Filter\Validation\Validator\StringLength\Max;
 use Phalcon\Forms\Element\Text;
 use Phalcon\Forms\Form;
 use Phalcon\Tests\Fixtures\Traits\DiTrait;
 use Phalcon\Tests\Models\Products;
-use Phalcon\Filter\Validation;
-use Phalcon\Filter\Validation\Validator\StringLength\Max;
 use UnitTester;
 
 class FormEntityCest
diff --git a/tests/unit/Html/Attributes/ToStringCest.php b/tests/unit/Html/Attributes/ToStringCest.php
index 46a9ec1a2ef..3e13f2e59a0 100644
--- a/tests/unit/Html/Attributes/ToStringCest.php
+++ b/tests/unit/Html/Attributes/ToStringCest.php
@@ -47,7 +47,7 @@ public function htmlAttributesToString(UnitTester $I)
 
         $I->assertSame(
             'type="text" name="q" value="" class="form-control" ',
-            (string) $attributes
+            (string)$attributes
         );
     }
 }
diff --git a/tests/unit/Html/Escaper/AttributesCest.php b/tests/unit/Html/Escaper/AttributesCest.php
index 356b98c2019..b5ac3bda3f7 100644
--- a/tests/unit/Html/Escaper/AttributesCest.php
+++ b/tests/unit/Html/Escaper/AttributesCest.php
@@ -94,11 +94,11 @@ private function escaperEscapeHtmlAttrProvider(): array
                 'htmlQuoteType' => ENT_HTML5,
                 'expected'      => 'maxlength="10" cols="5" rows="3" min="1" max="100"',
                 'text'          => [
-                    'maxlength'  => 10,
-                    'cols'       => 5,
-                    'rows'       => 3,
-                    'min'        => 1,
-                    'max'        => 100,
+                    'maxlength'   => 10,
+                    'cols'        => 5,
+                    'rows'        => 3,
+                    'min'         => 1,
+                    'max'         => 100,
                     'notPrinted'  => false,
                     'notPrinted2' => null,
                 ],
@@ -112,11 +112,11 @@ private function escaperEscapeHtmlAttrProvider(): array
                 'htmlQuoteType' => ENT_HTML5,
                 'expected'      => 'maxlength="10" cols="5" rows="3" min="1" max="100"',
                 'text'          => [
-                    'maxlength'  => 10,
-                    'cols'       => 5,
-                    'rows'       => 3,
-                    'min'        => 1,
-                    'max'        => 100,
+                    'maxlength'   => 10,
+                    'cols'        => 5,
+                    'rows'        => 3,
+                    'min'         => 1,
+                    'max'         => 100,
                     'notPrinted'  => false,
                     'notPrinted2' => null,
                 ],
diff --git a/tests/unit/Html/Escaper/CssCest.php b/tests/unit/Html/Escaper/CssCest.php
index ac7b25bb607..f6b27fefeb1 100644
--- a/tests/unit/Html/Escaper/CssCest.php
+++ b/tests/unit/Html/Escaper/CssCest.php
@@ -37,10 +37,10 @@ public function escaperCss(UnitTester $I)
             . '\27 http\3a \2f \2f phalcon\2e io\2f a\2e php'
             . '\3f c\3d d\26 e\3d f\27 \29 \3b \20 \7d ';
 
-        $actual   = $escaper->css($source);
+        $actual = $escaper->css($source);
         $I->assertSame($expected, $actual);
 
-        $actual   = $escaper->escapeCss($source);
+        $actual = $escaper->escapeCss($source);
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Html/Escaper/JsCest.php b/tests/unit/Html/Escaper/JsCest.php
index 9bd36bafffa..7b88082e267 100644
--- a/tests/unit/Html/Escaper/JsCest.php
+++ b/tests/unit/Html/Escaper/JsCest.php
@@ -52,7 +52,7 @@ public function escaperJs(UnitTester $I)
         $actual   = $escaper->js($source);
         $I->assertSame($expected, $actual);
 
-        $actual   = $escaper->escapeJs($source);
+        $actual = $escaper->escapeJs($source);
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Doctype/ToStringCest.php b/tests/unit/Html/Helper/Doctype/ToStringCest.php
index a231b501d8c..23e58e7d7be 100644
--- a/tests/unit/Html/Helper/Doctype/ToStringCest.php
+++ b/tests/unit/Html/Helper/Doctype/ToStringCest.php
@@ -38,7 +38,7 @@ public function htmlHelperDoctypeToStringEmpty(UnitTester $I)
         $helper = new Doctype();
 
         $expected = "<!DOCTYPE html>" . PHP_EOL;
-        $actual   = (string) $helper;
+        $actual   = (string)$helper;
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Doctype/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Doctype/UnderscoreInvokeCest.php
index e02a87ec546..4b7c402b48a 100644
--- a/tests/unit/Html/Helper/Doctype/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Doctype/UnderscoreInvokeCest.php
@@ -39,7 +39,7 @@ public function htmlHelperDoctypeUnderscoreInvoke(UnitTester $I, Example $exampl
         $helper->__invoke($example['flag'], $example['delimiter']);
 
         $expected = $example['expected'];
-        $actual   = (string) $helper;
+        $actual   = (string)$helper;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php b/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php
index f93424a1295..6ec6e85460d 100644
--- a/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Input/CheckboxUnderscoreInvokeCest.php
@@ -50,7 +50,7 @@ public function htmlHelperInputCheckboxUnderscoreInvoke(UnitTester $I, Example $
 
         $I->assertSame(
             sprintf($example['render'], $example['render']),
-            (string) $result
+            (string)$result
         );
     }
 
@@ -80,7 +80,7 @@ public function htmlHelperInputRadioUnderscoreInvoke(UnitTester $I, Example $exa
 
         $I->assertSame(
             sprintf($example['render'], $example['render']),
-            (string) $result
+            (string)$result
         );
     }
 
diff --git a/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php b/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php
index 2f83d7fd93f..bfab5c203b6 100644
--- a/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Input/SelectUnderscoreInvokeCest.php
@@ -75,7 +75,7 @@ public function htmlHelperInputUnderscoreInvoke(UnitTester $I, Example $example)
         }
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -108,7 +108,7 @@ public function htmlHelperInputUnderscoreInvoke(UnitTester $I, Example $example)
             $result->optGroup($example['optgroup'][0], $example['optgroup'][1]);
         }
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php
index c943394cb81..ae00a4d84ae 100644
--- a/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Input/UnderscoreInvokeCest.php
@@ -22,7 +22,6 @@
 use Phalcon\Html\Helper\Input\File;
 use Phalcon\Html\Helper\Input\Hidden;
 use Phalcon\Html\Helper\Input\Image;
-use Phalcon\Html\Helper\Input\Input;
 use Phalcon\Html\Helper\Input\Month;
 use Phalcon\Html\Helper\Input\Numeric;
 use Phalcon\Html\Helper\Input\Password;
@@ -74,7 +73,7 @@ public function htmlHelperInputUnderscoreInvoke(UnitTester $I, Example $example)
             }
 
             $expected = sprintf($example['render'], $name);
-            $actual   = (string) $result;
+            $actual   = (string)$result;
             $I->assertSame($expected, $actual);
 
             $factory = new TagFactory($escaper);
@@ -85,7 +84,7 @@ public function htmlHelperInputUnderscoreInvoke(UnitTester $I, Example $example)
                 $result->setValue($example['newValue']);
             }
 
-            $actual = (string) $result;
+            $actual = (string)$result;
             $I->assertSame($expected, $actual);
         }
     }
@@ -116,7 +115,7 @@ public function htmlHelperInputUnderscoreInvokeTextarea(UnitTester $I)
 
         $expected = '<textarea id="x_name" name="x_name" cols="10" rows="5">' .
             'test text area</textarea>';
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -130,7 +129,7 @@ public function htmlHelperInputUnderscoreInvokeTextarea(UnitTester $I)
             ]
         );
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Link/ToStringCest.php b/tests/unit/Html/Helper/Link/ToStringCest.php
index 29472d207f1..8c90d42ac4c 100644
--- a/tests/unit/Html/Helper/Link/ToStringCest.php
+++ b/tests/unit/Html/Helper/Link/ToStringCest.php
@@ -39,7 +39,7 @@ public function htmlHelperLinkToStringEmpty(UnitTester $I)
 
         $result = $helper();
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertEmpty($actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php
index 8141df070c2..9ed41ac92a8 100644
--- a/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Link/UnderscoreInvokeCest.php
@@ -45,7 +45,7 @@ public function htmlHelperLinkUnderscoreInvoke(UnitTester $I, Example $example)
         }
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -56,7 +56,7 @@ public function htmlHelperLinkUnderscoreInvoke(UnitTester $I, Example $example)
             $result->add($url, $attributes);
         }
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Meta/ToStringCest.php b/tests/unit/Html/Helper/Meta/ToStringCest.php
index 6ad379ea901..0fb01f6f575 100644
--- a/tests/unit/Html/Helper/Meta/ToStringCest.php
+++ b/tests/unit/Html/Helper/Meta/ToStringCest.php
@@ -39,7 +39,7 @@ public function htmlHelperMetaToStringEmpty(UnitTester $I)
 
         $result = $helper();
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertEmpty($actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php
index 1e713d44c67..7b60772aa75 100644
--- a/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Meta/UnderscoreInvokeCest.php
@@ -51,10 +51,11 @@ public function htmlHelperMetaUnderscoreInvoke(UnitTester $I, Example $example)
             ->add($example['add'])
             ->addHttp($example['http'][0], $example['http'][1])
             ->addName($example['name'][0], $example['name'][1])
-            ->addProperty($example['property'][0], $example['property'][1]);
+            ->addProperty($example['property'][0], $example['property'][1])
+        ;
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -63,9 +64,10 @@ public function htmlHelperMetaUnderscoreInvoke(UnitTester $I, Example $example)
             ->add($example['add'])
             ->addHttp($example['http'][0], $example['http'][1])
             ->addName($example['name'][0], $example['name'][1])
-            ->addProperty($example['property'][0], $example['property'][1]);
+            ->addProperty($example['property'][0], $example['property'][1])
+        ;
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Ol/ToStringCest.php b/tests/unit/Html/Helper/Ol/ToStringCest.php
index d1cf9d89364..caf1d5e8ef8 100644
--- a/tests/unit/Html/Helper/Ol/ToStringCest.php
+++ b/tests/unit/Html/Helper/Ol/ToStringCest.php
@@ -41,7 +41,7 @@ public function htmlHelperOlToStringEmpty(UnitTester $I)
 
         $result = $helper('', PHP_EOL, ['id' => 'carsList']);
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertEmpty($actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php
index 58af594ade2..aef99b57110 100644
--- a/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Ol/UnderscoreInvokeCest.php
@@ -53,7 +53,7 @@ public function htmlHelperOlUnderscoreInvoke(UnitTester $I, Example $example)
         }
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -64,7 +64,7 @@ public function htmlHelperOlUnderscoreInvoke(UnitTester $I, Example $example)
             $result->add($add[0], $add[1], $add[2]);
         }
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Script/ToStringCest.php b/tests/unit/Html/Helper/Script/ToStringCest.php
index f96f46e3fce..8c02f1b2a03 100644
--- a/tests/unit/Html/Helper/Script/ToStringCest.php
+++ b/tests/unit/Html/Helper/Script/ToStringCest.php
@@ -39,7 +39,7 @@ public function htmlHelperScriptToStringEmpty(UnitTester $I)
 
         $result = $helper();
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertEmpty($actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php
index 5710a1b692b..95c47a3ded5 100644
--- a/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Script/UnderscoreInvokeCest.php
@@ -53,7 +53,7 @@ public function htmlHelperScriptUnderscoreInvoke(UnitTester $I, Example $example
         }
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -64,7 +64,7 @@ public function htmlHelperScriptUnderscoreInvoke(UnitTester $I, Example $example
             $result->add($add[0], $add[1]);
         }
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Style/ToStringCest.php b/tests/unit/Html/Helper/Style/ToStringCest.php
index 2c15f74ebcb..9c7b4ed249a 100644
--- a/tests/unit/Html/Helper/Style/ToStringCest.php
+++ b/tests/unit/Html/Helper/Style/ToStringCest.php
@@ -39,7 +39,7 @@ public function htmlHelperStyleToStringEmpty(UnitTester $I)
 
         $result = $helper();
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertEmpty($actual);
     }
 }
diff --git a/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php
index 6be135aa43c..6c261fb67eb 100644
--- a/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Style/UnderscoreInvokeCest.php
@@ -54,7 +54,7 @@ public function htmlHelperStyleUnderscoreInvoke(UnitTester $I, Example $example)
         }
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         /**
@@ -69,7 +69,7 @@ public function htmlHelperStyleUnderscoreInvoke(UnitTester $I, Example $example)
             $result->add($add[0], $add[1]);
         }
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
index 2ceb2347504..38afd0074df 100644
--- a/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Title/UnderscoreInvokeCest.php
@@ -79,7 +79,7 @@ public function htmlHelperTitleUnderscoreInvoke(UnitTester $I, Example $example)
         $I->assertSame($expected, $actual);
 
         $expected = $example['render'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -108,7 +108,7 @@ public function htmlHelperTitleUnderscoreInvoke(UnitTester $I, Example $example)
         $I->assertSame($expected, $actual);
 
         $expected = $example['render'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
@@ -143,7 +143,7 @@ public function htmlHelperTitlePrependTwice(UnitTester $I)
 
         // Start
         $expected = '    <title>' . $title . '</title>' . PHP_EOL;
-        $actual   = (string) $tag->title();
+        $actual   = (string)$tag->title();
         $I->assertSame($expected, $actual);
 
         $tag
@@ -159,9 +159,8 @@ public function htmlHelperTitlePrependTwice(UnitTester $I)
             . $separator
             . $title
             . '</title>'
-            . PHP_EOL
-        ;
-        $actual   = (string) $tag->title();
+            . PHP_EOL;
+        $actual   = (string)$tag->title();
         $I->assertSame($expected, $actual);
 
         $tag
@@ -180,9 +179,8 @@ public function htmlHelperTitlePrependTwice(UnitTester $I)
             . $separator
             . $title
             . '</title>'
-            . PHP_EOL
-        ;
-        $actual   = (string) $tag->title();
+            . PHP_EOL;
+        $actual   = (string)$tag->title();
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php b/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php
index 6593b9c50d0..948d1a8545c 100644
--- a/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php
+++ b/tests/unit/Html/Helper/Ul/UnderscoreInvokeCest.php
@@ -53,7 +53,7 @@ public function htmlHelperUlUnderscoreInvoke(UnitTester $I, Example $example)
         }
 
         $expected = $example['result'];
-        $actual   = (string) $result;
+        $actual   = (string)$result;
         $I->assertSame($expected, $actual);
 
         $factory = new TagFactory($escaper);
@@ -64,7 +64,7 @@ public function htmlHelperUlUnderscoreInvoke(UnitTester $I, Example $example)
             $result->add($add[0], $add[1], $add[2]);
         }
 
-        $actual = (string) $result;
+        $actual = (string)$result;
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Http/Cookie/ToStringCest.php b/tests/unit/Http/Cookie/ToStringCest.php
index ad7aaebca85..8fe6bfc3e8a 100644
--- a/tests/unit/Http/Cookie/ToStringCest.php
+++ b/tests/unit/Http/Cookie/ToStringCest.php
@@ -54,6 +54,6 @@ public function httpCookieToString(UnitTester $I)
             $options
         );
 
-        $I->assertSame('phalcon', (string) $cookie);
+        $I->assertSame('phalcon', (string)$cookie);
     }
 }
diff --git a/tests/unit/Http/Helper/HttpBase.php b/tests/unit/Http/Helper/HttpBase.php
index 22f3e30c64f..59f524db163 100644
--- a/tests/unit/Http/Helper/HttpBase.php
+++ b/tests/unit/Http/Helper/HttpBase.php
@@ -13,7 +13,6 @@
 
 namespace Phalcon\Tests\Unit\Http\Helper;
 
-use Phalcon\Di\Di;
 use Phalcon\Http\Request;
 use Phalcon\Http\Response;
 use Phalcon\Tests\Fixtures\Traits\DiTrait;
diff --git a/tests/unit/Http/Request/AuthHeaderCest.php b/tests/unit/Http/Request/AuthHeaderCest.php
index d228a6ed6ac..41c503311e5 100644
--- a/tests/unit/Http/Request/AuthHeaderCest.php
+++ b/tests/unit/Http/Request/AuthHeaderCest.php
@@ -289,7 +289,8 @@ private function authProvider(): array
                 ],
                 'getBasicAuth',
                 [
-                    'username' => 'myleft', 'password' => '123456',
+                    'username' => 'myleft',
+                    'password' => '123456',
                 ],
             ],
 
diff --git a/tests/unit/Http/Request/GetBestCharsetCest.php b/tests/unit/Http/Request/GetBestCharsetCest.php
index 54c837333b1..b6414e579bb 100644
--- a/tests/unit/Http/Request/GetBestCharsetCest.php
+++ b/tests/unit/Http/Request/GetBestCharsetCest.php
@@ -37,7 +37,7 @@ public function httpRequestGetBestCharset(UnitTester $I)
 
         $time    = $_SERVER['REQUEST_TIME_FLOAT'];
         $_SERVER = [
-            'REQUEST_TIME_FLOAT' => $time,
+            'REQUEST_TIME_FLOAT'  => $time,
             'HTTP_ACCEPT_CHARSET' => 'iso-8859-5,unicode-1-1;q=0.8',
         ];
 
diff --git a/tests/unit/Http/Request/GetBestLanguageCest.php b/tests/unit/Http/Request/GetBestLanguageCest.php
index e76fb47ec70..8448ac40ade 100644
--- a/tests/unit/Http/Request/GetBestLanguageCest.php
+++ b/tests/unit/Http/Request/GetBestLanguageCest.php
@@ -37,7 +37,7 @@ public function httpRequestGetBestLanguage(UnitTester $I)
 
         $time    = $_SERVER['REQUEST_TIME_FLOAT'];
         $_SERVER = [
-            'REQUEST_TIME_FLOAT' => $time,
+            'REQUEST_TIME_FLOAT'   => $time,
             'HTTP_ACCEPT_LANGUAGE' => 'es,es-ar;q=0.8,en;q=0.5,en-us;q=0.3,de-de; q=0.9',
         ];
 
diff --git a/tests/unit/Http/Request/GetFilteredPatchCest.php b/tests/unit/Http/Request/GetFilteredPatchCest.php
index 10b7071373b..8989cfc189f 100644
--- a/tests/unit/Http/Request/GetFilteredPatchCest.php
+++ b/tests/unit/Http/Request/GetFilteredPatchCest.php
@@ -54,7 +54,8 @@ public function httpRequestGetFilteredPatch(UnitTester $I)
         /** @var Request $request */
         $request = $container->get('request');
         $request
-            ->setParameterFilters('id', ['absint'], ['patch']);
+            ->setParameterFilters('id', ['absint'], ['patch'])
+        ;
 
         $expected = 24;
         $actual   = $request->getFilteredPut('id', 24);
diff --git a/tests/unit/Http/Request/GetFilteredPostCest.php b/tests/unit/Http/Request/GetFilteredPostCest.php
index 20a3d8f84eb..c660a990d6b 100644
--- a/tests/unit/Http/Request/GetFilteredPostCest.php
+++ b/tests/unit/Http/Request/GetFilteredPostCest.php
@@ -72,7 +72,8 @@ public function httpRequestGetFilteredDefault(UnitTester $I)
         /** @var Request $request */
         $request = $container->get('request');
         $request
-            ->setParameterFilters('id', ['absint'], ['post', 'get']);
+            ->setParameterFilters('id', ['absint'], ['post', 'get'])
+        ;
 
         $_GET  = ['no-id' => '24'];
         $_POST = ['no-id' => '24'];
diff --git a/tests/unit/Http/Request/GetFilteredPutCest.php b/tests/unit/Http/Request/GetFilteredPutCest.php
index 65b9477589f..072f0bafee2 100644
--- a/tests/unit/Http/Request/GetFilteredPutCest.php
+++ b/tests/unit/Http/Request/GetFilteredPutCest.php
@@ -53,7 +53,8 @@ public function httpRequestGetFilteredPut(UnitTester $I)
         /** @var Request $request */
         $request = $container->get('request');
         $request
-            ->setParameterFilters('id', ['absint'], ['put']);
+            ->setParameterFilters('id', ['absint'], ['put'])
+        ;
 
         $expected = 24;
         $actual   = $request->getFilteredPut('id', 24);
diff --git a/tests/unit/Http/Request/GetHeadersCest.php b/tests/unit/Http/Request/GetHeadersCest.php
index 6c4ad687b99..afba5cc6e73 100644
--- a/tests/unit/Http/Request/GetHeadersCest.php
+++ b/tests/unit/Http/Request/GetHeadersCest.php
@@ -33,9 +33,9 @@ public function httpRequestGetHeaders(UnitTester $I)
         $time    = $_SERVER['REQUEST_TIME_FLOAT'];
         $_SERVER = [
             'REQUEST_TIME_FLOAT' => $time,
-            'HTTP_FOO'     => 'Bar',
-            'HTTP_BLA_BLA' => 'boo',
-            'HTTP_AUTH'    => true,
+            'HTTP_FOO'           => 'Bar',
+            'HTTP_BLA_BLA'       => 'boo',
+            'HTTP_AUTH'          => true,
         ];
 
         $request = new Request();
diff --git a/tests/unit/Http/Request/GetJsonRawBodyCest.php b/tests/unit/Http/Request/GetJsonRawBodyCest.php
index 866569564c8..af6778e4368 100644
--- a/tests/unit/Http/Request/GetJsonRawBodyCest.php
+++ b/tests/unit/Http/Request/GetJsonRawBodyCest.php
@@ -15,6 +15,7 @@
 
 use Phalcon\Http\Request;
 use Phalcon\Tests\Fixtures\Http\PhpStream;
+use stdClass;
 use UnitTester;
 
 use function file_put_contents;
@@ -71,12 +72,12 @@ public function httpRequestGetJsonRawBodyWhenBodyIsEmpty(UnitTester $I)
         stream_wrapper_unregister('php');
         stream_wrapper_register('php', PhpStream::class);
 
-        $input = json_encode(new \stdClass());
+        $input = json_encode(new stdClass());
 
         file_put_contents('php://input', $input);
 
         $expected = json_decode($input);
-        $actual = $request->getJsonRawBody();
+        $actual   = $request->getJsonRawBody();
 
         $I->assertEquals($expected, $actual);
 
diff --git a/tests/unit/Http/Response/ConstructCest.php b/tests/unit/Http/Response/ConstructCest.php
index f8af2c835ce..850653d40a5 100644
--- a/tests/unit/Http/Response/ConstructCest.php
+++ b/tests/unit/Http/Response/ConstructCest.php
@@ -22,7 +22,7 @@ class ConstructCest
     /**
      * Tests Phalcon\Http\Response :: __construct()
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Jeremy PASTOURET <https://github.com/jenovateurs>
      * @since  2019-12-08
@@ -42,7 +42,7 @@ public function httpResponseConstruct(UnitTester $I)
     /**
      * Tests Phalcon\Http\Response :: __construct(content = [array])
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Phalcon Team <team@phalcon.io>
      * @since  2020-05-02
@@ -75,7 +75,7 @@ public function httpResponseConstructWithIncorrectDataType(UnitTester $I)
     /**
      * Tests Phalcon\Http\Response :: __construct(content = null)
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Jeremy PASTOURET <https://github.com/jenovateurs>
      * @since  2019-12-08
@@ -97,7 +97,7 @@ public function httpResponseConstructWithContent(UnitTester $I)
     /**
      * Tests Phalcon\Http\Response :: __construct(content = null, code = null)
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Jeremy PASTOURET <https://github.com/jenovateurs>
      * @since  2019-12-08
@@ -133,7 +133,7 @@ public function httpResponseConstructWithContentCode(UnitTester $I)
      * Tests Phalcon\Http\Response :: __construct(content = null, code = null,
      * status = null)
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Jeremy PASTOURET <https://github.com/jenovateurs>
      * @since  2019-12-08
diff --git a/tests/unit/Http/Response/Cookies/DeleteCest.php b/tests/unit/Http/Response/Cookies/DeleteCest.php
index 04735247eb6..fcc6470e4c8 100644
--- a/tests/unit/Http/Response/Cookies/DeleteCest.php
+++ b/tests/unit/Http/Response/Cookies/DeleteCest.php
@@ -26,6 +26,7 @@ class DeleteCest extends HttpBase
      * Executed before each test
      *
      * @param UnitTester $I
+     *
      * @return void
      */
     public function _before(UnitTester $I): void
diff --git a/tests/unit/Http/Response/Cookies/GetSetCest.php b/tests/unit/Http/Response/Cookies/GetSetCest.php
index df95befb6f4..358f9ecee83 100644
--- a/tests/unit/Http/Response/Cookies/GetSetCest.php
+++ b/tests/unit/Http/Response/Cookies/GetSetCest.php
@@ -114,7 +114,7 @@ public function httpCookieSetOptions(UnitTester $I)
             'localhost',
             false,
             [
-                'samesite' => 'None'
+                'samesite' => 'None',
             ]
         );
 
@@ -127,7 +127,7 @@ public function httpCookieSetOptions(UnitTester $I)
             'localhost',
             false,
             [
-                'samesite' => 'Lax'
+                'samesite' => 'Lax',
             ]
         );
 
@@ -140,7 +140,7 @@ public function httpCookieSetOptions(UnitTester $I)
             'localhost',
             false,
             [
-                'samesite' => 'Strict'
+                'samesite' => 'Strict',
             ]
         );
 
diff --git a/tests/unit/Http/Response/Cookies/SetSignKeyCest.php b/tests/unit/Http/Response/Cookies/SetSignKeyCest.php
index 25de178575c..331a8097342 100644
--- a/tests/unit/Http/Response/Cookies/SetSignKeyCest.php
+++ b/tests/unit/Http/Response/Cookies/SetSignKeyCest.php
@@ -27,6 +27,7 @@ class SetSignKeyCest extends HttpBase
      * Executed before each test
      *
      * @param UnitTester $I
+     *
      * @return void
      */
     public function _before(UnitTester $I): void
diff --git a/tests/unit/Http/Response/GetSetContentCest.php b/tests/unit/Http/Response/GetSetContentCest.php
index 6f25f19939a..e7bb231d72c 100644
--- a/tests/unit/Http/Response/GetSetContentCest.php
+++ b/tests/unit/Http/Response/GetSetContentCest.php
@@ -21,7 +21,7 @@ class GetSetContentCest
     /**
      * Tests Phalcon\Http\Response :: getContent() / setContent()
      *
-     * @param  UnitTester $I
+     * @param UnitTester $I
      *
      * @author Jeremy PASTOURET <https://github.com/jenovateurs>
      * @since  2019-12-08
diff --git a/tests/unit/Http/Response/GetSetStatusCodeCest.php b/tests/unit/Http/Response/GetSetStatusCodeCest.php
index b5d1c98fbb6..bb3c293b726 100644
--- a/tests/unit/Http/Response/GetSetStatusCodeCest.php
+++ b/tests/unit/Http/Response/GetSetStatusCodeCest.php
@@ -34,7 +34,7 @@ public function httpResponseGetSetStatusCode(UnitTester $I)
     {
         $I->wantToTest('Http\Response - getStatusCode() / setStatusCode()');
 
-        $code     = 200;
+        $code = 200;
         $response = $this->getResponseObject();
         $response->setStatusCode($code);
 
@@ -162,7 +162,7 @@ public function testHttpResponseSetStatusCodeSend(UnitTester $I)
 
         $expected = [
             "Status: 404 Not Found",
-            "Content-Type: application/json"
+            "Content-Type: application/json",
         ];
         $actual   = xdebug_get_headers();
         $I->assertSame($expected, $actual);
@@ -201,7 +201,7 @@ function () {
 
         $expected = [
             "Status: 404 Not Found",
-            "Content-Type: application/json"
+            "Content-Type: application/json",
         ];
         $actual   = xdebug_get_headers();
         $I->assertSame($expected, $actual);
diff --git a/tests/unit/Http/Response/SetContentLengthCest.php b/tests/unit/Http/Response/SetContentLengthCest.php
index ebfffb5941c..4f3bc1eeb9e 100644
--- a/tests/unit/Http/Response/SetContentLengthCest.php
+++ b/tests/unit/Http/Response/SetContentLengthCest.php
@@ -32,9 +32,9 @@ public function testHttpResponseSetContentLength(UnitTester $I)
 
         $response->setContentLength(100);
 
-        $headers = $response->getHeaders();
+        $headers  = $response->getHeaders();
         $expected = 100;
-        $actual   = (int) $headers->get('Content-Length');
+        $actual   = (int)$headers->get('Content-Length');
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Http/Response/SetEtagCest.php b/tests/unit/Http/Response/SetEtagCest.php
index d3dd8633ef9..2cc102dd43c 100644
--- a/tests/unit/Http/Response/SetEtagCest.php
+++ b/tests/unit/Http/Response/SetEtagCest.php
@@ -31,7 +31,7 @@ public function httpResponseSetEtag(UnitTester $I)
         $response = new Response();
 
         $etag = md5(
-            (string) time()
+            (string)time()
         );
 
         $response->setEtag($etag);
diff --git a/tests/unit/Image/Adapter/Gd/ReflectionCest.php b/tests/unit/Image/Adapter/Gd/ReflectionCest.php
index a7cc4092a8a..661213e6fc8 100644
--- a/tests/unit/Image/Adapter/Gd/ReflectionCest.php
+++ b/tests/unit/Image/Adapter/Gd/ReflectionCest.php
@@ -68,7 +68,7 @@ public function imageAdapterGdReflection(UnitTester $I)
 
         foreach ($this->getImages() as $type => $imagePath) {
             foreach ($params[$type] as [$height, $opacity, $fade, $hash]) {
-                $resultImage = 'reflection-' . $height . '-' . $opacity . '-' . ((int) $fade) . '.' . $type;
+                $resultImage = 'reflection-' . $height . '-' . $opacity . '-' . ((int)$fade) . '.' . $type;
                 $output      = outputDir($outputDir . '/' . $resultImage);
 
                 $image = new Gd($imagePath);
diff --git a/tests/unit/Image/Adapter/Gd/RotateCest.php b/tests/unit/Image/Adapter/Gd/RotateCest.php
index 165c627f11b..073810fb9bd 100644
--- a/tests/unit/Image/Adapter/Gd/RotateCest.php
+++ b/tests/unit/Image/Adapter/Gd/RotateCest.php
@@ -101,56 +101,56 @@ private function getExamples(): array
 //                'degrees' => 270,
 //                'hash'    => 'ffffffffffffffff',
 //            ],
-            [
-                'label'   => 'jpg',
-                'degrees' => 0,
-                'hash'    => 'fbf9f3e3c3c18183',
-            ],
-            [
-                'label'   => 'jpg',
-                'degrees' => 45,
-                'hash'    => '60f0f83c1c0f0f06',
-            ],
-            [
-                'label'   => 'jpg',
-                'degrees' => 90,
-                'hash'    => 'ff3f0f0703009dff',
-            ],
-            [
-                'label'   => 'jpg',
-                'degrees' => 180,
-                'hash'    => 'c18183c3c7cf9fdf',
-            ],
-            [
-                'label'   => 'jpg',
-                'degrees' => 270,
-                'hash'    => 'ffb900c0e0f0fcff',
-            ],
-            [
-                'label'   => 'png',
-                'degrees' => 0,
-                'hash'    => '30787c3c1e181818',
-            ],
-            [
-                'label'   => 'png',
-                'degrees' => 45,
-                'hash'    => '001c1c1c7c3c0000',
-            ],
-            [
-                'label'   => 'png',
-                'degrees' => 90,
-                'hash'    => '00060ffffe1c1000',
-            ],
-            [
-                'label'   => 'png',
-                'degrees' => 180,
-                'hash'    => '181818783c3e1e0c',
-            ],
-            [
-                'label'   => 'png',
-                'degrees' => 270,
-                'hash'    => '0008387ffff06000',
-            ],
+        [
+        'label'   => 'jpg',
+        'degrees' => 0,
+        'hash'    => 'fbf9f3e3c3c18183',
+        ],
+        [
+        'label'   => 'jpg',
+        'degrees' => 45,
+        'hash'    => '60f0f83c1c0f0f06',
+        ],
+        [
+        'label'   => 'jpg',
+        'degrees' => 90,
+        'hash'    => 'ff3f0f0703009dff',
+        ],
+        [
+        'label'   => 'jpg',
+        'degrees' => 180,
+        'hash'    => 'c18183c3c7cf9fdf',
+        ],
+        [
+        'label'   => 'jpg',
+        'degrees' => 270,
+        'hash'    => 'ffb900c0e0f0fcff',
+        ],
+        [
+        'label'   => 'png',
+        'degrees' => 0,
+        'hash'    => '30787c3c1e181818',
+        ],
+        [
+        'label'   => 'png',
+        'degrees' => 45,
+        'hash'    => '001c1c1c7c3c0000',
+        ],
+        [
+        'label'   => 'png',
+        'degrees' => 90,
+        'hash'    => '00060ffffe1c1000',
+        ],
+        [
+        'label'   => 'png',
+        'degrees' => 180,
+        'hash'    => '181818783c3e1e0c',
+        ],
+        [
+        'label'   => 'png',
+        'degrees' => 270,
+        'hash'    => '0008387ffff06000',
+        ],
 //            [
 //                'label'   => 'wbmp',
 //                'degrees' => 0,
diff --git a/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
index a45e02b2079..7d729f61175 100644
--- a/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
@@ -35,9 +35,9 @@ public function loggerAdapterStreamSerializeUnserialize(UnitTester $I)
         $I->expectThrowable(
             new Exception("This object cannot be serialized"),
             function () use ($I) {
-                $fileName   = $I->getNewFileName('log', 'log');
+                $fileName = $I->getNewFileName('log', 'log');
                 $outputPath = logsDir();
-                $adapter    = new Stream($outputPath . $fileName);
+                $adapter = new Stream($outputPath . $fileName);
 
                 $object = serialize($adapter);
             }
diff --git a/tests/unit/Logger/Formatter/Line/FormatCest.php b/tests/unit/Logger/Formatter/Line/FormatCest.php
index f215037f5e8..96baece736b 100644
--- a/tests/unit/Logger/Formatter/Line/FormatCest.php
+++ b/tests/unit/Logger/Formatter/Line/FormatCest.php
@@ -53,7 +53,7 @@ public function loggerFormatterLineFormat(UnitTester $I)
             '[%s][debug] log message',
             $datetime->format('c')
         );
-        $actual = $formatter->format($item);
+        $actual   = $formatter->format($item);
         $I->assertSame($expected, $actual);
     }
 
@@ -84,7 +84,7 @@ public function loggerFormatterLineFormatCustom(UnitTester $I)
             'log message-[debug]-%s',
             $datetime->format('c')
         );
-        $actual = $formatter->format($item);
+        $actual   = $formatter->format($item);
         $I->assertSame($expected, $actual);
     }
 
@@ -124,11 +124,11 @@ public function loggerFormatterLineFormatCustomWithMilliseconds(UnitTester $I)
         $I->assertCount($expected, $actual);
 
         $expected = 0;
-        $actual   = (int) $parts[0];
+        $actual   = (int)$parts[0];
         $I->assertGreaterThan($expected, $actual);
 
         $expected = 0;
-        $actual   = (int) $parts[1];
+        $actual   = (int)$parts[1];
         $I->assertGreaterThan($expected, $actual);
     }
 
@@ -170,7 +170,7 @@ public function loggerFormatterLineFormatCustomInterpolator(UnitTester $I)
             $context['server'],
             $context['user']
         );
-        $actual = $formatter->format($item);
+        $actual   = $formatter->format($item);
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Logger/Logger/ConstructCest.php b/tests/unit/Logger/Logger/ConstructCest.php
index 370a9b6f559..62b498173fd 100644
--- a/tests/unit/Logger/Logger/ConstructCest.php
+++ b/tests/unit/Logger/Logger/ConstructCest.php
@@ -74,9 +74,9 @@ public function loggerConstructStreamWithJsonConstants(UnitTester $I)
     {
         $I->wantToTest('Logger - __construct() - file with json formatter');
 
-        $fileName   = $I->getNewFileName('log', 'log');
+        $fileName = $I->getNewFileName('log', 'log');
         $outputPath = logsDir();
-        $adapter    = new Stream($outputPath . $fileName);
+        $adapter = new Stream($outputPath . $fileName);
 
         $adapter->setFormatter(new Json());
 
diff --git a/tests/unit/Logger/Logger/LogCest.php b/tests/unit/Logger/Logger/LogCest.php
index b8efd68be48..f637f5cabac 100644
--- a/tests/unit/Logger/Logger/LogCest.php
+++ b/tests/unit/Logger/Logger/LogCest.php
@@ -192,11 +192,11 @@ public function loggerLogLogInterpolator(UnitTester $I)
             '%message%-[%level%]-%server%:%user%',
             'U.u'
         );
-        $context  = [
+        $context   = [
             'server' => uniqid('srv-'),
             'user'   => uniqid('usr-'),
         ];
-        $adapter  = new Stream($logPath . $fileName);
+        $adapter   = new Stream($logPath . $fileName);
         $adapter->setFormatter($formatter);
 
         $logger = new Logger(
@@ -242,11 +242,11 @@ public function loggerLogLogInterpolatorCustom(UnitTester $I)
             '{',
             '}'
         );
-        $context  = [
+        $context   = [
             'server' => uniqid('srv-'),
             'user'   => uniqid('usr-'),
         ];
-        $adapter  = new Stream($logPath . $fileName);
+        $adapter   = new Stream($logPath . $fileName);
         $adapter->setFormatter($formatter);
 
         $logger = new Logger(
diff --git a/tests/unit/Logger/LoggerFactory/NewInstanceCest.php b/tests/unit/Logger/LoggerFactory/NewInstanceCest.php
index c617d7e8523..84c88daa776 100644
--- a/tests/unit/Logger/LoggerFactory/NewInstanceCest.php
+++ b/tests/unit/Logger/LoggerFactory/NewInstanceCest.php
@@ -41,11 +41,11 @@ public function loggerLoggerFactoryNewInstance(UnitTester $I)
     {
         $I->wantToTest('Logger\LoggerFactory - newInstance()');
 
-        $logPath  = logsDir();
+        $logPath = logsDir();
         $fileName = $I->getNewFileName('log', 'log');
-        $adapter  = new Stream($logPath . $fileName);
-        $factory  = new LoggerFactory(new AdapterFactory());
-        $logger   = $factory->newInstance(
+        $adapter = new Stream($logPath . $fileName);
+        $factory = new LoggerFactory(new AdapterFactory());
+        $logger = $factory->newInstance(
             'my-logger',
             [
                 'one' => $adapter,
diff --git a/tests/unit/Messages/Message/ToStringCest.php b/tests/unit/Messages/Message/ToStringCest.php
index bedc88e2142..875049c349e 100644
--- a/tests/unit/Messages/Message/ToStringCest.php
+++ b/tests/unit/Messages/Message/ToStringCest.php
@@ -62,7 +62,7 @@ public function messagesMessageToStringCast(UnitTester $I): void
         );
 
         $expected = 'This is a message #1';
-        $actual   = (string) $message;
+        $actual   = (string)$message;
         $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/unit/Mvc/GlobalsCest.php b/tests/unit/Mvc/GlobalsCest.php
index 26192120ed0..e5e0571b1b1 100644
--- a/tests/unit/Mvc/GlobalsCest.php
+++ b/tests/unit/Mvc/GlobalsCest.php
@@ -28,8 +28,8 @@ class GlobalsCest
      * @param UnitTester $I
      * @param Example    $example
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2021-10-24
+     * @author       Phalcon Team <team@phalcon.io>
+     * @since        2021-10-24
      * @issue  https://github.com/phalcon/cphalcon/issues/15269
      */
     public function mvcModelGlobals(UnitTester $I, Example $example)
@@ -53,7 +53,7 @@ private function getExamples(): array
                 'setting' => 'phalcon.db.escape_identifiers',
                 'value'   => '1',
             ],
-                [
+            [
                 'setting' => 'phalcon.db.force_casting',
                 'value'   => '0',
             ],
diff --git a/tests/unit/Mvc/Model/Query/GetExpressionCest.php b/tests/unit/Mvc/Model/Query/GetExpressionCest.php
index ac250e50053..ba0a92b5bda 100644
--- a/tests/unit/Mvc/Model/Query/GetExpressionCest.php
+++ b/tests/unit/Mvc/Model/Query/GetExpressionCest.php
@@ -14,12 +14,13 @@
 namespace Phalcon\Test\Unit\Mvc\Model\Query;
 
 use Phalcon\Mvc\Model\Query;
+use ReflectionClass;
 use UnitTester;
 
 class GetExpressionCest
 {
     private $PHQL_T_AND = 266;
-    private $PHQL_T_OR = 267;
+    private $PHQL_T_OR  = 267;
 
     /**
      * Tests Phalcon\Mvc\Model\Query :: getExpression()
@@ -33,15 +34,15 @@ public function mvcModelQueryGetExpression(UnitTester $I)
         $I->wantToTest('Phalcon\Mvc\Model\Query - getExpression()');
 
         $valueOne = [
-            'type' => 'binary-op',
-            'op' => 'AND',
-            'left' => null,
+            'type'  => 'binary-op',
+            'op'    => 'AND',
+            'left'  => null,
             'right' => null,
         ];
         $valueTwo = [
-            'type' => 'binary-op',
-            'op' => 'OR',
-            'left' => null,
+            'type'  => 'binary-op',
+            'op'    => 'OR',
+            'left'  => null,
             'right' => null,
         ];
 
@@ -53,8 +54,8 @@ public function mvcModelQueryGetExpression(UnitTester $I)
             'type' => $this->PHQL_T_OR,
         ];
 
-        $query = new Query();
-        $reflection = new \ReflectionClass(Query::class);
+        $query         = new Query();
+        $reflection    = new ReflectionClass(Query::class);
         $getExpression = $reflection->getMethod('getExpression');
         $getExpression->setAccessible(true);
 
diff --git a/tests/unit/Session/ManagerCest.php b/tests/unit/Session/ManagerCest.php
index 9a5438a4fdf..559ac5f370a 100644
--- a/tests/unit/Session/ManagerCest.php
+++ b/tests/unit/Session/ManagerCest.php
@@ -20,8 +20,8 @@
 
 use function session_abort;
 use function session_destroy;
-use function session_status;
 use function session_name;
+use function session_status;
 
 class ManagerCest
 {
@@ -61,7 +61,7 @@ public function managerStart(UnitTester $I)
      * @example {"session": "valid", "expected": true}
      * @example {"session": "./invalid", "expected": false}
      *
-     * @since 2021-02-02
+     * @since   2021-02-02
      */
     public function validateSessionValue(UnitTester $I, Example $example)
     {
diff --git a/tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php b/tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php
index 4a0e825e111..c78d894c625 100644
--- a/tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php
+++ b/tests/unit/Support/Collection/ReadOnlyCollection/RemoveCest.php
@@ -32,9 +32,9 @@ public function supportCollectionRemove(UnitTester $I)
         $I->wantToTest('Support\Collection\ReadOnlyCollection - remove()');
 
         $data       = [
-            'one'   => 'two',
+            'one' => 'two',
             'three' => 'four',
-            'five'  => 'six',
+            'five' => 'six',
         ];
         $collection = new ReadOnlyCollection($data);
 
diff --git a/tests/unit/Support/Helper/Arr/OrderCest.php b/tests/unit/Support/Helper/Arr/OrderCest.php
index 4b7762cb3c4..8ab8fcc09de 100644
--- a/tests/unit/Support/Helper/Arr/OrderCest.php
+++ b/tests/unit/Support/Helper/Arr/OrderCest.php
@@ -86,30 +86,30 @@ public function supportHelperArrOrder(UnitTester $I)
         $I->assertSame($expected, $actual);
 
         $collection = [
-            (object) [
+            (object)[
                 'id'   => 2,
                 'name' => 'Paul',
             ],
-            (object) [
+            (object)[
                 'id'   => 3,
                 'name' => 'Peter',
             ],
-            (object) [
+            (object)[
                 'id'   => 1,
                 'name' => 'John',
             ],
         ];
 
         $expected = [
-            (object) [
+            (object)[
                 'id'   => 1,
                 'name' => 'John',
             ],
-            (object) [
+            (object)[
                 'id'   => 2,
                 'name' => 'Paul',
             ],
-            (object) [
+            (object)[
                 'id'   => 3,
                 'name' => 'Peter',
             ],
diff --git a/tests/unit/Support/Helper/Arr/PluckCest.php b/tests/unit/Support/Helper/Arr/PluckCest.php
index 1903b5c67b9..51e96cb06be 100644
--- a/tests/unit/Support/Helper/Arr/PluckCest.php
+++ b/tests/unit/Support/Helper/Arr/PluckCest.php
@@ -60,8 +60,8 @@ public function supportHelperArrPluckObject(UnitTester $I)
 
         $object     = new Pluck();
         $collection = [
-            (object) ['product_id' => 'prod-100', 'name' => 'Desk'],
-            (object) ['product_id' => 'prod-200', 'name' => 'Chair'],
+            (object)['product_id' => 'prod-100', 'name' => 'Desk'],
+            (object)['product_id' => 'prod-200', 'name' => 'Chair'],
         ];
 
         $expected = ['Desk', 'Chair'];
diff --git a/tests/unit/Support/Helper/Arr/ValidateAllCest.php b/tests/unit/Support/Helper/Arr/ValidateAllCest.php
index 9c22e5140fb..5ccda1ac890 100644
--- a/tests/unit/Support/Helper/Arr/ValidateAllCest.php
+++ b/tests/unit/Support/Helper/Arr/ValidateAllCest.php
@@ -35,9 +35,9 @@ public function supportHelperArrValidateAll(UnitTester $I)
     {
         $I->wantToTest('Support\Helper\Arr - validateAll()');
 
-        $object     = new ValidateAll();
+        $object = new ValidateAll();
         $collection = [2, 3, 4, 5];
-        $actual     = $object(
+        $actual = $object(
             $collection,
             function ($element) {
                 return $element > 1;
diff --git a/tests/unit/Support/Helper/Arr/ValidateAnyCest.php b/tests/unit/Support/Helper/Arr/ValidateAnyCest.php
index 53e217249c8..a00008dc370 100644
--- a/tests/unit/Support/Helper/Arr/ValidateAnyCest.php
+++ b/tests/unit/Support/Helper/Arr/ValidateAnyCest.php
@@ -35,9 +35,9 @@ public function supportHelperArrValidateAny(UnitTester $I)
     {
         $I->wantToTest('Support\Helper\Arr - validateAny()');
 
-        $object     = new ValidateAny();
+        $object = new ValidateAny();
         $collection = [1, 2, 3, 4, 5];
-        $actual     = $object(
+        $actual = $object(
             $collection,
             function ($element) {
                 return $element < 2;
diff --git a/tests/unit/Support/Helper/Json/DecodeCest.php b/tests/unit/Support/Helper/Json/DecodeCest.php
index 7f4312719c5..f007f7e2abe 100644
--- a/tests/unit/Support/Helper/Json/DecodeCest.php
+++ b/tests/unit/Support/Helper/Json/DecodeCest.php
@@ -31,13 +31,13 @@ public function supportHelperJsonDecode(UnitTester $I)
     {
         $I->wantToTest('Support\Helper\Json - decode()');
 
-        $object   = new Decode();
-        $data     = '{"one":"two","0":"three"}';
+        $object = new Decode();
+        $data = '{"one":"two","0":"three"}';
         $expected = [
             'one' => 'two',
             'three',
         ];
-        $actual   = $object($data, true);
+        $actual = $object($data, true);
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Support/Helper/Json/EncodeCest.php b/tests/unit/Support/Helper/Json/EncodeCest.php
index 33c6d31ff8a..256bdb79baa 100644
--- a/tests/unit/Support/Helper/Json/EncodeCest.php
+++ b/tests/unit/Support/Helper/Json/EncodeCest.php
@@ -33,13 +33,13 @@ public function supportHelperJsonEncode(UnitTester $I)
     {
         $I->wantToTest('Support\Helper\Json - encode()');
 
-        $object   = new Encode();
-        $data     = [
+        $object = new Encode();
+        $data = [
             'one' => 'two',
             'three',
         ];
         $expected = '{"one":"two","0":"three"}';
-        $actual   = $object($data);
+        $actual = $object($data);
         $I->assertSame($expected, $actual);
     }
 
diff --git a/tests/unit/Support/HelperFactory/NewInstanceCest.php b/tests/unit/Support/HelperFactory/NewInstanceCest.php
index 7ef15e537c6..07ec662d3d7 100644
--- a/tests/unit/Support/HelperFactory/NewInstanceCest.php
+++ b/tests/unit/Support/HelperFactory/NewInstanceCest.php
@@ -95,10 +95,10 @@ public function supportHelperFactoryNewInstance(UnitTester $I, Example $example)
 
         $factory = new HelperFactory();
 
-        $method   = $example[0];
-        $class    = $example[1];
+        $method = $example[0];
+        $class = $example[1];
         $expected = $class;
-        $actual   = $factory->newInstance($method);
+        $actual = $factory->newInstance($method);
         $I->assertInstanceOf($expected, $actual);
     }
 
@@ -130,65 +130,65 @@ function () use ($name) {
     private function getExamples(): array
     {
         return [
-            ["blacklist",      Blacklist::class],
-            ["chunk",          Chunk::class],
-            ["filter",         Filter::class],
-            ["first",          First::class],
-            ["firstKey",       FirstKey::class],
-            ["flatten",        Flatten::class],
-            ["get",            Get::class],
-            ["group",          Group::class],
-            ["has",            Has::class],
-            ["isUnique",       IsUnique::class],
-            ["last",           Last::class],
-            ["lastKey",        LastKey::class],
-            ["order",          Order::class],
-            ["pluck",          Pluck::class],
-            ["set",            Set::class],
-            ["sliceLeft",      SliceLeft::class],
-            ["sliceRight",     SliceRight::class],
-            ["split",          Split::class],
-            ["toObject",       ToObject::class],
-            ["validateAll",    ValidateAll::class],
-            ["validateAny",    ValidateAny::class],
-            ["whitelist",      Whitelist::class],
-            ["basename",       Basename::class],
-            ["decode",         Decode::class],
-            ["encode",         Encode::class],
-            ["isBetween",      IsBetween::class],
-            ["camelize",       Camelize::class],
-            ["concat",         Concat::class],
-            ["countVowels",    CountVowels::class],
-            ["decapitalize",   Decapitalize::class],
-            ["decrement",      Decrement::class],
-            ["dirFromFile",    DirFromFile::class],
-            ["dirSeparator",   DirSeparator::class],
-            ["dynamic",        Dynamic::class],
-            ["endsWith",       EndsWith::class],
-            ["firstBetween",   FirstBetween::class],
-            ["friendly",       Friendly::class],
-            ["humanize",       Humanize::class],
-            ["includes",       Includes::class],
-            ["increment",      Increment::class],
-            ["interpolate",    Interpolate::class],
-            ["isAnagram",      IsAnagram::class],
-            ["isLower",        IsLower::class],
-            ["isPalindrome",   IsPalindrome::class],
-            ["isUpper",        IsUpper::class],
-            ["kebabCase",      KebabCase::class],
-            ["len",            Len::class],
-            ["lower",          Lower::class],
-            ["prefix",         Prefix::class],
-            ["pascalCase",     PascalCase::class],
-            ["random",         Random::class],
-            ["reduceSlashes",  ReduceSlashes::class],
-            ["startsWith",     StartsWith::class],
-            ["snakeCase",      SnakeCase::class],
-            ["suffix",         Suffix::class],
-            ["ucwords",        Ucwords::class],
-            ["uncamelize",     Uncamelize::class],
-            ["underscore",     Underscore::class],
-            ["upper",          Upper::class],
+            ["blacklist", Blacklist::class],
+            ["chunk", Chunk::class],
+            ["filter", Filter::class],
+            ["first", First::class],
+            ["firstKey", FirstKey::class],
+            ["flatten", Flatten::class],
+            ["get", Get::class],
+            ["group", Group::class],
+            ["has", Has::class],
+            ["isUnique", IsUnique::class],
+            ["last", Last::class],
+            ["lastKey", LastKey::class],
+            ["order", Order::class],
+            ["pluck", Pluck::class],
+            ["set", Set::class],
+            ["sliceLeft", SliceLeft::class],
+            ["sliceRight", SliceRight::class],
+            ["split", Split::class],
+            ["toObject", ToObject::class],
+            ["validateAll", ValidateAll::class],
+            ["validateAny", ValidateAny::class],
+            ["whitelist", Whitelist::class],
+            ["basename", Basename::class],
+            ["decode", Decode::class],
+            ["encode", Encode::class],
+            ["isBetween", IsBetween::class],
+            ["camelize", Camelize::class],
+            ["concat", Concat::class],
+            ["countVowels", CountVowels::class],
+            ["decapitalize", Decapitalize::class],
+            ["decrement", Decrement::class],
+            ["dirFromFile", DirFromFile::class],
+            ["dirSeparator", DirSeparator::class],
+            ["dynamic", Dynamic::class],
+            ["endsWith", EndsWith::class],
+            ["firstBetween", FirstBetween::class],
+            ["friendly", Friendly::class],
+            ["humanize", Humanize::class],
+            ["includes", Includes::class],
+            ["increment", Increment::class],
+            ["interpolate", Interpolate::class],
+            ["isAnagram", IsAnagram::class],
+            ["isLower", IsLower::class],
+            ["isPalindrome", IsPalindrome::class],
+            ["isUpper", IsUpper::class],
+            ["kebabCase", KebabCase::class],
+            ["len", Len::class],
+            ["lower", Lower::class],
+            ["prefix", Prefix::class],
+            ["pascalCase", PascalCase::class],
+            ["random", Random::class],
+            ["reduceSlashes", ReduceSlashes::class],
+            ["startsWith", StartsWith::class],
+            ["snakeCase", SnakeCase::class],
+            ["suffix", Suffix::class],
+            ["ucwords", Ucwords::class],
+            ["uncamelize", Uncamelize::class],
+            ["underscore", Underscore::class],
+            ["upper", Upper::class],
         ];
     }
 }
diff --git a/tests/unit/Support/Version/GetPartCest.php b/tests/unit/Support/Version/GetPartCest.php
index 10e43a0afa4..69192ec7f77 100644
--- a/tests/unit/Support/Version/GetPartCest.php
+++ b/tests/unit/Support/Version/GetPartCest.php
@@ -42,27 +42,27 @@ public function supportVersionGetPart(UnitTester $I)
         $id      = $version->getId();
 
         // The major version is the first digit
-        $expected = (string) $id[0];
+        $expected = (string)$id[0];
         $actual   = $version->getPart(Version::VERSION_MAJOR);
         $I->assertSame($expected, $actual);
 
         // The medium version is the second and third digits
         // This is int to string because we might end up with "00"
-        $expected = (string) intval($id[1] . $id[2]);
+        $expected = (string)intval($id[1] . $id[2]);
         $actual   = $version->getPart(Version::VERSION_MEDIUM);
         $I->assertSame($expected, $actual);
 
         // The minor version is the fourth and fifth digits
-        $expected = (string) intval($id[3] . $id[4]);
+        $expected = (string)intval($id[3] . $id[4]);
         $actual   = $version->getPart(Version::VERSION_MINOR);
         $I->assertSame($expected, $actual);
 
-        $expected = $this->numberToSpecial((string) $id[5]);
+        $expected = $this->numberToSpecial((string)$id[5]);
         $actual   = $version->getPart(Version::VERSION_SPECIAL);
         $I->assertSame($expected, $actual);
 
-        $special  = $this->numberToSpecial((string) $id[6]);
-        $expected = (string) (($special) ? $id[6] : 0);
+        $special  = $this->numberToSpecial((string)$id[6]);
+        $expected = (string)(($special) ? $id[6] : 0);
         $actual   = $version->getPart(Version::VERSION_SPECIAL_NUMBER);
         $I->assertSame($expected, $actual);
 
diff --git a/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php b/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php
index 92c9d153534..614543897f7 100644
--- a/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php
+++ b/tests/unit/Translate/Adapter/Csv/OffsetSetCest.php
@@ -43,7 +43,7 @@ public function translateAdapterCsvOffsetSet(UnitTester $I)
         $I->expectThrowable(
             new Exception('Translate is an immutable ArrayAccess object'),
             function () {
-                $language   = $this->getCsvConfig()['en'];
+                $language = $this->getCsvConfig()['en'];
                 $translator = new Csv(new InterpolatorFactory(), $language);
                 $translator->offsetSet('team', 'Team');
             }
diff --git a/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php b/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php
index 4a43c1a09e3..5401508a079 100644
--- a/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php
+++ b/tests/unit/Translate/Adapter/Csv/OffsetUnsetCest.php
@@ -43,7 +43,7 @@ public function translateAdapterCsvOffsetUnset(UnitTester $I)
         $I->expectThrowable(
             new Exception('Translate is an immutable ArrayAccess object'),
             function () {
-                $language   = $this->getCsvConfig()['en'];
+                $language = $this->getCsvConfig()['en'];
                 $translator = new Csv(new InterpolatorFactory(), $language);
                 $translator->offsetUnset('hi');
             }
diff --git a/tests/unit/Translate/Adapter/Gettext/ConstructCest.php b/tests/unit/Translate/Adapter/Gettext/ConstructCest.php
index 5c30b88de7b..6c7da06e66c 100644
--- a/tests/unit/Translate/Adapter/Gettext/ConstructCest.php
+++ b/tests/unit/Translate/Adapter/Gettext/ConstructCest.php
@@ -43,7 +43,7 @@ public function translateAdapterGettextConstruct(UnitTester $I)
     {
         $I->wantToTest('Translate\Adapter\Gettext - constructor');
 
-        $params     = $this->getGettextConfig();
+        $params = $this->getGettextConfig();
         $translator = new Gettext(new InterpolatorFactory(), $params);
 
         $I->assertInstanceOf(ArrayAccess::class, $translator);
diff --git a/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php b/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php
index 98abe7b7b31..1e01c6b2f96 100644
--- a/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php
+++ b/tests/unit/Translate/Interpolator/IndexedArray/ReplacePlaceholdersCest.php
@@ -68,9 +68,9 @@ public function translateInterpolatorIndexedarrayReplacePlaceholdersWithNoPlaceh
 
         $interpolator = new IndexedArray();
 
-        $source   = 'Hello, %s %s %s!';
+        $source = 'Hello, %s %s %s!';
         $expected = $source;
-        $actual   = $interpolator->replacePlaceholders('Hello, %s %s %s!', []);
+        $actual = $interpolator->replacePlaceholders('Hello, %s %s %s!', []);
         $I->assertSame($expected, $actual);
     }
 }

From 871ea2a130fc61b5555939151301fb6d82e4e789 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 17:35:33 -0500
Subject: [PATCH 7/8] test corrections

---
 tests/_data/fixtures/Tasks/MainTask.php  | 2 +-
 tests/cli/Cli/Task/UnderscoreGetCest.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/_data/fixtures/Tasks/MainTask.php b/tests/_data/fixtures/Tasks/MainTask.php
index c3f2fd4d5df..cca2638d309 100644
--- a/tests/_data/fixtures/Tasks/MainTask.php
+++ b/tests/_data/fixtures/Tasks/MainTask.php
@@ -45,7 +45,7 @@ public function argumentsAction(
         string $world,
         string $symbol,
         string $country,
-        mixed $last
+        $last
     ) {
         return '-' . $world . '-' . $symbol . '-' . $country . '-' . (string) $last . '-';
     }
diff --git a/tests/cli/Cli/Task/UnderscoreGetCest.php b/tests/cli/Cli/Task/UnderscoreGetCest.php
index d4d517244d0..cf0d8d542b7 100644
--- a/tests/cli/Cli/Task/UnderscoreGetCest.php
+++ b/tests/cli/Cli/Task/UnderscoreGetCest.php
@@ -41,8 +41,8 @@ public function cliTaskUnderscoreGet(CliTester $I)
         $actual   = $task->di;
         $I->assertSame($expected, $actual);
 
-        $expected = $eventsManager;
-        $actual   = $task->eventsManager;
-        $I->assertSame($expected, $actual);
+        $class  = Manager::class;
+        $actual = $task->eventsManager;
+        $I->assertInstanceOf($class, $actual);
     }
 }

From cd2044ffcec6ca866d56706b6be5b878a6b28125 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 29 Sep 2023 17:56:22 -0500
Subject: [PATCH 8/8] updating changelog

---
 CHANGELOG-5.0.md | 135 +++++++++++++++++++++++++----------------------
 1 file changed, 71 insertions(+), 64 deletions(-)

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 82ada652bd5..3a323fe1bca 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -2,35 +2,45 @@
 
 ## [5.4.0](https://github.com/phalcon/cphalcon/releases/tag/v5.3.1) (xxxx-xx-xx)
 
+### Changed
+
+
+### Added
+
+- Added the ability to define interpolator characters for the `Phalcon\Logger\Formatter\Line` [#16430](https://github.com/phalcon/cphalcon/issues/16430)
+
 ### Fixed
-- Model Annotation strategy did not work with empty_string [#16426] (https://github.com/phalcon/cphalcon/issues/16426)
-- View::reset() sets content to null instead of default empty string [#16437] (https://github.com/phalcon/cphalcon/issues/16437)
+
+- Model Annotation strategy did not work with empty_string [#16426](https://github.com/phalcon/cphalcon/issues/16426)
+- View::reset() sets content to null instead of default empty string [#16437](https://github.com/phalcon/cphalcon/issues/16437)
 - Fixed `Phalcon\Filter\Validation\Validator\Size\*` validators to correctly detect the size of uploaded files [#16390](https://github.com/phalcon/cphalcon/issues/16390)
 
+### Removed
 
 ## [5.3.1](https://github.com/phalcon/cphalcon/releases/tag/v5.3.1) (2023-09-12)
 
 ### Fixed
+ 
 - Fixed infinite save loop in `Phalcon\Mvc\Model::save()` [#16395](https://github.com/phalcon/cphalcon/issues/16395)
 - Fixed undefined column with columnMap and model caching [#16420](https://github.com/phalcon/cphalcon/issues/16420)
 - Fixed memory leak in `Phalcon\Mvc\Router::handle()` [#16431](https://github.com/phalcon/cphalcon/pull/16431)
 
 ## [5.3.0](https://github.com/phalcon/cphalcon/releases/tag/v5.3.0) (2023-08-15)
 
+### Changed
+
+- Refactored `Phalcon\Mvc\Model::doLowUpdate` and `Phalcon\Mvc\Model::postSaveRelatedRecords` for better code logic and a clearer separation of behaviour, although it lead to partially repeated code. [#16391](https://github.com/phalcon/cphalcon/issues/16391)
+- Cleaned `Phalcon\Mvc\Model\Metadata::initialize` [#16393](https://github.com/phalcon/cphalcon/issues/16393)
+
 ### Added
 
 - Added `Phalcon\Mvc\Model::appendMessagedFrom` for code consistency and to add messages from another model [#16391](https://github.com/phalcon/cphalcon/issues/16391)
 - Added `Phalcon\Autoload\Loader::isRegistered` for debugging purposes [#16391](https://github.com/phalcon/cphalcon/issues/16391)
-- Added `Phalcon\Mvc\Model\Metadata::initializeMetadata` [#16393] (https://github.com/phalcon/cphalcon/issues/16393)
-- Added `Phalcon\Mvc\Model\Metadata::getMetaDataUniqueKey` [#16393] (https://github.com/phalcon/cphalcon/issues/16393)
-- Added `Phalcon\Mvc\Model\Metadata::getColumnMapUniqueKey` [#16393] (https://github.com/phalcon/cphalcon/issues/16393)
+- Added `Phalcon\Mvc\Model\Metadata::initializeMetadata` [#16393](https://github.com/phalcon/cphalcon/issues/16393)
+- Added `Phalcon\Mvc\Model\Metadata::getMetaDataUniqueKey` [#16393](https://github.com/phalcon/cphalcon/issues/16393)
+- Added `Phalcon\Mvc\Model\Metadata::getColumnMapUniqueKey` [#16393](https://github.com/phalcon/cphalcon/issues/16393)
 - Added `Phalcon\Encryption\Security\JWT\Builder::addHeader()` to allow adding custom headers [#16396](https://github.com/phalcon/cphalcon/issues/16396)
 
-### Changed
-
-- Refactored `Phalcon\Mvc\Model::doLowUpdate` and `Phalcon\Mvc\Model::postSaveRelatedRecords` for better code logic and a clearer separation of behaviour, although it lead to partially repeated code. [#16391](https://github.com/phalcon/cphalcon/issues/16391)
-- Cleaned `Phalcon\Mvc\Model\Metadata::initialize` [#16393] (https://github.com/phalcon/cphalcon/issues/16393)
-
 ### Fixed
 
 - Parse multipart/form-data from PUT request [#16271](https://github.com/phalcon/cphalcon/issues/16271)
@@ -47,8 +57,13 @@
 
 ## [5.2.3](https://github.com/phalcon/cphalcon/releases/tag/v5.2.3) (2023-07-26)
 
+### Added
+
+- Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244)
+- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372)
+
 ### Fixed
- 
+
 - Tried to reproduce the behavior described in #16244 but had no success. [#16244](https://github.com/phalcon/cphalcon/issues/16244)
 - Extended `Phalcon\Di\Injectable` from `stdClass` to remove the deprecation warning (dynamic properties) for PHP 8.2 [#16308](https://github.com/phalcon/cphalcon/issues/16308)
 - Corrected the return type of `Phalcon\Mvc\View::getVar()` so that stubs can be accurate. [#16276](https://github.com/phalcon/cphalcon/issues/16276)
@@ -56,11 +71,6 @@
 - Changed the `Phalcon\Support\Helper\Json\*` classes to clear up `json_last_error()` before doing any conversions. [#15608](https://github.com/phalcon/cphalcon/issues/15608)
 - Fixed `Phalcon\Http\Request::getJsonRawBody` to protect from empty body [#16373](https://github.com/phalcon/cphalcon/issues/16373)
 
-### Added
-
-- Added `getAdapter()` in `Phalcon\Mvc\Model\Metadata` to retrieve the internal cache adapter if necessary. [#16244](https://github.com/phalcon/cphalcon/issues/16244)
-- Added `Phalcon\Storage\Adapter\Weak` implemented with WeakReference has a cache/retrieval solution for objects not yet collected by the Garbage Collection. [#16372](https://github.com/phalcon/cphalcon/issues/16372)
-
 ## [5.2.2](https://github.com/phalcon/cphalcon/releases/tag/v5.2.2) (2023-06-18)
 
 ### Fixed
@@ -78,14 +88,14 @@
 
 ## [5.2.0](https://github.com/phalcon/cphalcon/releases/tag/v5.2.0) (2023-02-26)
 
-### Fixed
- 
-- Fixed `Phalcon\Html\Helper\Title::prepend` to correctly prepend text in subsequent calls [#16283](https://github.com/phalcon/cphalcon/issues/16283)
-
 ### Added
- 
+
 - Added support for PHP 8.2 [#15973](https://github.com/phalcon/cphalcon/issues/15973)
 
+### Fixed
+
+- Fixed `Phalcon\Html\Helper\Title::prepend` to correctly prepend text in subsequent calls [#16283](https://github.com/phalcon/cphalcon/issues/16283)
+
 ## [5.1.4](https://github.com/phalcon/cphalcon/releases/tag/v5.1.4) (2023-01-10)
 
 ### Fixed
@@ -102,7 +112,7 @@
 ## [5.1.2](https://github.com/phalcon/cphalcon/releases/tag/v5.1.2) (2022-10-30)
 
 ### Fixed
-- 
+ 
 - Fixed `Phalcon\Support\Debug` to correctly calculate the documents URL for the hyperlinks [#16223](https://github.com/phalcon/cphalcon/issues/16223)
 - Fixed `Phalcon\Html\TagFactory` docblock for autocompletion (https://github.com/phalcon/cphalcon/commit/0129658f3ac468dcc5294d401403e166302a8069)
 - Fixed `Phalcon\Db\Profiler` by correctly calculating the seconds (reapplied changes) [#15822](https://github.com/phalcon/cphalcon/issues/15822)
@@ -117,18 +127,18 @@
 
 ## [5.1.0](https://github.com/phalcon/cphalcon/releases/tag/v5.1.0) (2022-11-01)
 
-### Fixed
- 
-- Fixed `Phalcon\Mvc\View\Engine\Volt\Compiler::isTagFactory` to correctly detect a `TagFactory` object without throwing an error [#16097](https://github.com/phalcon/cphalcon/issues/16097)
-- Fixed default values for `Phalcon\Cli`, `Phalcon\Dispatcher` and `Phalcon\Application` components to ensure not `null` values are passed to methods [#16186](https://github.com/phalcon/cphalcon/issues/16186)
-- Fixed `Phalcon\Form::clear` to correctly clear the elements and not recurse [#15956](https://github.com/phalcon/cphalcon/issues/15956)
-
 ### Added
 
 - Added `Phalcon\Http\Request::getPatch()` to get a value from a PATCH request [#16188](https://github.com/phalcon/cphalcon/issues/16188)
 - Added `Phalcon\Http\Request::getFilteredPatch()` to get a value filtered from a PATCH request [#16188](https://github.com/phalcon/cphalcon/issues/16188)
 - Added `Phalcon\Http\Request::hasPatch()` to check if a value exist in a PATCH request [#16188](https://github.com/phalcon/cphalcon/issues/16188)
 
+### Fixed
+
+- Fixed `Phalcon\Mvc\View\Engine\Volt\Compiler::isTagFactory` to correctly detect a `TagFactory` object without throwing an error [#16097](https://github.com/phalcon/cphalcon/issues/16097)
+- Fixed default values for `Phalcon\Cli`, `Phalcon\Dispatcher` and `Phalcon\Application` components to ensure not `null` values are passed to methods [#16186](https://github.com/phalcon/cphalcon/issues/16186)
+- Fixed `Phalcon\Form::clear` to correctly clear the elements and not recurse [#15956](https://github.com/phalcon/cphalcon/issues/15956)
+
 ## [5.0.5](https://github.com/phalcon/cphalcon/releases/tag/v5.0.5) (2022-10-24)
 
 ### Fixed
@@ -169,14 +179,14 @@
 
 # [5.0.1](https://github.com/phalcon/cphalcon/releases/tag/v5.0.1) (2022-09-23)
 
-### Fixed
-
-- Fixed `Phalcon\Encryption\Security\JWT\Token\Token::validate()` to correctly call validator methods [#16115](https://github.com/phalcon/cphalcon/issues/16115)
-
 ### Added
 
 - Added `Phalcon\Encryption\Security\JWT\Validator::get()` and `Phalcon\Encryption\Security\JWT\Validator::set()` for validation data [#16115](https://github.com/phalcon/cphalcon/issues/16115)
 
+### Fixed
+
+- Fixed `Phalcon\Encryption\Security\JWT\Token\Token::validate()` to correctly call validator methods [#16115](https://github.com/phalcon/cphalcon/issues/16115)
+
 ## [5.0.0](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0) (2022-09-22)
 
 ### Changed
@@ -186,6 +196,12 @@
 - Changed return types to `array` in `Phalcon\Annotations\Reflection` class methods [#16106](https://github.com/phalcon/cphalcon/issues/16106)
 - Changed `Phalcon\Html\Escaper::attributes()` to also accept an array of attributes [#16108](https://github.com/phalcon/cphalcon/issues/16108)
 
+### Added
+
+- Added `Phalcon\Encryption\Security\JWT\Token::validate()` to validate a token's claims [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+- Added `Phalcon\Encryption\Security\JWT\Token::verify()` to verify a token's signature [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+- Added `Phalcon\Encryption\Security\JWT\Validator::getErrors()` to return any errors with the validation as an array [#16094](https://github.com/phalcon/cphalcon/issues/16094)
+
 ### Fixed
 
 - Fixed and improved return type of `object` & `?object` [#16023](https://github.com/phalcon/cphalcon/issues/16023)
@@ -195,12 +211,6 @@
 - Fixed segmentation fault on Reflection of `Phalcon\Mvc\Model` class [#16080](https://github.com/phalcon/cphalcon/issues/16080)
 - Fixed segmentation fault on Reflection [#16096](https://github.com/phalcon/cphalcon/issues/16096)
 
-### Added
-
-- Added `Phalcon\Encryption\Security\JWT\Token::validate()` to validate a token's claims [#16094](https://github.com/phalcon/cphalcon/issues/16094)
-- Added `Phalcon\Encryption\Security\JWT\Token::verify()` to verify a token's signature [#16094](https://github.com/phalcon/cphalcon/issues/16094)
-- Added `Phalcon\Encryption\Security\JWT\Validator::getErrors()` to return any errors with the validation as an array [#16094](https://github.com/phalcon/cphalcon/issues/16094)
-
 ## [5.0.0rc4](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC4) (2022-08-08)
 
 ### Fixed
@@ -228,6 +238,12 @@
 
 ## [5.0.0rc3](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC3) (2022-07-12)
 
+### Added
+
+- Added support for `webp` images for `Phalcon\Image\Adapter\Gd` [#15977](https://github.com/phalcon/cphalcon/issues/15977)
+- Added `Phalcon\Mvc\Model\ManagerInterface::getBuilder()` to return the existing builder (created by `createBuilder()`) [#15966](https://github.com/phalcon/cphalcon/issues/15966)
+- Added `Phalcon\Mvc\Model\Manager::getBuilder()` to return the existing builder (created by `createBuilder()`) [#15966](https://github.com/phalcon/cphalcon/issues/15966)
+
 ### Fixed
 
 - Fixed `Phalcon\Tag::textArea()` to check if the value is `null` before calling `htmlspecialchars` [#15992](https://github.com/phalcon/cphalcon/issues/15992)
@@ -247,25 +263,19 @@
 - Fixed `Phalcon\Dispatcher\AbstractDispatcher::setModuleName()` to accept `null` [#15997](https://github.com/phalcon/cphalcon/issues/15997)
 - Fixed `Phalcon\Dispatcher\AbstractDispatcher::getModuleName()` to also return `null` [#15997](https://github.com/phalcon/cphalcon/issues/15997)
 
-### Added
-
-- Added support for `webp` images for `Phalcon\Image\Adapter\Gd` [#15977](https://github.com/phalcon/cphalcon/issues/15977)
-- Added `Phalcon\Mvc\Model\ManagerInterface::getBuilder()` to return the existing builder (created by `createBuilder()`) [#15966](https://github.com/phalcon/cphalcon/issues/15966)
-- Added `Phalcon\Mvc\Model\Manager::getBuilder()` to return the existing builder (created by `createBuilder()`) [#15966](https://github.com/phalcon/cphalcon/issues/15966)
-
 ## [5.0.0rc2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC2) (2022-06-09)
 
 ### Changed
 
 - Changed the `StringVal` filter to now use `htmlspecialchars()` [#15978](https://github.com/phalcon/cphalcon/issues/15978) 
 
-### Fixed
+### Added
 
-- Fixed `Phalcon\Http\Response::getQualityHeader()` to check if the server variable is `null` before performing `preg_split` [#15984](https://github.com/phalcon/cphalcon/issues/15984) 
+- Added `StringValLegacy` filter using `filter_var()` for PHP < 8.1 [#15978](https://github.com/phalcon/cphalcon/issues/15978)
 
-### Added
+### Fixed
 
-- Added `StringValLegacy` filter using `filter_var()` for PHP < 8.1 [#15978](https://github.com/phalcon/cphalcon/issues/15978) 
+- Fixed `Phalcon\Http\Response::getQualityHeader()` to check if the server variable is `null` before performing `preg_split` [#15984](https://github.com/phalcon/cphalcon/issues/15984) 
 
 ## [5.0.0rc1](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0RC1) (2022-05-31)
 
@@ -276,11 +286,6 @@
 - Changed `Phalcon\Cache\Cache` to no longer depend on PSR interfaces [#15927](https://github.com/phalcon/cphalcon/issues/15927)
 - Changed `Phalcon\Html\Link` to no longer depend on PSR interfaces [#15930](https://github.com/phalcon/cphalcon/issues/15930)
 
-### Fixed
-
-- Fixed `Phalcon\Html\Helper\Input\Numeric` to produce correct elements [#15896](https://github.com/phalcon/cphalcon/issues/15896)
-- Fixed `Phalcon\Storage\Adapter\*` to correctly store `null` values [#15904](https://github.com/phalcon/cphalcon/issues/15904)
-
 ### Added
 
 - Added `Phalcon\Encryption\Crypt::isValidDecryptLength($input)` to allow checking for the length of the decryption string [#15879](https://github.com/phalcon/cphalcon/issues/15879)
@@ -309,6 +314,11 @@
   - `Phalcon\Html\Link\AbstractLinkProvider` to be used in the link class but also the proxy-psr13 repo [#15930](https://github.com/phalcon/cphalcon/issues/15930)
 - Added `Phalcon\Translate\Adapter\Csv::toArray()` and `Phalcon\Translate\Adapter\NativeArray::toArray()` to return the translation array back  [#15902](https://github.com/phalcon/cphalcon/issues/15902)
 
+### Fixed
+
+- Fixed `Phalcon\Html\Helper\Input\Numeric` to produce correct elements [#15896](https://github.com/phalcon/cphalcon/issues/15896)
+- Fixed `Phalcon\Storage\Adapter\*` to correctly store `null` values [#15904](https://github.com/phalcon/cphalcon/issues/15904)
+
 ### Removed
 
 - Removed `Phalcon\Container\Container` and moved its contents to the `proxy-psr11` repo [#15928](https://github.com/phalcon/cphalcon/issues/15928)
@@ -321,6 +331,10 @@
 - Renamed `Phalcon\Db\Result\Pdo` to `Phalcon\Db\Result\PdoResult` to avoid collisions with `\PDO` [#15874](https://github.com/phalcon/cphalcon/issues/15854)
 - Moved `Phalcon\Validation` to `Phalcon\Filter\Validation` 
 
+### Added
+
+- Added `Phalcon\Html\Helper\Title:setSeparator` to allow setting the separator independently [#15866](https://github.com/phalcon/cphalcon/issues/15866)
+
 ### Fixed
 
 - Fixed `Phalcon\Logger\AbstractAdapter::getFormattedItem()` to not add `PHP_EOL` at the end of the message and added it to the `Phalcon\Logger\Adapter\Stream` [#14547](https://github.com/phalcon/cphalcon/issues/14547)
@@ -339,11 +353,11 @@
 - Fixed `Phalcon\Mvc\Model\Manager::addHasOneThrough()` parameter `options` array by default [#15971](https://github.com/phalcon/cphalcon/issues/15971)
 - Fixed `Phalcon\Mvc\Model\Manager::addBelongsTo()` parameter `options` array by default [#15971](https://github.com/phalcon/cphalcon/issues/15971)
 
-### Added
+## [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06)
 
-- Added `Phalcon\Html\Helper\Title:setSeparator` to allow setting the separator independently [#15866](https://github.com/phalcon/cphalcon/issues/15866)
+### Added
 
-## [5.0.0beta2](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta2) (2022-01-06)
+- Added `Phalcon\Support\Helper\Str\KebabCase`, `Phalcon\Support\Helper\Str\PascalCase` and `Phalcon\Support\Helper\Str\SnakeCase` helpers [#15850](https://github.com/phalcon/cphalcon/issues/15850)
 
 ### Fixed
 
@@ -353,10 +367,6 @@
 - Changed references to `sha1` with `hash("sha256", $data)` to ensure that there are no collisions from the hashing algorithm  [#15844](https://github.com/phalcon/cphalcon/issues/15844)
 - Changed `Phalcon\Support\Helper\Str\Camelize` to accept a third boolean parameter indicating whether the result will have the first letter capitalized or not [#15850](https://github.com/phalcon/cphalcon/issues/15850)
 
-### Added
-
-- Added `Phalcon\Support\Helper\Str\KebabCase`, `Phalcon\Support\Helper\Str\PascalCase` and `Phalcon\Support\Helper\Str\SnakeCase` helpers [#15850](https://github.com/phalcon/cphalcon/issues/15850)
-
 ## [5.0.0beta1](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta1) (2021-12-24)
 
 ### Changed
@@ -386,10 +396,6 @@
 - `Phalcon\Forms\Form` requires a `Phalcon\Html\TagFactory` to be set before it can render elements [#15801](https://github.com/phalcon/cphalcon/issues/15801)
 - `Phalcon\Di\FactoryDefault` will now return a `Phalcon\Html\TagFactory` for the `tag` service [#15801](https://github.com/phalcon/cphalcon/issues/15801)
 
-### Fixed
-
-- `Phalcon\Logger\LoggerFactory::load()` to correctly use the key of the adapters array as the name of the adapter [#15831](https://github.com/phalcon/cphalcon/issues/15831)
-
 ### Added
 
 - Added:
@@ -406,6 +412,7 @@
 
 ### Fixed
 
+- `Phalcon\Logger\LoggerFactory::load()` to correctly use the key of the adapters array as the name of the adapter [#15831](https://github.com/phalcon/cphalcon/issues/15831)
 - Fixed `Phalcon\Dispatcher\Dispatcher::setParams()` not updating local params during `dispatch()` loop [#15603](https://github.com/phalcon/cphalcon/issues/15603)
 - Fixed related records auto-save with `belongsTo()` relation [#15148](https://github.com/phalcon/cphalcon/issues/15148)