diff --git a/.gitignore b/.gitignore
index 6d1dfecd..c8840aec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
# https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
/vendor
+composer.phar
diff --git a/composer.lock b/composer.lock
index 53cca273..6811d163 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9,27 +9,27 @@
"packages-dev": [
{
"name": "amphp/amp",
- "version": "v2.5.2",
+ "version": "v2.6.0",
"source": {
"type": "git",
"url": "https://github.com/amphp/amp.git",
- "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9"
+ "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9",
- "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/caa95edeb1ca1bf7532e9118ede4a3c3126408cc",
+ "reference": "caa95edeb1ca1bf7532e9118ede4a3c3126408cc",
"shasum": ""
},
"require": {
- "php": ">=7"
+ "php": ">=7.1"
},
"require-dev": {
"amphp/php-cs-fixer-config": "dev-master",
"amphp/phpunit-util": "^1",
"ext-json": "*",
"jetbrains/phpstorm-stubs": "^2019.3",
- "phpunit/phpunit": "^6.0.9 | ^7",
+ "phpunit/phpunit": "^7 | ^8 | ^9",
"psalm/phar": "^3.11@dev",
"react/promise": "^2"
},
@@ -86,7 +86,7 @@
"support": {
"irc": "irc://irc.freenode.org/amphp",
"issues": "https://github.com/amphp/amp/issues",
- "source": "https://github.com/amphp/amp/tree/v2.5.2"
+ "source": "https://github.com/amphp/amp/tree/v2.6.0"
},
"funding": [
{
@@ -94,7 +94,7 @@
"type": "github"
}
],
- "time": "2021-01-10T17:06:37+00:00"
+ "time": "2021-07-16T20:06:06+00:00"
},
{
"name": "amphp/byte-stream",
@@ -175,16 +175,16 @@
},
{
"name": "composer/package-versions-deprecated",
- "version": "1.11.99.2",
+ "version": "1.11.99.3",
"source": {
"type": "git",
"url": "https://github.com/composer/package-versions-deprecated.git",
- "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c"
+ "reference": "fff576ac850c045158a250e7e27666e146e78d18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c",
- "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c",
+ "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/fff576ac850c045158a250e7e27666e146e78d18",
+ "reference": "fff576ac850c045158a250e7e27666e146e78d18",
"shasum": ""
},
"require": {
@@ -228,7 +228,7 @@
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
"support": {
"issues": "https://github.com/composer/package-versions-deprecated/issues",
- "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2"
+ "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.3"
},
"funding": [
{
@@ -244,7 +244,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-24T07:46:03+00:00"
+ "time": "2021-08-17T13:49:14+00:00"
},
{
"name": "composer/semver",
@@ -430,20 +430,20 @@
},
{
"name": "felixfbecker/advanced-json-rpc",
- "version": "v3.2.0",
+ "version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
- "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e"
+ "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e",
- "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e",
+ "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+ "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
"shasum": ""
},
"require": {
- "netresearch/jsonmapper": "^1.0 || ^2.0",
+ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
"php": "^7.1 || ^8.0",
"phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
},
@@ -469,9 +469,9 @@
"description": "A more advanced JSONRPC implementation",
"support": {
"issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
- "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0"
+ "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
},
- "time": "2021-01-10T17:48:47+00:00"
+ "time": "2021-06-11T22:34:44+00:00"
},
{
"name": "felixfbecker/language-server-protocol",
@@ -531,16 +531,16 @@
},
{
"name": "netresearch/jsonmapper",
- "version": "v2.1.0",
+ "version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/cweiske/jsonmapper.git",
- "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e"
+ "reference": "ba09f0e456d4f00cef84e012da5715625594407c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e",
- "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e",
+ "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/ba09f0e456d4f00cef84e012da5715625594407c",
+ "reference": "ba09f0e456d4f00cef84e012da5715625594407c",
"shasum": ""
},
"require": {
@@ -576,22 +576,22 @@
"support": {
"email": "cweiske@cweiske.de",
"issues": "https://github.com/cweiske/jsonmapper/issues",
- "source": "https://github.com/cweiske/jsonmapper/tree/master"
+ "source": "https://github.com/cweiske/jsonmapper/tree/v3.1.1"
},
- "time": "2020-04-16T18:48:43+00:00"
+ "time": "2020-11-02T19:19:54+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.10.5",
+ "version": "v4.12.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
+ "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
- "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+ "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
"shasum": ""
},
"require": {
@@ -632,9 +632,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
},
- "time": "2021-05-03T19:11:20+00:00"
+ "time": "2021-07-21T10:44:31+00:00"
},
{
"name": "openlss/lib-array2xml",
@@ -1069,16 +1069,16 @@
},
{
"name": "symfony/console",
- "version": "v5.3.0",
+ "version": "v5.3.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "058553870f7809087fa80fa734704a21b9bcaeb2"
+ "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2",
- "reference": "058553870f7809087fa80fa734704a21b9bcaeb2",
+ "url": "https://api.github.com/repos/symfony/console/zipball/8b1008344647462ae6ec57559da166c2bfa5e16a",
+ "reference": "8b1008344647462ae6ec57559da166c2bfa5e16a",
"shasum": ""
},
"require": {
@@ -1086,11 +1086,12 @@
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
- "symfony/polyfill-php80": "^1.15",
+ "symfony/polyfill-php80": "^1.16",
"symfony/service-contracts": "^1.1|^2",
"symfony/string": "^5.1"
},
"conflict": {
+ "psr/log": ">=3",
"symfony/dependency-injection": "<4.4",
"symfony/dotenv": "<5.1",
"symfony/event-dispatcher": "<4.4",
@@ -1098,10 +1099,10 @@
"symfony/process": "<4.4"
},
"provide": {
- "psr/log-implementation": "1.0"
+ "psr/log-implementation": "1.0|2.0"
},
"require-dev": {
- "psr/log": "~1.0",
+ "psr/log": "^1|^2",
"symfony/config": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/event-dispatcher": "^4.4|^5.0",
@@ -1147,7 +1148,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.3.0"
+ "source": "https://github.com/symfony/console/tree/v5.3.7"
},
"funding": [
{
@@ -1163,7 +1164,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:43:10+00:00"
+ "time": "2021-08-25T20:02:16+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1313,16 +1314,16 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.23.0",
+ "version": "v1.23.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab"
+ "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab",
- "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
+ "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
"shasum": ""
},
"require": {
@@ -1374,7 +1375,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
},
"funding": [
{
@@ -1390,7 +1391,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:17:38+00:00"
+ "time": "2021-05-27T12:26:48+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
@@ -1478,16 +1479,16 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.23.0",
+ "version": "v1.23.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
+ "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
- "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
+ "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
"shasum": ""
},
"require": {
@@ -1538,7 +1539,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
},
"funding": [
{
@@ -1554,7 +1555,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-27T09:27:20+00:00"
+ "time": "2021-05-27T12:26:48+00:00"
},
{
"name": "symfony/polyfill-php73",
@@ -1637,16 +1638,16 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.23.0",
+ "version": "v1.23.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
+ "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
- "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
+ "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
"shasum": ""
},
"require": {
@@ -1700,7 +1701,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
},
"funding": [
{
@@ -1716,7 +1717,7 @@
"type": "tidelift"
}
],
- "time": "2021-02-19T12:13:01+00:00"
+ "time": "2021-07-28T13:41:28+00:00"
},
{
"name": "symfony/service-contracts",
@@ -1799,16 +1800,16 @@
},
{
"name": "symfony/string",
- "version": "v5.3.0",
+ "version": "v5.3.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b"
+ "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
- "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
+ "url": "https://api.github.com/repos/symfony/string/zipball/8d224396e28d30f81969f083a58763b8b9ceb0a5",
+ "reference": "8d224396e28d30f81969f083a58763b8b9ceb0a5",
"shasum": ""
},
"require": {
@@ -1862,7 +1863,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.3.0"
+ "source": "https://github.com/symfony/string/tree/v5.3.7"
},
"funding": [
{
@@ -1878,7 +1879,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:43:10+00:00"
+ "time": "2021-08-26T08:00:08+00:00"
},
{
"name": "vimeo/psalm",
diff --git a/src/Acl/Adapter/AbstractAdapter.php b/src/Acl/Adapter/AbstractAdapter.php
index e3eeeedd..0de37d3c 100644
--- a/src/Acl/Adapter/AbstractAdapter.php
+++ b/src/Acl/Adapter/AbstractAdapter.php
@@ -11,6 +11,7 @@
use Phalcon\Acl\Enum;
use Phalcon\Events\ManagerInterface;
+use Phalcon\Events\EventsAwareInterface;
/**
* Adapter for Phalcon\Acl adapters
diff --git a/src/Acl/Adapter/AdapterInterface.php b/src/Acl/Adapter/AdapterInterface.php
index 15e35855..9da3c56b 100644
--- a/src/Acl/Adapter/AdapterInterface.php
+++ b/src/Acl/Adapter/AdapterInterface.php
@@ -9,6 +9,9 @@
*/
namespace Phalcon\Acl\Adapter;
+use Phalcon\Acl\ComponentInterface;
+use Phalcon\Acl\RoleInterface;
+
/**
* Interface for Phalcon\Acl adapters
*/
diff --git a/src/Acl/Adapter/Memory.php b/src/Acl/Adapter/Memory.php
index 5be2a10f..ebe02bdc 100644
--- a/src/Acl/Adapter/Memory.php
+++ b/src/Acl/Adapter/Memory.php
@@ -10,6 +10,15 @@
namespace Phalcon\Acl\Adapter;
use Phalcon\Acl\Enum;
+use Phalcon\Acl\Role;
+use Phalcon\Acl\RoleInterface;
+use Phalcon\Acl\Component;
+use Phalcon\Acl\Exception;
+use Phalcon\Events\Manager as EventsManager;
+use Phalcon\Acl\RoleAware;
+use Phalcon\Acl\ComponentAware;
+use Phalcon\Acl\ComponentInterface;
+use ReflectionFunction;
/**
* Manages ACL lists in memory
diff --git a/src/Annotations/Adapter/AbstractAdapter.php b/src/Annotations/Adapter/AbstractAdapter.php
index 52306733..685c8446 100644
--- a/src/Annotations/Adapter/AbstractAdapter.php
+++ b/src/Annotations/Adapter/AbstractAdapter.php
@@ -9,10 +9,11 @@
*/
namespace Phalcon\Annotations\Adapter;
-use Phalcon\Annotations\Collection;
use Phalcon\Annotations\Reader;
-use Phalcon\Annotations\ReaderInterface;
+use Phalcon\Annotations\Exception;
+use Phalcon\Annotations\Collection;
use Phalcon\Annotations\Reflection;
+use Phalcon\Annotations\ReaderInterface;
/**
* This is the base class for Phalcon\Annotations adapters
diff --git a/src/Annotations/Adapter/AdapterInterface.php b/src/Annotations/Adapter/AdapterInterface.php
index 6f851a21..60587208 100644
--- a/src/Annotations/Adapter/AdapterInterface.php
+++ b/src/Annotations/Adapter/AdapterInterface.php
@@ -9,9 +9,9 @@
*/
namespace Phalcon\Annotations\Adapter;
+use Phalcon\Annotations\Reflection;
use Phalcon\Annotations\Collection;
use Phalcon\Annotations\ReaderInterface;
-use Phalcon\Annotations\Reflection;
/**
* This interface must be implemented by adapters in Phalcon\Annotations
diff --git a/src/Annotations/Adapter/Apcu.php b/src/Annotations/Adapter/Apcu.php
index 0834f9d8..d8e3bb81 100644
--- a/src/Annotations/Adapter/Apcu.php
+++ b/src/Annotations/Adapter/Apcu.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Annotations\Adapter;
+use Phalcon\Annotations\Reflection;
+
/**
* Stores the parsed annotations in APCu. This adapter is suitable for production
*
diff --git a/src/Annotations/Adapter/Memory.php b/src/Annotations/Adapter/Memory.php
index da87d80f..ad79be79 100644
--- a/src/Annotations/Adapter/Memory.php
+++ b/src/Annotations/Adapter/Memory.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Annotations\Adapter;
+use Phalcon\Annotations\Reflection;
+
/**
* Stores the parsed annotations in memory. This adapter is the suitable
* development/testing
diff --git a/src/Annotations/Adapter/Stream.php b/src/Annotations/Adapter/Stream.php
index 3d4ec6b9..68b1384e 100644
--- a/src/Annotations/Adapter/Stream.php
+++ b/src/Annotations/Adapter/Stream.php
@@ -9,6 +9,10 @@
*/
namespace Phalcon\Annotations\Adapter;
+use Phalcon\Annotations\Reflection;
+use Phalcon\Annotations\Exception;
+use RuntimeException;
+
/**
* Stores the parsed annotations in files. This adapter is suitable for production
*
diff --git a/src/Annotations/AnnotationsFactory.php b/src/Annotations/AnnotationsFactory.php
index d59549d6..50f670ed 100644
--- a/src/Annotations/AnnotationsFactory.php
+++ b/src/Annotations/AnnotationsFactory.php
@@ -11,6 +11,7 @@
use Phalcon\Annotations\Adapter\AdapterInterface;
use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
/**
* Factory to create annotations components
diff --git a/src/Annotations/Collection.php b/src/Annotations/Collection.php
index 510f836e..fa533b15 100644
--- a/src/Annotations/Collection.php
+++ b/src/Annotations/Collection.php
@@ -9,6 +9,9 @@
*/
namespace Phalcon\Annotations;
+use Countable;
+use Iterator;
+
/**
* Represents a collection of annotations. This class allows to traverse a group
* of annotations easily
diff --git a/src/Annotations/Reader.php b/src/Annotations/Reader.php
index ddccab04..21eeb9d4 100644
--- a/src/Annotations/Reader.php
+++ b/src/Annotations/Reader.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Annotations;
+use ReflectionClass;
+
/**
* Parses docblocks returning an array with the found annotations
*/
diff --git a/src/Application/AbstractApplication.php b/src/Application/AbstractApplication.php
index aeb78742..d5f55412 100644
--- a/src/Application/AbstractApplication.php
+++ b/src/Application/AbstractApplication.php
@@ -11,6 +11,7 @@
use Phalcon\Di\DiInterface;
use Phalcon\Di\Injectable;
+use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
/**
diff --git a/src/Assets/Asset/Css.php b/src/Assets/Asset/Css.php
index 7e066b1a..e668f837 100644
--- a/src/Assets/Asset/Css.php
+++ b/src/Assets/Asset/Css.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Asset;
+use Phalcon\Assets\Asset as AssetBase;
+
/**
* Represents CSS assets
*/
diff --git a/src/Assets/Asset/Js.php b/src/Assets/Asset/Js.php
index 2dacee46..93ff165b 100644
--- a/src/Assets/Asset/Js.php
+++ b/src/Assets/Asset/Js.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Asset;
+use Phalcon\Assets\Asset as AssetBase;
+
/**
* Represents JavaScript assets
*/
diff --git a/src/Assets/Collection.php b/src/Assets/Collection.php
index 11e5bacc..9d831d09 100644
--- a/src/Assets/Collection.php
+++ b/src/Assets/Collection.php
@@ -9,6 +9,13 @@
*/
namespace Phalcon\Assets;
+use Countable;
+use Iterator;
+use Phalcon\Assets\Asset\Css as AssetCss;
+use Phalcon\Assets\Asset\Js as AssetJs;
+use Phalcon\Assets\Inline\Js as InlineJs;
+use Phalcon\Assets\Inline\Css as InlineCss;
+
/**
* Represents a collection of assets
*/
diff --git a/src/Assets/Filters/Cssmin.php b/src/Assets/Filters/Cssmin.php
index 774e9cba..78eedece 100644
--- a/src/Assets/Filters/Cssmin.php
+++ b/src/Assets/Filters/Cssmin.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Filters;
+use Phalcon\Assets\FilterInterface;
+
/**
* Minify the CSS - removes comments removes newlines and line feeds keeping
* removes last semicolon from last property
diff --git a/src/Assets/Filters/Jsmin.php b/src/Assets/Filters/Jsmin.php
index e0701838..fedadb6e 100644
--- a/src/Assets/Filters/Jsmin.php
+++ b/src/Assets/Filters/Jsmin.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Filters;
+use Phalcon\Assets\FilterInterface;
+
/**
* Deletes the characters which are insignificant to JavaScript. Comments will
* be removed. Tabs will be replaced with spaces. Carriage returns will be
diff --git a/src/Assets/Filters/None.php b/src/Assets/Filters/None.php
index a5e19df9..ba7c59c9 100644
--- a/src/Assets/Filters/None.php
+++ b/src/Assets/Filters/None.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Filters;
+use Phalcon\Assets\FilterInterface;
+
/**
* Returns the content without make any modification to the original source
*/
diff --git a/src/Assets/Inline/Css.php b/src/Assets/Inline/Css.php
index 2353cd4e..4021e7aa 100644
--- a/src/Assets/Inline/Css.php
+++ b/src/Assets/Inline/Css.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Inline;
+use Phalcon\Assets\Inline as InlineBase;
+
/**
* Represents an inlined CSS
*/
diff --git a/src/Assets/Inline/Js.php b/src/Assets/Inline/Js.php
index 1ec6fd4e..a35a1b41 100644
--- a/src/Assets/Inline/Js.php
+++ b/src/Assets/Inline/Js.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Assets\Inline;
+use Phalcon\Assets\Inline as InlineBase;
+
/**
* Represents an inline JavaScript
*/
diff --git a/src/Assets/Manager.php b/src/Assets/Manager.php
index f56a6aa5..e358ebf9 100644
--- a/src/Assets/Manager.php
+++ b/src/Assets/Manager.php
@@ -9,6 +9,12 @@
*/
namespace Phalcon\Assets;
+use Phalcon\Tag;
+use Phalcon\Assets\Asset\Js as AssetJs;
+use Phalcon\Assets\Asset\Css as AssetCss;
+use Phalcon\Assets\Inline\Css as InlineCss;
+use Phalcon\Assets\Inline\Js as InlineJs;
+use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
/**
diff --git a/src/Cache.php b/src/Cache.php
index 8bd70919..d0776e5c 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -10,8 +10,10 @@
namespace Phalcon;
use Phalcon\Cache\Adapter\AdapterInterface;
+use Phalcon\Cache\Exception\Exception;
use Phalcon\Cache\Exception\InvalidArgumentException;
use Psr\SimpleCache\CacheInterface;
+use Traversable;
/**
* This component offers caching capabilities for your application.
diff --git a/src/Cache/Adapter/Apcu.php b/src/Cache/Adapter/Apcu.php
index 01481ad0..191e2ec9 100644
--- a/src/Cache/Adapter/Apcu.php
+++ b/src/Cache/Adapter/Apcu.php
@@ -10,6 +10,7 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Apcu as StorageApcu;
/**
* Apcu adapter
diff --git a/src/Cache/Adapter/Libmemcached.php b/src/Cache/Adapter/Libmemcached.php
index 43526134..a00deb4a 100644
--- a/src/Cache/Adapter/Libmemcached.php
+++ b/src/Cache/Adapter/Libmemcached.php
@@ -10,6 +10,7 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Libmemcached as StorageLibmemcached;
/**
* Libmemcached adapter
diff --git a/src/Cache/Adapter/Memory.php b/src/Cache/Adapter/Memory.php
index 4cbe2d5e..41619081 100644
--- a/src/Cache/Adapter/Memory.php
+++ b/src/Cache/Adapter/Memory.php
@@ -10,6 +10,7 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Memory as StorageMemory;
/**
* Memory adapter
diff --git a/src/Cache/Adapter/Redis.php b/src/Cache/Adapter/Redis.php
index c3c8ce7a..f9551cec 100644
--- a/src/Cache/Adapter/Redis.php
+++ b/src/Cache/Adapter/Redis.php
@@ -10,6 +10,7 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Redis as StorageRedis;
/**
* Redis adapter
diff --git a/src/Cache/Adapter/Stream.php b/src/Cache/Adapter/Stream.php
index 7002ae87..376e7a73 100644
--- a/src/Cache/Adapter/Stream.php
+++ b/src/Cache/Adapter/Stream.php
@@ -10,6 +10,7 @@
namespace Phalcon\Cache\Adapter;
use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface;
+use Phalcon\Storage\Adapter\Stream as StorageStream;
/**
* Stream adapter
diff --git a/src/Cache/CacheFactory.php b/src/Cache/CacheFactory.php
index 2991470d..ccbf641a 100644
--- a/src/Cache/CacheFactory.php
+++ b/src/Cache/CacheFactory.php
@@ -9,7 +9,13 @@
*/
namespace Phalcon\Cache;
+use Phalcon\Cache\Adapter\AdapterInterface;
+use Phalcon\Cache;
use Psr\SimpleCache\CacheInterface;
+use Phalcon\Cache\Exception\Exception;
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
+use Phalcon\Helper\Arr;
/**
* Creates a new Cache class
diff --git a/src/Cli/Console.php b/src/Cli/Console.php
index 89cff154..5a7d55a6 100644
--- a/src/Cli/Console.php
+++ b/src/Cli/Console.php
@@ -10,6 +10,10 @@
namespace Phalcon\Cli;
use Phalcon\Application\AbstractApplication;
+use Phalcon\Cli\Router\Route;
+use Phalcon\Cli\Console\Exception;
+use Phalcon\Di\DiInterface;
+use Phalcon\Events\ManagerInterface;
/**
* This component allows to create CLI applications using Phalcon
diff --git a/src/Cli/Dispatcher.php b/src/Cli/Dispatcher.php
index 8db05566..af8f3aa8 100644
--- a/src/Cli/Dispatcher.php
+++ b/src/Cli/Dispatcher.php
@@ -9,6 +9,11 @@
*/
namespace Phalcon\Cli;
+use Phalcon\Cli\Dispatcher\Exception;
+use Phalcon\Dispatcher\AbstractDispatcher as CliDispatcher;
+use Phalcon\Events\ManagerInterface;
+use Phalcon\Filter\FilterInterface;
+
/**
* Dispatching is the process of taking the command-line arguments, extracting
* the module name, task name, action name, and optional parameters contained in
diff --git a/src/Cli/Router.php b/src/Cli/Router.php
index 7af3790b..03f208e6 100644
--- a/src/Cli/Router.php
+++ b/src/Cli/Router.php
@@ -9,8 +9,11 @@
*/
namespace Phalcon\Cli;
-use Phalcon\Cli\Router\RouteInterface;
+use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Cli\Router\Route;
+use Phalcon\Cli\Router\Exception;
+use Phalcon\Cli\Router\RouteInterface;
/**
* Phalcon\Cli\Router is the standard framework router. Routing is the process
diff --git a/src/Cli/Task.php b/src/Cli/Task.php
index 11e0369b..ad88ba23 100644
--- a/src/Cli/Task.php
+++ b/src/Cli/Task.php
@@ -10,6 +10,7 @@
namespace Phalcon\Cli;
use Phalcon\Di\Injectable;
+use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
/**
diff --git a/src/Collection.php b/src/Collection.php
index eab41a5c..65269ac7 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -9,6 +9,14 @@
*/
namespace Phalcon;
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use JsonSerializable;
+use Phalcon\Collection\CollectionInterface;
+use Phalcon\Helper\Json;
+use Serializable;
use Traversable;
/**
diff --git a/src/Collection/Exception.php b/src/Collection/Exception.php
index 5b84c7ed..badabd18 100644
--- a/src/Collection/Exception.php
+++ b/src/Collection/Exception.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Collection;
+use Throwable;
+
/**
* Exceptions for the Collection object
*/
diff --git a/src/Config.php b/src/Config.php
index 05fb7938..e92a3b9f 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -9,7 +9,9 @@
*/
namespace Phalcon;
+use Phalcon\Collection;
use Phalcon\Config\ConfigInterface;
+use Phalcon\Config\Exception;
/**
* `Phalcon\Config` is designed to simplify the access to, and the use of,
diff --git a/src/Config/Adapter/Grouped.php b/src/Config/Adapter/Grouped.php
index 23fb326f..be7fafbb 100644
--- a/src/Config/Adapter/Grouped.php
+++ b/src/Config/Adapter/Grouped.php
@@ -10,6 +10,10 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
+use Phalcon\Config\ConfigFactory;
+use Phalcon\Config\ConfigInterface;
+use Phalcon\Config\Exception;
+use Phalcon\Factory\Exception as FactoryException;
/**
* Reads multiple files (or arrays) and merges them all together.
diff --git a/src/Config/Adapter/Ini.php b/src/Config/Adapter/Ini.php
index 0aa25da0..746d60d6 100644
--- a/src/Config/Adapter/Ini.php
+++ b/src/Config/Adapter/Ini.php
@@ -10,6 +10,7 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
+use Phalcon\Config\Exception;
/**
* Reads ini files and converts them to Phalcon\Config objects.
diff --git a/src/Config/Adapter/Json.php b/src/Config/Adapter/Json.php
index 4c4b1e3f..f3595078 100644
--- a/src/Config/Adapter/Json.php
+++ b/src/Config/Adapter/Json.php
@@ -10,6 +10,7 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
+use Phalcon\Helper\Json as JsonHelper;
/**
* Reads JSON files and converts them to Phalcon\Config objects.
diff --git a/src/Config/Adapter/Yaml.php b/src/Config/Adapter/Yaml.php
index b4713fba..07961a2c 100644
--- a/src/Config/Adapter/Yaml.php
+++ b/src/Config/Adapter/Yaml.php
@@ -10,6 +10,7 @@
namespace Phalcon\Config\Adapter;
use Phalcon\Config;
+use Phalcon\Config\Exception;
/**
* Reads YAML files and converts them to Phalcon\Config objects.
diff --git a/src/Config/ConfigFactory.php b/src/Config/ConfigFactory.php
index 01f9a0d5..737cdc0b 100644
--- a/src/Config/ConfigFactory.php
+++ b/src/Config/ConfigFactory.php
@@ -9,7 +9,10 @@
*/
namespace Phalcon\Config;
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
/**
* Loads Config Adapter class using 'adapter' option, if no extension is
diff --git a/src/Config/ConfigInterface.php b/src/Config/ConfigInterface.php
index 82ea4de1..82812979 100644
--- a/src/Config/ConfigInterface.php
+++ b/src/Config/ConfigInterface.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Config;
+use Phalcon\Collection\CollectionInterface;
+
/**
* Phalcon\Config\ConfigInterface
*
diff --git a/src/Container.php b/src/Container.php
index fe533a3c..1ecadfe3 100644
--- a/src/Container.php
+++ b/src/Container.php
@@ -9,6 +9,7 @@
*/
namespace Phalcon;
+use Psr\Container\ContainerInterface;
use Phalcon\Di\DiInterface;
/**
diff --git a/src/Crypt.php b/src/Crypt.php
index 5ff78964..0ac5e1da 100644
--- a/src/Crypt.php
+++ b/src/Crypt.php
@@ -10,6 +10,8 @@
namespace Phalcon;
use Phalcon\Crypt\CryptInterface;
+use Phalcon\Crypt\Exception;
+use Phalcon\Crypt\Mismatch;
/**
* Provides encryption capabilities to Phalcon applications.
diff --git a/src/DataMapper/Pdo/Connection.php b/src/DataMapper/Pdo/Connection.php
index ce22f087..1d5ef802 100644
--- a/src/DataMapper/Pdo/Connection.php
+++ b/src/DataMapper/Pdo/Connection.php
@@ -9,7 +9,9 @@
*/
namespace Phalcon\DataMapper\Pdo;
+use InvalidArgumentException;
use Phalcon\DataMapper\Pdo\Connection\AbstractConnection;
+use Phalcon\DataMapper\Pdo\Profiler\Profiler;
use Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface;
/**
diff --git a/src/DataMapper/Pdo/Connection/Decorated.php b/src/DataMapper/Pdo/Connection/Decorated.php
index 5556dac0..6b0b2fe7 100644
--- a/src/DataMapper/Pdo/Connection/Decorated.php
+++ b/src/DataMapper/Pdo/Connection/Decorated.php
@@ -10,6 +10,7 @@
namespace Phalcon\DataMapper\Pdo\Connection;
use Phalcon\DataMapper\Pdo\Exception\CannotDisconnect;
+use Phalcon\DataMapper\Pdo\Profiler\Profiler;
use Phalcon\DataMapper\Pdo\Profiler\ProfilerInterface;
/**
diff --git a/src/DataMapper/Pdo/Profiler/Profiler.php b/src/DataMapper/Pdo/Profiler/Profiler.php
index cb81f890..ecbfccc8 100644
--- a/src/DataMapper/Pdo/Profiler/Profiler.php
+++ b/src/DataMapper/Pdo/Profiler/Profiler.php
@@ -9,7 +9,10 @@
*/
namespace Phalcon\DataMapper\Pdo\Profiler;
+use Phalcon\DataMapper\Pdo\Exception\Exception;
+use Phalcon\Helper\Json;
use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
/**
* Sends query profiles to a logger.
diff --git a/src/DataMapper/Query/AbstractConditions.php b/src/DataMapper/Query/AbstractConditions.php
index b2be43f1..7e7d74c3 100644
--- a/src/DataMapper/Query/AbstractConditions.php
+++ b/src/DataMapper/Query/AbstractConditions.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\DataMapper\Query;
+use Phalcon\Helper\Arr;
+
/**
* Class AbstractConditions
*/
diff --git a/src/DataMapper/Query/Select.php b/src/DataMapper/Query/Select.php
index 41cac29e..2c803466 100644
--- a/src/DataMapper/Query/Select.php
+++ b/src/DataMapper/Query/Select.php
@@ -9,6 +9,9 @@
*/
namespace Phalcon\DataMapper\Query;
+use BadMethodCallException;
+use Phalcon\Helper\Arr;
+
/**
* Class Select
*
diff --git a/src/Db/AbstractDb.php b/src/Db/AbstractDb.php
index 7e985097..bb4b849a 100644
--- a/src/Db/AbstractDb.php
+++ b/src/Db/AbstractDb.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Db;
+use \PDO as Pdo;
+
/**
* Phalcon\Db and its related classes provide a simple SQL database interface
* for Phalcon Framework. The Phalcon\Db is the basic class you use to connect
diff --git a/src/Db/Adapter/AbstractAdapter.php b/src/Db/Adapter/AbstractAdapter.php
index 92a9bec1..f7fe4600 100644
--- a/src/Db/Adapter/AbstractAdapter.php
+++ b/src/Db/Adapter/AbstractAdapter.php
@@ -10,8 +10,15 @@
namespace Phalcon\Db\Adapter;
use Phalcon\Db\DialectInterface;
+use Phalcon\Db\ColumnInterface;
use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Index;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
use Phalcon\Db\RawValue;
+use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
/**
diff --git a/src/Db/Adapter/AdapterInterface.php b/src/Db/Adapter/AdapterInterface.php
index d1caea10..ef7d9ead 100644
--- a/src/Db/Adapter/AdapterInterface.php
+++ b/src/Db/Adapter/AdapterInterface.php
@@ -10,8 +10,11 @@
namespace Phalcon\Db\Adapter;
use Phalcon\Db\DialectInterface;
-use Phalcon\Db\RawValue;
use Phalcon\Db\ResultInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\RawValue;
+use Phalcon\Db\ReferenceInterface;
/**
* Interface for Phalcon\Db adapters
@@ -531,7 +534,7 @@ public function modifyColumn(string $tableName, string $schemaName, \Phalcon\Db\
* @param string $sqlStatement
* @param array $bindParams
* @param array $bindTypes
- * @return bool|ResultInterface
+ * @return 0|ResultInterface
*/
public function query(string $sqlStatement, array $bindParams = [], array $bindTypes = []);
diff --git a/src/Db/Adapter/Pdo/AbstractPdo.php b/src/Db/Adapter/Pdo/AbstractPdo.php
index bf80fdab..4f75a290 100644
--- a/src/Db/Adapter/Pdo/AbstractPdo.php
+++ b/src/Db/Adapter/Pdo/AbstractPdo.php
@@ -10,7 +10,11 @@
namespace Phalcon\Db\Adapter\Pdo;
use Phalcon\Db\Adapter\AbstractAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Result\Pdo as ResultPdo;
use Phalcon\Db\ResultInterface;
+use Phalcon\Events\ManagerInterface;
/**
* Phalcon\Db\Adapter\Pdo is the Phalcon\Db that internally uses PDO to connect
@@ -364,7 +368,7 @@ public function prepare(string $sqlStatement): \PDOStatement
* @param string $sqlStatement
* @param array $bindParams
* @param array $bindTypes
- * @return bool|ResultInterface
+ * @return 0|ResultInterface
*/
public function query(string $sqlStatement, array $bindParams = [], array $bindTypes = [])
{
diff --git a/src/Db/Adapter/Pdo/Mysql.php b/src/Db/Adapter/Pdo/Mysql.php
index 107f51ad..e1780f44 100644
--- a/src/Db/Adapter/Pdo/Mysql.php
+++ b/src/Db/Adapter/Pdo/Mysql.php
@@ -9,6 +9,16 @@
*/
namespace Phalcon\Db\Adapter\Pdo;
+use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Index;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
+
/**
* Specific functions for the MySQL database system
*
diff --git a/src/Db/Adapter/Pdo/Postgresql.php b/src/Db/Adapter/Pdo/Postgresql.php
index 930be65a..64a72896 100644
--- a/src/Db/Adapter/Pdo/Postgresql.php
+++ b/src/Db/Adapter/Pdo/Postgresql.php
@@ -9,7 +9,15 @@
*/
namespace Phalcon\Db\Adapter\Pdo;
+use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
use Phalcon\Db\RawValue;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
+use Throwable;
/**
* Specific functions for the PostgreSQL database system
diff --git a/src/Db/Adapter/Pdo/Sqlite.php b/src/Db/Adapter/Pdo/Sqlite.php
index 65220882..4b4f6d75 100644
--- a/src/Db/Adapter/Pdo/Sqlite.php
+++ b/src/Db/Adapter/Pdo/Sqlite.php
@@ -9,7 +9,16 @@
*/
namespace Phalcon\Db\Adapter\Pdo;
+use Phalcon\Db\Adapter\Pdo\AbstractPdo as PdoAdapter;
+use Phalcon\Db\Column;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\Enum;
+use Phalcon\Db\Exception;
+use Phalcon\Db\Index;
+use Phalcon\Db\IndexInterface;
use Phalcon\Db\RawValue;
+use Phalcon\Db\Reference;
+use Phalcon\Db\ReferenceInterface;
/**
* Specific functions for the SQLite database system
diff --git a/src/Db/Adapter/PdoFactory.php b/src/Db/Adapter/PdoFactory.php
index eadc67ff..0d4167ac 100644
--- a/src/Db/Adapter/PdoFactory.php
+++ b/src/Db/Adapter/PdoFactory.php
@@ -10,6 +10,7 @@
namespace Phalcon\Db\Adapter;
use Phalcon\Factory\AbstractFactory;
+use Phalcon\Helper\Arr;
/**
* This file is part of the Phalcon Framework.
diff --git a/src/Db/Dialect/Mysql.php b/src/Db/Dialect/Mysql.php
index eeef5199..91c6265c 100644
--- a/src/Db/Dialect/Mysql.php
+++ b/src/Db/Dialect/Mysql.php
@@ -10,6 +10,12 @@
namespace Phalcon\Db\Dialect;
use Phalcon\Db\Dialect;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\ReferenceInterface;
+use Phalcon\Db\DialectInterface;
/**
* Generates database specific SQL for the MySQL RDBMS
diff --git a/src/Db/Dialect/Postgresql.php b/src/Db/Dialect/Postgresql.php
index 4e57d5f8..25783793 100644
--- a/src/Db/Dialect/Postgresql.php
+++ b/src/Db/Dialect/Postgresql.php
@@ -10,6 +10,12 @@
namespace Phalcon\Db\Dialect;
use Phalcon\Db\Dialect;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\IndexInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\ReferenceInterface;
+use Phalcon\Db\DialectInterface;
/**
* Generates database specific SQL for the PostgreSQL RDBMS
diff --git a/src/Db/Dialect/Sqlite.php b/src/Db/Dialect/Sqlite.php
index 3b2a56cc..c4e4393f 100644
--- a/src/Db/Dialect/Sqlite.php
+++ b/src/Db/Dialect/Sqlite.php
@@ -9,7 +9,13 @@
*/
namespace Phalcon\Db\Dialect;
+use Phalcon\Db\Column;
+use Phalcon\Db\Exception;
+use Phalcon\Db\IndexInterface;
use Phalcon\Db\Dialect;
+use Phalcon\Db\DialectInterface;
+use Phalcon\Db\ColumnInterface;
+use Phalcon\Db\ReferenceInterface;
/**
* Generates database specific SQL for the SQLite RDBMS
diff --git a/src/Db/Result/Pdo.php b/src/Db/Result/Pdo.php
index 860aa319..5fcd4cdb 100644
--- a/src/Db/Result/Pdo.php
+++ b/src/Db/Result/Pdo.php
@@ -9,8 +9,9 @@
*/
namespace Phalcon\Db\Result;
-use Phalcon\Db\Adapter\AdapterInterface;
use Phalcon\Db\Enum;
+use Phalcon\Db\ResultInterface;
+use Phalcon\Db\Adapter\AdapterInterface;
/**
* Encapsulates the resultset internals
diff --git a/src/Di.php b/src/Di.php
index cda593b1..43b5a597 100644
--- a/src/Di.php
+++ b/src/Di.php
@@ -9,9 +9,17 @@
*/
namespace Phalcon;
+use Phalcon\Di\Service;
use Phalcon\Di\DiInterface;
+use Phalcon\Di\Exception;
+use Phalcon\Di\Exception\ServiceResolutionException;
+use Phalcon\Config\Adapter\Php;
+use Phalcon\Config\Adapter\Yaml;
+use Phalcon\Config\ConfigInterface;
use Phalcon\Di\ServiceInterface;
use Phalcon\Events\ManagerInterface;
+use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\Di\ServiceProviderInterface;
/**
* Phalcon\Di is a component that implements Dependency Injection/Service
diff --git a/src/Di/DiInterface.php b/src/Di/DiInterface.php
index 1483068d..9ebde3b1 100644
--- a/src/Di/DiInterface.php
+++ b/src/Di/DiInterface.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Di;
+use ArrayAccess;
+
/**
* Interface for Phalcon\Di
*/
diff --git a/src/Di/FactoryDefault.php b/src/Di/FactoryDefault.php
index 6d8546f6..4f151e00 100644
--- a/src/Di/FactoryDefault.php
+++ b/src/Di/FactoryDefault.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Di;
+use Phalcon\Filter\FilterFactory;
+
/**
* This is a variant of the standard Phalcon\Di. By default it automatically
* registers all the services provided by the framework. Thanks to this, the
diff --git a/src/Di/FactoryDefault/Cli.php b/src/Di/FactoryDefault/Cli.php
index d2d3c9be..c3dddddd 100644
--- a/src/Di/FactoryDefault/Cli.php
+++ b/src/Di/FactoryDefault/Cli.php
@@ -10,6 +10,8 @@
namespace Phalcon\Di\FactoryDefault;
use Phalcon\Di\FactoryDefault;
+use Phalcon\Di\Service;
+use Phalcon\Filter\FilterFactory;
/**
* Phalcon\Di\FactoryDefault\Cli
diff --git a/src/Di/Injectable.php b/src/Di/Injectable.php
index 616e4240..fec0f45a 100644
--- a/src/Di/Injectable.php
+++ b/src/Di/Injectable.php
@@ -9,6 +9,7 @@
*/
namespace Phalcon\Di;
+use Phalcon\Di;
use Phalcon\Session\BagInterface;
/**
diff --git a/src/Di/Service.php b/src/Di/Service.php
index c324dd75..4e192765 100644
--- a/src/Di/Service.php
+++ b/src/Di/Service.php
@@ -9,6 +9,10 @@
*/
namespace Phalcon\Di;
+use Closure;
+use Phalcon\Di\Exception\ServiceResolutionException;
+use Phalcon\Di\Service\Builder;
+
/**
* Represents individually a service in the services container
*
diff --git a/src/Di/Service/Builder.php b/src/Di/Service/Builder.php
index b8a5a1f3..36e6d6d7 100644
--- a/src/Di/Service/Builder.php
+++ b/src/Di/Service/Builder.php
@@ -9,6 +9,9 @@
*/
namespace Phalcon\Di\Service;
+use Phalcon\Di\DiInterface;
+use Phalcon\Di\Exception;
+
/**
* Phalcon\Di\Service\Builder
*
diff --git a/src/Dispatcher/AbstractDispatcher.php b/src/Dispatcher/AbstractDispatcher.php
index f1a172d1..ec84205f 100644
--- a/src/Dispatcher/AbstractDispatcher.php
+++ b/src/Dispatcher/AbstractDispatcher.php
@@ -9,8 +9,14 @@
*/
namespace Phalcon\Dispatcher;
+use Exception;
+use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
+use Phalcon\Dispatcher\Exception as PhalconException;
+use Phalcon\Events\EventsAwareInterface;
use Phalcon\Events\ManagerInterface;
+use Phalcon\Filter\FilterInterface;
+use Phalcon\Mvc\Model\Binder;
use Phalcon\Mvc\Model\BinderInterface;
/**
@@ -354,10 +360,10 @@ public function setDefaultAction(string $actionName): void
/**
* Sets the default namespace
*
- * @param string $namespaceName
+ * @param string $defaultNamespace
* @return void
*/
- public function setDefaultNamespace(string $namespaceName): void
+ public function setDefaultNamespace(string $defaultNamespace): void
{
}
diff --git a/src/Escaper.php b/src/Escaper.php
index f7b06430..65da4b3f 100644
--- a/src/Escaper.php
+++ b/src/Escaper.php
@@ -9,6 +9,10 @@
*/
namespace Phalcon;
+use Phalcon\Di\DiInterface;
+use Phalcon\Escaper\EscaperInterface;
+use Phalcon\Escaper\Exception;
+
/**
* Phalcon\Escaper
*
@@ -112,10 +116,10 @@ public function escapeHtml(string $text = null): string
/**
* Escapes a HTML attribute string
*
- * @param string $attribute
+ * @param string $text
* @return string
*/
- public function escapeHtmlAttr(string $attribute = null): string
+ public function escapeHtmlAttr(string $text = null): string
{
}
@@ -227,10 +231,10 @@ public function setFlags(int $flags): Escaper
* $escaper->setHtmlQuoteType(ENT_XHTML);
* ```
*
- * @param int $flags
+ * @param int $quoteType
* @return void
*/
- public function setHtmlQuoteType(int $flags): void
+ public function setHtmlQuoteType(int $quoteType): void
{
}
diff --git a/src/Events/Manager.php b/src/Events/Manager.php
index 881cc9d4..f3d7cba2 100644
--- a/src/Events/Manager.php
+++ b/src/Events/Manager.php
@@ -9,6 +9,9 @@
*/
namespace Phalcon\Events;
+use Closure;
+use SplPriorityQueue;
+
/**
* Phalcon\Events\Manager
*
diff --git a/src/Factory/AbstractFactory.php b/src/Factory/AbstractFactory.php
index f4ef9bc0..2d1b9d3a 100644
--- a/src/Factory/AbstractFactory.php
+++ b/src/Factory/AbstractFactory.php
@@ -9,6 +9,9 @@
*/
namespace Phalcon\Factory;
+use Phalcon\Config;
+use Phalcon\Config\ConfigInterface;
+
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Filter.php b/src/Filter.php
index a5705cc2..24b919f3 100644
--- a/src/Filter.php
+++ b/src/Filter.php
@@ -9,6 +9,10 @@
*/
namespace Phalcon;
+use Closure;
+use Phalcon\Filter\Exception;
+use Phalcon\Filter\FilterInterface;
+
/**
* Lazy loads, stores and exposes sanitizer objects
*/
diff --git a/src/Filter/FilterFactory.php b/src/Filter/FilterFactory.php
index b2b9ffd5..744dc14a 100644
--- a/src/Filter/FilterFactory.php
+++ b/src/Filter/FilterFactory.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Filter;
+use Phalcon\Filter;
+
/**
* This file is part of the Phalcon Framework.
*
diff --git a/src/Flash/AbstractFlash.php b/src/Flash/AbstractFlash.php
index 843c4bd9..ec090ecc 100644
--- a/src/Flash/AbstractFlash.php
+++ b/src/Flash/AbstractFlash.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Flash;
+use Phalcon\Di;
+use Phalcon\Di\DiInterface;
use Phalcon\Di\AbstractInjectionAware;
use Phalcon\Escaper\EscaperInterface;
use Phalcon\Session\ManagerInterface as SessionInterface;
diff --git a/src/Flash/Exception.php b/src/Flash/Exception.php
index f2ddec13..dcc7c175 100644
--- a/src/Flash/Exception.php
+++ b/src/Flash/Exception.php
@@ -10,7 +10,7 @@
namespace Phalcon\Flash;
/**
- * Exceptions thrown in Phalcon\Flash calsses will use this class
+ * Exceptions thrown in Phalcon\Flash classes will use this class
*/
class Exception extends \Phalcon\Exception
{
diff --git a/src/Flash/Session.php b/src/Flash/Session.php
index 35a3036c..b90c855e 100644
--- a/src/Flash/Session.php
+++ b/src/Flash/Session.php
@@ -9,6 +9,7 @@
*/
namespace Phalcon\Flash;
+use Phalcon\Di\DiInterface;
use Phalcon\Session\ManagerInterface;
/**
diff --git a/src/Forms/Element/AbstractElement.php b/src/Forms/Element/AbstractElement.php
index 4fdca846..4c96c038 100644
--- a/src/Forms/Element/AbstractElement.php
+++ b/src/Forms/Element/AbstractElement.php
@@ -9,8 +9,13 @@
*/
namespace Phalcon\Forms\Element;
+use InvalidArgumentException;
use Phalcon\Forms\Form;
+use Phalcon\Forms\Exception;
+use Phalcon\Messages\MessageInterface;
use Phalcon\Messages\Messages;
+use Phalcon\Tag;
+use Phalcon\Validation\ValidatorInterface;
/**
* This is a base class for form elements
diff --git a/src/Forms/Element/Check.php b/src/Forms/Element/Check.php
index 9142911e..6027443d 100644
--- a/src/Forms/Element/Check.php
+++ b/src/Forms/Element/Check.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Check
*
diff --git a/src/Forms/Element/Date.php b/src/Forms/Element/Date.php
index f01dede3..003e0daa 100644
--- a/src/Forms/Element/Date.php
+++ b/src/Forms/Element/Date.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Component INPUT[type=date] for forms
*/
diff --git a/src/Forms/Element/ElementInterface.php b/src/Forms/Element/ElementInterface.php
index 60473d50..336d248a 100644
--- a/src/Forms/Element/ElementInterface.php
+++ b/src/Forms/Element/ElementInterface.php
@@ -10,7 +10,9 @@
namespace Phalcon\Forms\Element;
use Phalcon\Forms\Form;
+use Phalcon\Messages\MessageInterface;
use Phalcon\Messages\Messages;
+use Phalcon\Validation\ValidatorInterface;
/**
* Interface for Phalcon\Forms\Element classes
diff --git a/src/Forms/Element/Email.php b/src/Forms/Element/Email.php
index a3d57ead..04aae24d 100644
--- a/src/Forms/Element/Email.php
+++ b/src/Forms/Element/Email.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Email
*
diff --git a/src/Forms/Element/File.php b/src/Forms/Element/File.php
index 9e5151b9..2a68cb13 100644
--- a/src/Forms/Element/File.php
+++ b/src/Forms/Element/File.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Component INPUT[type=file] for forms
*/
diff --git a/src/Forms/Element/Hidden.php b/src/Forms/Element/Hidden.php
index 8f8c7ec5..e5df751c 100644
--- a/src/Forms/Element/Hidden.php
+++ b/src/Forms/Element/Hidden.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Hidden
*
diff --git a/src/Forms/Element/Numeric.php b/src/Forms/Element/Numeric.php
index f3969abd..3acdc4f8 100644
--- a/src/Forms/Element/Numeric.php
+++ b/src/Forms/Element/Numeric.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Numeric
*
diff --git a/src/Forms/Element/Password.php b/src/Forms/Element/Password.php
index d208a2fe..54ff458a 100644
--- a/src/Forms/Element/Password.php
+++ b/src/Forms/Element/Password.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Password
*
diff --git a/src/Forms/Element/Radio.php b/src/Forms/Element/Radio.php
index a538f718..13274081 100644
--- a/src/Forms/Element/Radio.php
+++ b/src/Forms/Element/Radio.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Radio
*
diff --git a/src/Forms/Element/Select.php b/src/Forms/Element/Select.php
index 8a0e1ffd..8669bdee 100644
--- a/src/Forms/Element/Select.php
+++ b/src/Forms/Element/Select.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag\Select as SelectTag;
+
/**
* Phalcon\Forms\Element\Select
*
diff --git a/src/Forms/Element/Submit.php b/src/Forms/Element/Submit.php
index 95444354..bfe0214e 100644
--- a/src/Forms/Element/Submit.php
+++ b/src/Forms/Element/Submit.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Component INPUT[type=submit] for forms
*/
diff --git a/src/Forms/Element/Text.php b/src/Forms/Element/Text.php
index 03bb1f93..b8b2fc9c 100644
--- a/src/Forms/Element/Text.php
+++ b/src/Forms/Element/Text.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Phalcon\Forms\Element\Text
*
diff --git a/src/Forms/Element/TextArea.php b/src/Forms/Element/TextArea.php
index f8679dbd..48d7af7d 100644
--- a/src/Forms/Element/TextArea.php
+++ b/src/Forms/Element/TextArea.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Forms\Element;
+use Phalcon\Tag;
+
/**
* Component TEXTAREA for forms
*/
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 732f53dc..eebe05cd 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -9,11 +9,17 @@
*/
namespace Phalcon\Forms;
+use Countable;
+use Iterator;
use Phalcon\Di\Injectable;
+use Phalcon\Di\DiInterface;
+use Phalcon\Filter\FilterInterface;
use Phalcon\Forms\Element\ElementInterface;
use Phalcon\Html\Attributes;
use Phalcon\Html\Attributes\AttributesInterface;
use Phalcon\Messages\Messages;
+use Phalcon\Tag;
+use Phalcon\Validation;
use Phalcon\Validation\ValidationInterface;
/**
diff --git a/src/Helper/Arr.php b/src/Helper/Arr.php
index 0d0c3445..6ff6f84f 100644
--- a/src/Helper/Arr.php
+++ b/src/Helper/Arr.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Helper;
+use stdClass;
+
/**
* This class offers quick array functions throughout the framework
*/
diff --git a/src/Helper/Json.php b/src/Helper/Json.php
index 3ee32285..caab0ece 100644
--- a/src/Helper/Json.php
+++ b/src/Helper/Json.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Helper;
+use InvalidArgumentException;
+
/**
* This class offers a wrapper for JSON methods to serialize and unserialize
*/
diff --git a/src/Helper/Str.php b/src/Helper/Str.php
index 6dc027d3..d23f4d18 100644
--- a/src/Helper/Str.php
+++ b/src/Helper/Str.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Helper;
+use RuntimeException;
+
/**
* This class offers quick string functions throughout the framework
*/
diff --git a/src/Html/Attributes.php b/src/Html/Attributes.php
index d431bbcc..3f4148c6 100644
--- a/src/Html/Attributes.php
+++ b/src/Html/Attributes.php
@@ -10,6 +10,8 @@
namespace Phalcon\Html;
use Phalcon\Collection;
+use Phalcon\Html\Attributes\RenderInterface;
+use Phalcon\Tag;
/**
* This class helps to work with HTML Attributes
diff --git a/src/Html/Breadcrumbs.php b/src/Html/Breadcrumbs.php
index 706593c8..a435ea17 100644
--- a/src/Html/Breadcrumbs.php
+++ b/src/Html/Breadcrumbs.php
@@ -9,6 +9,8 @@
*/
namespace Phalcon\Html;
+use Phalcon\Di\DiInterface;
+
/**
* Phalcon\Html\Breadcrumbs
*
diff --git a/src/Html/Helper/Form.php b/src/Html/Helper/Form.php
index 852e65e4..64481fab 100644
--- a/src/Html/Helper/Form.php
+++ b/src/Html/Helper/Form.php
@@ -18,7 +18,7 @@ class Form extends \Phalcon\Html\Helper\AbstractHelper
{
/**
- * Produce a