diff --git a/BACKERS.md b/BACKERS.md
index 30486967a30..ebc13885a53 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -97,12 +97,11 @@ Thanks for the support
-
+
-
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index c7a95c671a7..e21e11035df 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -4,6 +4,18 @@
### Changed
+### Added
+
+### Fixed
+
+- Fixed `Phalcon\Di\Injectable` to reference the correct instance of `Phalcon\Di\Di` in the docblock property [#16634](https://github.com/phalcon/cphalcon/issues/16634)
+
+### Removed
+
+## [5.8.0](https://github.com/phalcon/cphalcon/releases/tag/v5.8.0) (2024-07-09)
+
+### Changed
+
- Changed `Phalcon\Mvc\Model`, `Phalcon\Support\Collection` and `Phalcon\Support\Registry` to correctly implement `\Serializable` interface. [#16591](https://github.com/phalcon/cphalcon/issues/16591)
- Changed the `Phalcon\Mvc\Router\Group::getHostname()` to return `null` also. [#16601](https://github.com/phalcon/cphalcon/issues/16601)
- Changed `Phalcon\Mvc\View\Engine\Volt\Compiler::compileSource` to also return `array` [#16608](https://github.com/phalcon/cphalcon/issues/16608)
diff --git a/composer.json b/composer.json
index 156d61d11a9..4f27deaab82 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
"high load",
"mvc"
],
+ "version": "5.8.0",
"license": "BSD-3-Clause",
"authors": [
{
@@ -76,6 +77,11 @@
"Phalcon\\Tests\\Database\\": "tests/database/",
"Phalcon\\Tests\\Controllers\\": "tests/_data/fixtures/controllers/",
"Phalcon\\Tests\\Fixtures\\": "tests/_data/fixtures/",
+ "Phalcon\\Tests\\Modules\\Frontend\\": "tests/_data/fixtures/modules/frontend/",
+ "Phalcon\\Tests\\Modules\\Backend\\": "tests/_data/fixtures//modules/backend/",
+ "Phalcon\\Tests\\Modules\\Frontend\\Controllers\\": "tests/_data/fixtures/modules/frontend/controllers/",
+ "Phalcon\\Tests\\Modules\\Backend\\Controllers\\": "tests/_data/fixtures//modules/backend/controllers/",
+ "Phalcon\\Tests\\Modules\\Backend\\Tasks\\": "tests/_data/fixtures//modules/backend/tasks/",
"Phalcon\\Tests\\Models\\": "tests/_data/fixtures/models/",
"Phalcon\\Tests\\Module\\": "tests/_support/Module/",
"Phalcon\\Tests\\Listener\\": "tests/_data/listener/",
diff --git a/composer.lock b/composer.lock
index b655aadcfd1..201c3b56cb1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "b72d11dba93423cc6d6c77c01c90896e",
+ "content-hash": "c55a9efdfcf620cfcef532e113adc84b",
"packages": [],
"packages-dev": [
{
@@ -1077,30 +1077,38 @@
},
{
"name": "composer/pcre",
- "version": "3.1.4",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "04229f163664973f68f38f6f73d917799168ef24"
+ "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
- "reference": "04229f163664973f68f38f6f73d917799168ef24",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
+ "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
"shasum": ""
},
"require": {
"php": "^7.4 || ^8.0"
},
+ "conflict": {
+ "phpstan/phpstan": "<1.11.8"
+ },
"require-dev": {
- "phpstan/phpstan": "^1.3",
+ "phpstan/phpstan": "^1.11.8",
"phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^5"
+ "phpunit/phpunit": "^8 || ^9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "3.x-dev"
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
}
},
"autoload": {
@@ -1128,7 +1136,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.4"
+ "source": "https://github.com/composer/pcre/tree/3.2.0"
},
"funding": [
{
@@ -1144,20 +1152,20 @@
"type": "tidelift"
}
],
- "time": "2024-05-27T13:40:54+00:00"
+ "time": "2024-07-25T09:36:02+00:00"
},
{
"name": "composer/semver",
- "version": "3.4.0",
+ "version": "3.4.2",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+ "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
- "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+ "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+ "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
"shasum": ""
},
"require": {
@@ -1209,7 +1217,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.4.0"
+ "source": "https://github.com/composer/semver/tree/3.4.2"
},
"funding": [
{
@@ -1225,7 +1233,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-31T09:50:34+00:00"
+ "time": "2024-07-12T11:35:52+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -1658,16 +1666,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.59.3",
+ "version": "v3.62.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29"
+ "reference": "627692f794d35c43483f34b01d94740df2a73507"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
- "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/627692f794d35c43483f34b01d94740df2a73507",
+ "reference": "627692f794d35c43483f34b01d94740df2a73507",
"shasum": ""
},
"require": {
@@ -1749,7 +1757,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.62.0"
},
"funding": [
{
@@ -1757,28 +1765,28 @@
"type": "github"
}
],
- "time": "2024-06-16T14:17:03+00:00"
+ "time": "2024-08-07T17:03:09+00:00"
},
{
"name": "graham-campbell/result-type",
- "version": "v1.1.2",
+ "version": "v1.1.3",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git",
- "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+ "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
- "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+ "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+ "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
- "phpoption/phpoption": "^1.9.2"
+ "phpoption/phpoption": "^1.9.3"
},
"require-dev": {
- "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
},
"type": "library",
"autoload": {
@@ -1807,7 +1815,7 @@
],
"support": {
"issues": "https://github.com/GrahamCampbell/Result-Type/issues",
- "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+ "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
},
"funding": [
{
@@ -1819,26 +1827,26 @@
"type": "tidelift"
}
],
- "time": "2023-11-12T22:16:48+00:00"
+ "time": "2024-07-20T21:45:45+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.8.1",
+ "version": "7.9.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
- "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+ "guzzlehttp/psr7": "^2.7.0",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1849,9 +1857,9 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
- "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+ "guzzle/client-integration-tests": "3.0.2",
"php-http/message-factory": "^1.1",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -1929,7 +1937,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+ "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
},
"funding": [
{
@@ -1945,20 +1953,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:35:24+00:00"
+ "time": "2024-07-24T11:22:20+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+ "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+ "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
"shasum": ""
},
"require": {
@@ -1966,7 +1974,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"type": "library",
"extra": {
@@ -2012,7 +2020,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.2"
+ "source": "https://github.com/guzzle/promises/tree/2.0.3"
},
"funding": [
{
@@ -2028,20 +2036,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:19:20+00:00"
+ "time": "2024-07-18T10:29:17+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.6.2",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
"shasum": ""
},
"require": {
@@ -2056,8 +2064,8 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+ "http-interop/http-factory-tests": "0.9.0",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -2128,7 +2136,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+ "source": "https://github.com/guzzle/psr7/tree/2.7.0"
},
"funding": [
{
@@ -2144,7 +2152,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:05:35+00:00"
+ "time": "2024-07-18T11:15:46+00:00"
},
{
"name": "monolog/monolog",
@@ -2467,16 +2475,16 @@
},
{
"name": "phalcon/ide-stubs",
- "version": "v5.7.0",
+ "version": "v5.8.0",
"source": {
"type": "git",
"url": "https://github.com/phalcon/ide-stubs.git",
- "reference": "dbf1a87285da674d096566fb36732614e70ef57b"
+ "reference": "f9cc44828f6d4b8110c633a274a9da7067973800"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/dbf1a87285da674d096566fb36732614e70ef57b",
- "reference": "dbf1a87285da674d096566fb36732614e70ef57b",
+ "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/f9cc44828f6d4b8110c633a274a9da7067973800",
+ "reference": "f9cc44828f6d4b8110c633a274a9da7067973800",
"shasum": ""
},
"require": {
@@ -2530,7 +2538,7 @@
"type": "open_collective"
}
],
- "time": "2024-05-20T13:24:33+00:00"
+ "time": "2024-07-18T22:40:31+00:00"
},
{
"name": "phalcon/zephir",
@@ -2913,16 +2921,16 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.9.2",
+ "version": "1.9.3",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+ "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
- "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+ "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
"shasum": ""
},
"require": {
@@ -2930,13 +2938,13 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
- "forward-command": true
+ "forward-command": false
},
"branch-alias": {
"dev-master": "1.9-dev"
@@ -2972,7 +2980,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
- "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+ "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
},
"funding": [
{
@@ -2984,7 +2992,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-12T21:59:55+00:00"
+ "time": "2024-07-20T21:41:07+00:00"
},
{
"name": "phpstan/phpdoc-parser",
@@ -3354,45 +3362,45 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.19",
+ "version": "9.6.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8"
+ "reference": "49d7820565836236411f5dc002d16dd689cde42f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8",
- "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f",
+ "reference": "49d7820565836236411f5dc002d16dd689cde42f",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.3.1 || ^2",
+ "doctrine/instantiator": "^1.5.0 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
+ "myclabs/deep-copy": "^1.12.0",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
"php": ">=7.3",
- "phpunit/php-code-coverage": "^9.2.28",
- "phpunit/php-file-iterator": "^3.0.5",
+ "phpunit/php-code-coverage": "^9.2.31",
+ "phpunit/php-file-iterator": "^3.0.6",
"phpunit/php-invoker": "^3.1.1",
- "phpunit/php-text-template": "^2.0.3",
- "phpunit/php-timer": "^5.0.2",
- "sebastian/cli-parser": "^1.0.1",
- "sebastian/code-unit": "^1.0.6",
+ "phpunit/php-text-template": "^2.0.4",
+ "phpunit/php-timer": "^5.0.3",
+ "sebastian/cli-parser": "^1.0.2",
+ "sebastian/code-unit": "^1.0.8",
"sebastian/comparator": "^4.0.8",
- "sebastian/diff": "^4.0.3",
- "sebastian/environment": "^5.1.3",
- "sebastian/exporter": "^4.0.5",
- "sebastian/global-state": "^5.0.1",
- "sebastian/object-enumerator": "^4.0.3",
- "sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.2",
+ "sebastian/diff": "^4.0.6",
+ "sebastian/environment": "^5.1.5",
+ "sebastian/exporter": "^4.0.6",
+ "sebastian/global-state": "^5.0.7",
+ "sebastian/object-enumerator": "^4.0.4",
+ "sebastian/resource-operations": "^3.0.4",
+ "sebastian/type": "^3.2.1",
"sebastian/version": "^3.0.2"
},
"suggest": {
@@ -3437,7 +3445,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20"
},
"funding": [
{
@@ -3453,7 +3461,7 @@
"type": "tidelift"
}
],
- "time": "2024-04-05T04:35:58+00:00"
+ "time": "2024-07-10T11:45:39+00:00"
},
{
"name": "predis/predis",
@@ -4252,31 +4260,31 @@
},
{
"name": "react/socket",
- "version": "v1.15.0",
+ "version": "v1.16.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/socket.git",
- "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038"
+ "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038",
- "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038",
+ "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+ "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
"shasum": ""
},
"require": {
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
"php": ">=5.3.0",
- "react/dns": "^1.11",
+ "react/dns": "^1.13",
"react/event-loop": "^1.2",
- "react/promise": "^3 || ^2.6 || ^1.2.1",
- "react/stream": "^1.2"
+ "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+ "react/stream": "^1.4"
},
"require-dev": {
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
- "react/async": "^4 || ^3 || ^2",
+ "react/async": "^4.3 || ^3.3 || ^2",
"react/promise-stream": "^1.4",
- "react/promise-timer": "^1.10"
+ "react/promise-timer": "^1.11"
},
"type": "library",
"autoload": {
@@ -4320,7 +4328,7 @@
],
"support": {
"issues": "https://github.com/reactphp/socket/issues",
- "source": "https://github.com/reactphp/socket/tree/v1.15.0"
+ "source": "https://github.com/reactphp/socket/tree/v1.16.0"
},
"funding": [
{
@@ -4328,7 +4336,7 @@
"type": "open_collective"
}
],
- "time": "2023-12-15T11:02:10+00:00"
+ "time": "2024-07-26T10:38:09+00:00"
},
{
"name": "react/stream",
@@ -5441,16 +5449,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.10.1",
+ "version": "3.10.2",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
+ "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
- "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017",
+ "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017",
"shasum": ""
},
"require": {
@@ -5517,7 +5525,7 @@
"type": "open_collective"
}
],
- "time": "2024-05-22T21:24:41+00:00"
+ "time": "2024-07-21T23:26:44+00:00"
},
{
"name": "symfony/browser-kit",
@@ -5593,16 +5601,16 @@
},
{
"name": "symfony/console",
- "version": "v5.4.41",
+ "version": "v5.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "6473d441a913cb997123b59ff2dbe3d1cf9e11ba"
+ "reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/6473d441a913cb997123b59ff2dbe3d1cf9e11ba",
- "reference": "6473d441a913cb997123b59ff2dbe3d1cf9e11ba",
+ "url": "https://api.github.com/repos/symfony/console/zipball/cef62396a0477e94fc52e87a17c6e5c32e226b7f",
+ "reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f",
"shasum": ""
},
"require": {
@@ -5672,7 +5680,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.4.41"
+ "source": "https://github.com/symfony/console/tree/v5.4.42"
},
"funding": [
{
@@ -5688,7 +5696,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-28T07:48:55+00:00"
+ "time": "2024-07-26T12:21:55+00:00"
},
{
"name": "symfony/css-selector",
@@ -6127,16 +6135,16 @@
},
{
"name": "symfony/finder",
- "version": "v5.4.40",
+ "version": "v5.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "f51cff4687547641c7d8180d74932ab40b2205ce"
+ "reference": "0724c51fa067b198e36506d2864e09a52180998a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/f51cff4687547641c7d8180d74932ab40b2205ce",
- "reference": "f51cff4687547641c7d8180d74932ab40b2205ce",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/0724c51fa067b198e36506d2864e09a52180998a",
+ "reference": "0724c51fa067b198e36506d2864e09a52180998a",
"shasum": ""
},
"require": {
@@ -6170,7 +6178,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.4.40"
+ "source": "https://github.com/symfony/finder/tree/v5.4.42"
},
"funding": [
{
@@ -6186,7 +6194,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:33:22+00:00"
+ "time": "2024-07-22T08:53:29+00:00"
},
{
"name": "symfony/options-resolver",
@@ -7410,23 +7418,23 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v5.6.0",
+ "version": "v5.6.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+ "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
- "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+ "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
"shasum": ""
},
"require": {
"ext-pcre": "*",
- "graham-campbell/result-type": "^1.1.2",
+ "graham-campbell/result-type": "^1.1.3",
"php": "^7.2.5 || ^8.0",
- "phpoption/phpoption": "^1.9.2",
+ "phpoption/phpoption": "^1.9.3",
"symfony/polyfill-ctype": "^1.24",
"symfony/polyfill-mbstring": "^1.24",
"symfony/polyfill-php80": "^1.24"
@@ -7443,7 +7451,7 @@
"extra": {
"bamarni-bin": {
"bin-links": true,
- "forward-command": true
+ "forward-command": false
},
"branch-alias": {
"dev-master": "5.6-dev"
@@ -7478,7 +7486,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
- "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+ "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
},
"funding": [
{
@@ -7490,7 +7498,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-12T22:43:29+00:00"
+ "time": "2024-07-20T21:52:34+00:00"
},
{
"name": "webmozart/assert",
diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c
index cc6b96d9965..43dee7c0c76 100644
--- a/ext/phalcon/di/injectable.zep.c
+++ b/ext/phalcon/di/injectable.zep.c
@@ -55,7 +55,7 @@
* @property \Phalcon\Mvc\Model\MetaData\Memory|\Phalcon\Mvc\Model\MetadataInterface $modelsMetadata
* @property \Phalcon\Mvc\Model\Transaction\Manager|\Phalcon\Mvc\Model\Transaction\ManagerInterface $transactionManager
* @property \Phalcon\Assets\Manager $assets
- * @property \Phalcon\Di\Di|\Phalcon\Di\Di\DiInterface $di
+ * @property \Phalcon\Di\Di|\Phalcon\Di\DiInterface $di
* @property \Phalcon\Session\Bag|\Phalcon\Session\BagInterface $persistent
* @property \Phalcon\Mvc\View|\Phalcon\Mvc\ViewInterface $view
*/
diff --git a/phalcon/Di/Injectable.zep b/phalcon/Di/Injectable.zep
index fdca331f6ab..ee132414236 100644
--- a/phalcon/Di/Injectable.zep
+++ b/phalcon/Di/Injectable.zep
@@ -39,7 +39,7 @@ use Phalcon\Session\BagInterface;
* @property \Phalcon\Mvc\Model\MetaData\Memory|\Phalcon\Mvc\Model\MetadataInterface $modelsMetadata
* @property \Phalcon\Mvc\Model\Transaction\Manager|\Phalcon\Mvc\Model\Transaction\ManagerInterface $transactionManager
* @property \Phalcon\Assets\Manager $assets
- * @property \Phalcon\Di\Di|\Phalcon\Di\Di\DiInterface $di
+ * @property \Phalcon\Di\Di|\Phalcon\Di\DiInterface $di
* @property \Phalcon\Session\Bag|\Phalcon\Session\BagInterface $persistent
* @property \Phalcon\Mvc\View|\Phalcon\Mvc\ViewInterface $view
*/
diff --git a/tests/database/Db/Profiler/Item/GetTotalElapsedNanoMicroSecondsCest.php b/tests/database/Db/Profiler/Item/GetTotalElapsedNanoMicroSecondsCest.php
index 879de2bdbce..8295749f8d8 100644
--- a/tests/database/Db/Profiler/Item/GetTotalElapsedNanoMicroSecondsCest.php
+++ b/tests/database/Db/Profiler/Item/GetTotalElapsedNanoMicroSecondsCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Test\Database\Db\Profiler\Item;
+namespace Phalcon\Tests\Database\Db\Profiler\Item;
use DatabaseTester;
use Phalcon\Db\Profiler\Item;
diff --git a/tests/database/Mvc/Model/DynamicUpdateCest.php b/tests/database/Mvc/Model/DynamicUpdateCest.php
index aa108d6cfc2..3bcde888403 100644
--- a/tests/database/Mvc/Model/DynamicUpdateCest.php
+++ b/tests/database/Mvc/Model/DynamicUpdateCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Events\Event;
diff --git a/tests/database/Mvc/Model/HasChangedCest.php b/tests/database/Mvc/Model/HasChangedCest.php
index 6d938250947..48c245d60be 100644
--- a/tests/database/Mvc/Model/HasChangedCest.php
+++ b/tests/database/Mvc/Model/HasChangedCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Tests\Fixtures\Traits\DiTrait;
diff --git a/tests/database/Mvc/Model/SaveCest.php b/tests/database/Mvc/Model/SaveCest.php
index 9f4915db4c6..f24d7855710 100644
--- a/tests/database/Mvc/Model/SaveCest.php
+++ b/tests/database/Mvc/Model/SaveCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Mvc\Model;
diff --git a/tests/database/Mvc/Model/UnderscoreCallCest.php b/tests/database/Mvc/Model/UnderscoreCallCest.php
index 2ae8a2068a3..0b1edb299f3 100644
--- a/tests/database/Mvc/Model/UnderscoreCallCest.php
+++ b/tests/database/Mvc/Model/UnderscoreCallCest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Mvc\Model\Resultset\Simple;
diff --git a/tests/database/Mvc/Model/UnderscoreCallStaticCest.php b/tests/database/Mvc/Model/UnderscoreCallStaticCest.php
index dbe02f15961..c90cf15e85c 100644
--- a/tests/database/Mvc/Model/UnderscoreCallStaticCest.php
+++ b/tests/database/Mvc/Model/UnderscoreCallStaticCest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Mvc\Model\Exception;
diff --git a/tests/database/Mvc/Model/UnderscoreGetCest.php b/tests/database/Mvc/Model/UnderscoreGetCest.php
index 130b358926d..be239ea88e8 100644
--- a/tests/database/Mvc/Model/UnderscoreGetCest.php
+++ b/tests/database/Mvc/Model/UnderscoreGetCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Mvc\Model\Exception;
diff --git a/tests/database/Mvc/Model/UnderscoreIssetCest.php b/tests/database/Mvc/Model/UnderscoreIssetCest.php
index 3db59565b99..bda41a39af7 100644
--- a/tests/database/Mvc/Model/UnderscoreIssetCest.php
+++ b/tests/database/Mvc/Model/UnderscoreIssetCest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
diff --git a/tests/database/Mvc/Model/UnderscoreSetCest.php b/tests/database/Mvc/Model/UnderscoreSetCest.php
index f5083b4f098..57d30313c7b 100644
--- a/tests/database/Mvc/Model/UnderscoreSetCest.php
+++ b/tests/database/Mvc/Model/UnderscoreSetCest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Phalcon\Tests\Integration\Mvc\Model;
+namespace Phalcon\Tests\Database\Mvc\Model;
use DatabaseTester;
use Phalcon\Mvc\Model;
diff --git a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php
index b61bbb9ec70..fe017d7ba65 100644
--- a/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php
+++ b/tests/tocheck-database/Mvc/Model/Refactor-ModelsResultsetCest.php
@@ -439,7 +439,7 @@ public function testBigResultsetIteration(IntegrationTester $I)
{
$this->setDiSqlite();
- // Resultsets count > 25 use fetch for one row at a time
+ // resultsets count > 25 use fetch for one row at a time
$personas = Personas::find([
'limit' => 33,
]);
diff --git a/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php
index 9f4e3652a98..77a0d28636b 100644
--- a/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Noop/SerializeUnserializeCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Test\Unit\Logger\Adapter\Noop;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Noop;
use Phalcon\Logger\Adapter\Noop;
use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
index 7d729f61175..2203f8856d9 100644
--- a/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Stream/SerializeUnserializeCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Test\Unit\Logger\Adapter\Stream;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Stream;
use Phalcon\Logger\Adapter\Stream;
use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php b/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php
index 0158676b22a..9469344c889 100644
--- a/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php
+++ b/tests/unit/Logger/Adapter/Syslog/SerializeUnserializeCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Test\Unit\Logger\Adapter\Syslog;
+namespace Phalcon\Tests\Unit\Logger\Adapter\Syslog;
use Phalcon\Logger\Adapter\Syslog;
use Phalcon\Logger\Exception;
diff --git a/tests/unit/Logger/Formatter/Json/FormatCest.php b/tests/unit/Logger/Formatter/Json/FormatCest.php
index 8fd1777ba1c..eeae0882e95 100644
--- a/tests/unit/Logger/Formatter/Json/FormatCest.php
+++ b/tests/unit/Logger/Formatter/Json/FormatCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Testss\Unit\Logger\Formatter\Json;
+namespace Phalcon\Tests\Unit\Logger\Formatter\Json;
use DateTimeImmutable;
use DateTimeZone;
diff --git a/tests/unit/Mvc/GlobalsCest.php b/tests/unit/Mvc/GlobalsCest.php
index 425ed4d4279..61d056e5a92 100644
--- a/tests/unit/Mvc/GlobalsCest.php
+++ b/tests/unit/Mvc/GlobalsCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Test\Unit\Mvc;
+namespace Phalcon\Tests\Unit\Mvc;
use Codeception\Example;
use UnitTester;
diff --git a/tests/unit/Mvc/Model/Query/GetExpressionCest.php b/tests/unit/Mvc/Model/Query/GetExpressionCest.php
index ba0a92b5bda..de0882f13ce 100644
--- a/tests/unit/Mvc/Model/Query/GetExpressionCest.php
+++ b/tests/unit/Mvc/Model/Query/GetExpressionCest.php
@@ -11,7 +11,7 @@
declare(strict_types=1);
-namespace Phalcon\Test\Unit\Mvc\Model\Query;
+namespace Phalcon\Tests\Unit\Mvc\Model\Query;
use Phalcon\Mvc\Model\Query;
use ReflectionClass;