diff --git a/composer.lock b/composer.lock
index c9ef21a960..fcea70ee1f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "cakephp/authentication",
- "version": "2.10.1",
+ "version": "2.10.2",
"source": {
"type": "git",
"url": "https://github.com/cakephp/authentication.git",
- "reference": "643e17bcbbe2c5a01a5aaaa10d56df1a609ca6ab"
+ "reference": "64964e5a503a7d2a5560dfabc1b5d4439f61cdae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/authentication/zipball/643e17bcbbe2c5a01a5aaaa10d56df1a609ca6ab",
- "reference": "643e17bcbbe2c5a01a5aaaa10d56df1a609ca6ab",
+ "url": "https://api.github.com/repos/cakephp/authentication/zipball/64964e5a503a7d2a5560dfabc1b5d4439f61cdae",
+ "reference": "64964e5a503a7d2a5560dfabc1b5d4439f61cdae",
"shasum": ""
},
"require": {
@@ -72,7 +72,7 @@
"issues": "https://github.com/cakephp/authentication/issues",
"source": "https://github.com/cakephp/authentication"
},
- "time": "2023-03-17T16:13:23+00:00"
+ "time": "2023-10-01T18:57:13+00:00"
},
{
"name": "cakephp/cakephp",
@@ -188,16 +188,16 @@
},
{
"name": "cakephp/chronos",
- "version": "2.4.0",
+ "version": "2.4.3",
"source": {
"type": "git",
"url": "https://github.com/cakephp/chronos.git",
- "reference": "9c7e438cba4eed1796ec19ad3874defa9eb9aeac"
+ "reference": "96f28ddfceba2ff56e0d2405c28d789bd546ff55"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/chronos/zipball/9c7e438cba4eed1796ec19ad3874defa9eb9aeac",
- "reference": "9c7e438cba4eed1796ec19ad3874defa9eb9aeac",
+ "url": "https://api.github.com/repos/cakephp/chronos/zipball/96f28ddfceba2ff56e0d2405c28d789bd546ff55",
+ "reference": "96f28ddfceba2ff56e0d2405c28d789bd546ff55",
"shasum": ""
},
"require": {
@@ -242,20 +242,20 @@
"issues": "https://github.com/cakephp/chronos/issues",
"source": "https://github.com/cakephp/chronos"
},
- "time": "2023-08-06T22:54:27+00:00"
+ "time": "2023-10-17T08:00:24+00:00"
},
{
"name": "cakephp/migrations",
- "version": "3.8.2",
+ "version": "3.9.0",
"source": {
"type": "git",
"url": "https://github.com/cakephp/migrations.git",
- "reference": "1c7c060f8d91d62b0716f9b08e3d41bfece5386e"
+ "reference": "58446fdd096087ddf7752c0317731b8725d1dc28"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/migrations/zipball/1c7c060f8d91d62b0716f9b08e3d41bfece5386e",
- "reference": "1c7c060f8d91d62b0716f9b08e3d41bfece5386e",
+ "url": "https://api.github.com/repos/cakephp/migrations/zipball/58446fdd096087ddf7752c0317731b8725d1dc28",
+ "reference": "58446fdd096087ddf7752c0317731b8725d1dc28",
"shasum": ""
},
"require": {
@@ -302,30 +302,30 @@
"issues": "https://github.com/cakephp/migrations/issues",
"source": "https://github.com/cakephp/migrations"
},
- "time": "2023-06-12T01:40:01+00:00"
+ "time": "2023-09-22T08:39:18+00:00"
},
{
"name": "cakephp/plugin-installer",
- "version": "1.3.1",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/plugin-installer.git",
- "reference": "e27027aa2d3d8ab64452c6817629558685a064cb"
+ "reference": "5420701fd47d82fe81805ebee34fbbcef34c52ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/plugin-installer/zipball/e27027aa2d3d8ab64452c6817629558685a064cb",
- "reference": "e27027aa2d3d8ab64452c6817629558685a064cb",
+ "url": "https://api.github.com/repos/cakephp/plugin-installer/zipball/5420701fd47d82fe81805ebee34fbbcef34c52ba",
+ "reference": "5420701fd47d82fe81805ebee34fbbcef34c52ba",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0 || ^2.0",
- "php": ">=5.6.0"
+ "composer-plugin-api": "^2.0",
+ "php": ">=8.1"
},
"require-dev": {
- "cakephp/cakephp-codesniffer": "^3.3",
+ "cakephp/cakephp-codesniffer": "^5.0",
"composer/composer": "^2.0",
- "phpunit/phpunit": "^5.7 || ^6.5 || ^8.5 || ^9.3"
+ "phpunit/phpunit": "^10.1.0"
},
"type": "composer-plugin",
"extra": {
@@ -349,9 +349,9 @@
"description": "A composer installer for CakePHP 3.0+ plugins.",
"support": {
"issues": "https://github.com/cakephp/plugin-installer/issues",
- "source": "https://github.com/cakephp/plugin-installer/tree/1.3.1"
+ "source": "https://github.com/cakephp/plugin-installer/tree/2.0.1"
},
- "time": "2020-10-29T04:00:42+00:00"
+ "time": "2023-09-10T10:02:44+00:00"
},
{
"name": "composer/ca-bundle",
@@ -507,16 +507,16 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
+ "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
- "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+ "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
"shasum": ""
},
"require": {
@@ -548,9 +548,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
+ "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
},
- "time": "2023-06-03T09:27:29+00:00"
+ "time": "2023-09-27T20:04:15+00:00"
},
{
"name": "doctrine/lexer",
@@ -892,20 +892,20 @@
},
{
"name": "laminas/laminas-httphandlerrunner",
- "version": "2.7.0",
+ "version": "2.9.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-httphandlerrunner.git",
- "reference": "ab1fe48f1c367953d7e8f5cfbaf902672551d524"
+ "reference": "d3e84755a17e563b1c5f8290cbfb150210501a77"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/ab1fe48f1c367953d7e8f5cfbaf902672551d524",
- "reference": "ab1fe48f1c367953d7e8f5cfbaf902672551d524",
+ "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/d3e84755a17e563b1c5f8290cbfb150210501a77",
+ "reference": "d3e84755a17e563b1c5f8290cbfb150210501a77",
"shasum": ""
},
"require": {
- "php": "~8.1.0 || ~8.2.0",
+ "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"psr/http-message": "^1.0 || ^2.0",
"psr/http-message-implementation": "^1.0 || ^2.0",
"psr/http-server-handler": "^1.0"
@@ -955,7 +955,7 @@
"type": "community_bridge"
}
],
- "time": "2023-07-25T20:20:46+00:00"
+ "time": "2023-09-04T10:43:03+00:00"
},
{
"name": "league/container",
@@ -1261,16 +1261,16 @@
},
{
"name": "psr/http-client",
- "version": "1.0.2",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
@@ -1307,9 +1307,9 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+ "source": "https://github.com/php-fig/http-client"
},
- "time": "2023-04-10T20:12:12+00:00"
+ "time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
@@ -2428,16 +2428,16 @@
},
{
"name": "symfony/string",
- "version": "v6.3.2",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "53d1a83225002635bca3482fcbf963001313fb68"
+ "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
- "reference": "53d1a83225002635bca3482fcbf963001313fb68",
+ "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
+ "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
"shasum": ""
},
"require": {
@@ -2494,7 +2494,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.3.2"
+ "source": "https://github.com/symfony/string/tree/v6.3.5"
},
"funding": [
{
@@ -2510,7 +2510,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-05T08:41:27+00:00"
+ "time": "2023-09-18T10:38:32+00:00"
}
],
"packages-dev": [
@@ -2622,16 +2622,16 @@
},
{
"name": "cakephp/debug_kit",
- "version": "4.9.4",
+ "version": "4.9.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/debug_kit.git",
- "reference": "663491edec4a6b9111f1cf4733ebd471450df71e"
+ "reference": "4ffcdd20eb46d24308be28b9160f20a754fbcc54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/663491edec4a6b9111f1cf4733ebd471450df71e",
- "reference": "663491edec4a6b9111f1cf4733ebd471450df71e",
+ "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/4ffcdd20eb46d24308be28b9160f20a754fbcc54",
+ "reference": "4ffcdd20eb46d24308be28b9160f20a754fbcc54",
"shasum": ""
},
"require": {
@@ -2676,6 +2676,7 @@
"keywords": [
"cakephp",
"debug",
+ "dev",
"kit"
],
"support": {
@@ -2684,7 +2685,7 @@
"issues": "https://github.com/cakephp/debug_kit/issues",
"source": "https://github.com/cakephp/debug_kit"
},
- "time": "2023-07-05T16:04:04+00:00"
+ "time": "2023-10-23T14:02:11+00:00"
},
{
"name": "cakephp/twig-view",
@@ -2824,16 +2825,16 @@
},
{
"name": "composer/composer",
- "version": "2.6.4",
+ "version": "2.6.5",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60"
+ "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/d75d17c16a863438027d1d96401cddcd6aa5bb60",
- "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60",
+ "url": "https://api.github.com/repos/composer/composer/zipball/4b0fe89db9e65b1e64df633a992e70a7a215ab33",
+ "reference": "4b0fe89db9e65b1e64df633a992e70a7a215ab33",
"shasum": ""
},
"require": {
@@ -2918,7 +2919,7 @@
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"security": "https://github.com/composer/composer/security/policy",
- "source": "https://github.com/composer/composer/tree/2.6.4"
+ "source": "https://github.com/composer/composer/tree/2.6.5"
},
"funding": [
{
@@ -2934,7 +2935,7 @@
"type": "tidelift"
}
],
- "time": "2023-09-29T08:54:47+00:00"
+ "time": "2023-10-06T08:11:52+00:00"
},
{
"name": "composer/metadata-minifier",
@@ -3007,16 +3008,16 @@
},
{
"name": "composer/pcre",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+ "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
- "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+ "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
"shasum": ""
},
"require": {
@@ -3058,7 +3059,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.0"
+ "source": "https://github.com/composer/pcre/tree/3.1.1"
},
"funding": [
{
@@ -3074,7 +3075,7 @@
"type": "tidelift"
}
],
- "time": "2022-11-17T09:50:14+00:00"
+ "time": "2023-10-11T07:11:09+00:00"
},
{
"name": "composer/semver",
@@ -3690,16 +3691,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.16.0",
+ "version": "v4.17.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
+ "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
- "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+ "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"shasum": ""
},
"require": {
@@ -3740,9 +3741,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
},
- "time": "2023-06-25T14:52:30+00:00"
+ "time": "2023-08-13T19:53:39+00:00"
},
{
"name": "phar-io/manifest",
@@ -3857,16 +3858,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.27",
+ "version": "9.2.29",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
+ "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
- "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+ "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
"shasum": ""
},
"require": {
@@ -3923,7 +3924,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
},
"funding": [
{
@@ -3931,7 +3932,7 @@
"type": "github"
}
],
- "time": "2023-07-26T13:44:30+00:00"
+ "time": "2023-09-19T04:57:46+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -4176,16 +4177,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.10",
+ "version": "9.6.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328"
+ "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328",
- "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be",
+ "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be",
"shasum": ""
},
"require": {
@@ -4200,7 +4201,7 @@
"phar-io/manifest": "^2.0.3",
"phar-io/version": "^3.0.2",
"php": ">=7.3",
- "phpunit/php-code-coverage": "^9.2.13",
+ "phpunit/php-code-coverage": "^9.2.28",
"phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1",
"phpunit/php-text-template": "^2.0.3",
@@ -4259,7 +4260,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.10"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13"
},
"funding": [
{
@@ -4275,7 +4276,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-10T04:04:23+00:00"
+ "time": "2023-09-19T05:39:22+00:00"
},
{
"name": "react/promise",
@@ -5489,16 +5490,16 @@
},
{
"name": "symfony/finder",
- "version": "v6.3.3",
+ "version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e"
+ "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e",
- "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4",
+ "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4",
"shasum": ""
},
"require": {
@@ -5533,7 +5534,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.3.3"
+ "source": "https://github.com/symfony/finder/tree/v6.3.5"
},
"funding": [
{
@@ -5549,7 +5550,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-31T08:31:44+00:00"
+ "time": "2023-09-26T12:56:25+00:00"
},
{
"name": "symfony/polyfill-php73",
@@ -5951,16 +5952,16 @@
},
{
"name": "twig/markdown-extra",
- "version": "v3.7.0",
+ "version": "v3.7.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/markdown-extra.git",
- "reference": "8f1179e279cea6ef14066a4560b859df58acd5d8"
+ "reference": "83dfa86a0379f784ea30bdb9c15a356b8aabf780"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/8f1179e279cea6ef14066a4560b859df58acd5d8",
- "reference": "8f1179e279cea6ef14066a4560b859df58acd5d8",
+ "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/83dfa86a0379f784ea30bdb9c15a356b8aabf780",
+ "reference": "83dfa86a0379f784ea30bdb9c15a356b8aabf780",
"shasum": ""
},
"require": {
@@ -5972,7 +5973,7 @@
"league/commonmark": "^1.0|^2.0",
"league/html-to-markdown": "^4.8|^5.0",
"michelf/php-markdown": "^1.8|^2.0",
- "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+ "symfony/phpunit-bridge": "^5.4|^6.3"
},
"type": "library",
"autoload": {
@@ -6003,7 +6004,7 @@
"twig"
],
"support": {
- "source": "https://github.com/twigphp/markdown-extra/tree/v3.7.0"
+ "source": "https://github.com/twigphp/markdown-extra/tree/v3.7.1"
},
"funding": [
{
@@ -6015,20 +6016,20 @@
"type": "tidelift"
}
],
- "time": "2023-02-09T06:45:16+00:00"
+ "time": "2023-07-29T15:34:56+00:00"
},
{
"name": "twig/twig",
- "version": "v3.7.0",
+ "version": "v3.7.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "5cf942bbab3df42afa918caeba947f1b690af64b"
+ "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/5cf942bbab3df42afa918caeba947f1b690af64b",
- "reference": "5cf942bbab3df42afa918caeba947f1b690af64b",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554",
+ "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554",
"shasum": ""
},
"require": {
@@ -6038,7 +6039,7 @@
},
"require-dev": {
"psr/container": "^1.0|^2.0",
- "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+ "symfony/phpunit-bridge": "^5.4.9|^6.3"
},
"type": "library",
"autoload": {
@@ -6074,7 +6075,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.7.0"
+ "source": "https://github.com/twigphp/Twig/tree/v3.7.1"
},
"funding": [
{
@@ -6086,20 +6087,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-26T07:16:09+00:00"
+ "time": "2023-08-28T11:09:02+00:00"
},
{
"name": "vierge-noire/cakephp-fixture-factories",
- "version": "v2.9.1",
+ "version": "v2.9.2",
"source": {
"type": "git",
"url": "https://github.com/vierge-noire/cakephp-fixture-factories.git",
- "reference": "f3d7fec2ba142ef8be6491affe1019abc7490c8b"
+ "reference": "59af217779c16d7601469d5ffc48438d6d228db8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vierge-noire/cakephp-fixture-factories/zipball/f3d7fec2ba142ef8be6491affe1019abc7490c8b",
- "reference": "f3d7fec2ba142ef8be6491affe1019abc7490c8b",
+ "url": "https://api.github.com/repos/vierge-noire/cakephp-fixture-factories/zipball/59af217779c16d7601469d5ffc48438d6d228db8",
+ "reference": "59af217779c16d7601469d5ffc48438d6d228db8",
"shasum": ""
},
"require": {
@@ -6147,9 +6148,9 @@
],
"support": {
"issues": "https://github.com/vierge-noire/cakephp-fixture-factories/issues",
- "source": "https://github.com/vierge-noire/cakephp-fixture-factories/tree/v2.9.1"
+ "source": "https://github.com/vierge-noire/cakephp-fixture-factories/tree/v2.9.2"
},
- "time": "2023-07-14T14:41:57+00:00"
+ "time": "2023-08-23T14:03:11+00:00"
},
{
"name": "vierge-noire/cakephp-test-suite-light",
diff --git a/plugins/baser-core/README.md b/plugins/baser-core/README.md
index d13be94c15..7b2b0f083a 100644
--- a/plugins/baser-core/README.md
+++ b/plugins/baser-core/README.md
@@ -7,8 +7,8 @@
-
- 
+
+ 
diff --git a/plugins/baser-core/src/Controller/Admin/SitesController.php b/plugins/baser-core/src/Controller/Admin/SitesController.php
index a1d744a7de..83b84fe4e7 100644
--- a/plugins/baser-core/src/Controller/Admin/SitesController.php
+++ b/plugins/baser-core/src/Controller/Admin/SitesController.php
@@ -14,6 +14,7 @@
use BaserCore\Service\Admin\SitesAdminServiceInterface;
use BaserCore\Service\SiteConfigsServiceInterface;
use BaserCore\Service\SitesServiceInterface;
+use BaserCore\Service\ThemesServiceInterface;
use BaserCore\Utility\BcSiteConfig;
use Cake\Core\Exception\Exception;
use BaserCore\Annotation\Note;
@@ -21,6 +22,7 @@
use BaserCore\Annotation\Checked;
use BaserCore\Annotation\UnitTest;
use Cake\Http\Exception\NotFoundException;
+use Cake\ORM\Exception\PersistenceFailedException;
use Psr\Http\Message\ResponseInterface;
/**
@@ -66,11 +68,15 @@ public function index(SitesAdminServiceInterface $service)
* サイト追加
*
* @param SiteConfigsServiceInterface $service
+ * @return void|ResponseInterface
* @checked
* @unitTest
- * @note(value="インストーラーを実装してからテーマの保有するプラグインをインストールする処理を追加する")
+ * @noTodo
*/
- public function add(SitesAdminServiceInterface $service)
+ public function add(
+ SitesAdminServiceInterface $service,
+ ThemesServiceInterface $themesService
+ )
{
if ($this->request->is('post')) {
@@ -84,26 +90,20 @@ public function add(SitesAdminServiceInterface $service)
try {
$site = $service->create($this->request->getData());
+
// EVENT Sites.afterAdd
$this->dispatchLayerEvent('afterAdd', [
'data' => $site
]);
- // TODO ucmitz 未実装のためコメントアウト
- /* >>>
- if (!empty($site->theme)) {
- $this->BcManager->installThemesPlugins($site->theme);
- }
- <<< */
-
+ if ($site->theme) $themesService->installThemesPlugins($site->theme);
$this->BcMessage->setSuccess(sprintf(__d('baser_core', 'サイト「%s」を追加しました。'), $site->display_name));
return $this->redirect(['action' => 'edit', $site->id]);
- } catch (\Cake\ORM\Exception\PersistenceFailedException $e) {
+ } catch (PersistenceFailedException $e) {
$site = $e->getEntity();
$this->BcMessage->setError(__d('baser_core', '入力エラーです。内容を修正してください。'));
}
}
-
$this->set($service->getViewVarsForAdd($site ?? $service->getNew()));
}
diff --git a/plugins/baser-core/src/Plugin.php b/plugins/baser-core/src/Plugin.php
index ba6e7ac290..5b6eabfded 100644
--- a/plugins/baser-core/src/Plugin.php
+++ b/plugins/baser-core/src/Plugin.php
@@ -621,7 +621,7 @@ public function services(ContainerInterface $container): void
* @param CommandCollection $commands
* @return CommandCollection
* @checked
- * @checked
+ * @noTodo
*/
public function console(CommandCollection $commands): CommandCollection
{
diff --git a/plugins/baser-core/src/Service/ThemesService.php b/plugins/baser-core/src/Service/ThemesService.php
index f5a5a1078b..4812e4088c 100644
--- a/plugins/baser-core/src/Service/ThemesService.php
+++ b/plugins/baser-core/src/Service/ThemesService.php
@@ -273,11 +273,11 @@ private function getThemesDefaultDataInfo(string $theme, array $info = [])
* @unitTest
* @noTodo
*/
- private function installThemesPlugins(string $theme)
+ public function installThemesPlugins(string $theme)
{
/* @var PluginsService $pluginsService */
$pluginsService = $this->getService(PluginsServiceInterface::class);
- $plugins = BcUtil::getCurrentThemesPlugins();
+ $plugins = BcUtil::getThemesPlugins($theme);
// テーマ梱包のプラグインをインストール
foreach($plugins as $plugin) {
$pluginsService->install($plugin);
diff --git a/plugins/baser-core/src/Utility/BcAgent.php b/plugins/baser-core/src/Utility/BcAgent.php
index cfc8677405..0a3c009d7b 100644
--- a/plugins/baser-core/src/Utility/BcAgent.php
+++ b/plugins/baser-core/src/Utility/BcAgent.php
@@ -12,6 +12,7 @@
namespace BaserCore\Utility;
use BaserCore\Annotation\Checked;
use BaserCore\Annotation\UnitTest;
+use BaserCore\Annotation\NoTodo;
/**
* Class BcAgent
@@ -48,7 +49,7 @@ class BcAgent extends BcAbstractDetector
*
* @checked
* @unitTest
-
+ * @noTodo
*/
protected function _setConfig(array $config)
{
@@ -58,11 +59,11 @@ protected function _setConfig(array $config)
/**
* デフォルトの設定値を取得
- * @checked
- * @unitTest
-
*
* @return array
+ * @checked
+ * @unitTest
+ * @noTodo
*/
protected function _getDefaultConfig()
{
@@ -75,10 +76,10 @@ protected function _getDefaultConfig()
/**
* ユーザーエージェントの判定用正規表現を取得
*
+ * @return string
* @checked
* @unitTest
- *
- * @return string
+ * @noTodo
*/
public function getDetectorRegex()
{
@@ -89,10 +90,9 @@ public function getDetectorRegex()
/**
* ユーザーエージェントがキーワードを含むかどうかを判定
*
+ * @return bool
* @checked
* @unitTest
- *
- * @return bool
*/
public function isMatchDecisionKey()
{
diff --git a/plugins/baser-core/src/Utility/BcUtil.php b/plugins/baser-core/src/Utility/BcUtil.php
index 11bd9d64e2..2a2c55f5bb 100644
--- a/plugins/baser-core/src/Utility/BcUtil.php
+++ b/plugins/baser-core/src/Utility/BcUtil.php
@@ -495,7 +495,7 @@ static public function includePluginClass($pluginName)
* @return void
* @checked
* @unitTest
- * @note(value="viewキャッシュ／dataキャッシュ実装時に対応")
+ * @noTodo
*/
public static function clearAllCache(): void
{
@@ -1074,6 +1074,7 @@ public static function getContentsItem(): array
* baserCMSのインストールが完了しているかチェックする
* @return boolean
* @checked
+ * @noTodo
*/
public static function isInstalled()
{
diff --git a/plugins/baser-core/src/View/BcFrontEmailView.php b/plugins/baser-core/src/View/BcFrontEmailView.php
index 54fd1daabf..df63980561 100644
--- a/plugins/baser-core/src/View/BcFrontEmailView.php
+++ b/plugins/baser-core/src/View/BcFrontEmailView.php
@@ -33,6 +33,7 @@ class BcFrontEmailView extends View
*
* @checked
* @unitTest
+ * @noTodo
*/
public function initialize(): void
{
diff --git a/plugins/baser-core/src/View/Helper/BcBaserHelper.php b/plugins/baser-core/src/View/Helper/BcBaserHelper.php
index b6daf092f6..f81b5932d0 100755
--- a/plugins/baser-core/src/View/Helper/BcBaserHelper.php
+++ b/plugins/baser-core/src/View/Helper/BcBaserHelper.php
@@ -685,6 +685,7 @@ public function contentsName($detail = false, $options = [])
* @return string
* @checked
* @unitTest
+ * @noTodo
* @doc
*/
public function getContentsName($detail = false, $options = [])
@@ -794,7 +795,7 @@ public function getContentsName($detail = false, $options = [])
* @return string URL
* @checked
* @unitTest
- * @note(value="$sessionId について実装検討要")
+ * @noTodo
*/
public function getUrl($url = null, $full = false)
{
@@ -2025,10 +2026,10 @@ public function isCategoryTop()
* - `recursive` : 固定ページ読み込みを再帰的に読み込むかどうか（初期値 : true）
* - `checkExists` : 固定ページの存在判定をするかどうか（初期値 : true）
* @return void
- * @todo ucmitz loadHelpersが利用されていないのをなんとかする
*/
public function page($url, $params = [], $options = [])
{
+ // TODO ucmitz loadHelpersが利用されていないのをなんとかする
if (!empty($this->_View->get('pageRecursive')) && !$this->_View->get('pageRecursive')) {
return;
}
diff --git a/plugins/baser-core/src/View/Helper/BcFormHelper.php b/plugins/baser-core/src/View/Helper/BcFormHelper.php
index 50dc763b55..d7793f6ea3 100644
--- a/plugins/baser-core/src/View/Helper/BcFormHelper.php
+++ b/plugins/baser-core/src/View/Helper/BcFormHelper.php
@@ -95,7 +95,7 @@ class BcFormHelper extends FormHelper
* @param string $type フォームのタイプ タイプごとにイベントの登録ができる
* @return string 行データ
* @checked
- * @note(value="フォームの最後のフィールドの後に発動するイベント")
+ * @noTodo
*/
public function dispatchAfterForm($type = ''): string
{
diff --git a/plugins/baser-core/tests/Fixture/ContentsFixture.php b/plugins/baser-core/tests/Fixture/ContentsFixture.php
index a991752145..a7fcbe1e57 100644
--- a/plugins/baser-core/tests/Fixture/ContentsFixture.php
+++ b/plugins/baser-core/tests/Fixture/ContentsFixture.php
@@ -148,7 +148,6 @@ public function init(): void
'description' => '',
'eyecatch' => '00000006_eyecatch.gif',
'author_id' => 1,
- // NOTE ucmitz: layout templateテスト用
'layout_template' => 'serviceTemplate',
'status' => true,
'publish_begin' => null,
diff --git a/plugins/baser-core/tests/TestCase/View/Helper/BcAuthHelperTest.php b/plugins/baser-core/tests/TestCase/View/Helper/BcAuthHelperTest.php
index 66cfb1b9ff..a0c722a3ad 100644
--- a/plugins/baser-core/tests/TestCase/View/Helper/BcAuthHelperTest.php
+++ b/plugins/baser-core/tests/TestCase/View/Helper/BcAuthHelperTest.php
@@ -139,10 +139,11 @@ public function testGetCurrentLoginUrl()
/**
* Test getCurrentUserPrefixes
* @return void
- * @todo ucmitz getCurrentUserPrefixSettings() の実装が完了したら別パターンのテストを追加する
+ * @
*/
public function testGetCurrentUserPrefixes()
{
+ // TODO getCurrentUserPrefixSettings() の実装が完了したら別パターンのテストを追加する
$this->loginAdmin($this->getRequest('/baser/admin'));
$result = $this->BcAuth->getCurrentUserPrefixes();
$this->assertEquals(['Admin', 'Api/Admin'], $result);
diff --git a/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php b/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php
index f24bd77c93..ddca831dd6 100755
--- a/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php
+++ b/plugins/bc-blog/src/Controller/Admin/BlogContentsController.php
@@ -58,6 +58,7 @@ public function initialize(): void
* @return void|ResponseInterface
* @checked
* @unitTest
+ * @noTodo
*/
public function edit(BlogContentsAdminServiceInterface $service, int $id)
{
diff --git a/plugins/bc-blog/src/View/Helper/BlogHelper.php b/plugins/bc-blog/src/View/Helper/BlogHelper.php
index 31c62c79b1..f8bf46bc88 100755
--- a/plugins/bc-blog/src/View/Helper/BlogHelper.php
+++ b/plugins/bc-blog/src/View/Helper/BlogHelper.php
@@ -40,6 +40,7 @@
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Datasource\EntityInterface;
+use Cake\Datasource\Exception\RecordNotFoundException;
use Cake\Datasource\ResultSetInterface;
use Cake\Filesystem\Folder;
use Cake\ORM\TableRegistry;
@@ -141,10 +142,19 @@ public function setContent($blogContentId = null)
if($blogContentId) {
if(!$this->BlogContentsService) return;
- $this->currentBlogContent = $this->BlogContentsService->get($blogContentId);
+ try {
+ $this->currentBlogContent = $this->BlogContentsService->get($blogContentId);
+ } catch(RecordNotFoundException) {
+ $this->currentBlogContent = null;
+ $this->currentContent = null;
+ return;
+ } catch(\Throwable $e) {
+ throw $e;
+ }
$contentTable = TableRegistry::getTableLocator()->get('BaserCore.Contents');
// 現在のサイトにエイリアスが存在するのであればそちらを優先する
$site = $this->_View->getRequest()->getAttribute('currentSite');
+ $content = null;
if (!empty($site->id)) {
$content = $contentTable->find()->where([
'Contents.entity_id' => $this->currentBlogContent->id,
@@ -152,7 +162,8 @@ public function setContent($blogContentId = null)
'Contents.alias_id IS NOT' => null,
'Contents.site_id' => $site->id
])->first();
- } else {
+ }
+ if(!$content) {
$content = $contentTable->find()->where([
'Contents.entity_id' => $this->currentBlogContent->id,
'Contents.type' => 'BlogContent',
diff --git a/plugins/bc-blog/tests/TestCase/View/Helper/BlogHelperTest.php b/plugins/bc-blog/tests/TestCase/View/Helper/BlogHelperTest.php
index f0aef76126..3e25c5945f 100755
--- a/plugins/bc-blog/tests/TestCase/View/Helper/BlogHelperTest.php
+++ b/plugins/bc-blog/tests/TestCase/View/Helper/BlogHelperTest.php
@@ -83,46 +83,6 @@ public function test__construct()
$this->assertEquals(1, $this->Blog->currentContent->id);
}
- /**
- * ブログコンテンツデータをセットする
- *
- * @param int $blogContentId ブログコンテンツID
- * @param bool $viewVars viewVarsを設定
- * @dataProvider setContentDataProvider
- */
- public function testSetContent($blogContentId, $viewVars, $expected)
- {
- $this->markTestIncomplete('こちらのテストはまだ未確認です');
-// if ($viewVars) {
-// $View = new View();
-// $View->viewVars = ['blogContent' => [
-// 'BlogContent' => [
-// 'id' => 3,
-// 'name' => 'test',
-// ]
-// ]];
-// $View->request = $this->_getRequest('/');
-// $View->request->params['Content']['type'] = 'BlogContent';
-// $this->Blog = new BlogHelper($View);
-// }
-// $this->Blog->blogContent = null;
-// $this->Blog->setContent($blogContentId);
-// $result = null;
-// if (!empty($this->Blog->blogContent['id'])) {
-// $result = $this->Blog->blogContent['id'];
-// }
-// $this->assertEquals($result, $expected, 'ブログコンテンツデータを正しくセットできません');
- }
-
- public function setContentDataProvider()
- {
- return [
- [null, false, null],
- [2, false, 2],
- [null, true, 3],
- ];
- }
-
/**
* ブログIDを取得する
*/
@@ -226,6 +186,7 @@ public function testGetPostLinkUrl($blogContentId, $baseUrl, $useBase, $expects)
{
$this->truncateTable('contents');
$this->truncateTable('blog_contents');
+ $this->truncateTable('blog_posts');
// データ生成
$this->loadFixtureScenario(MultiSiteBlogPostScenario::class);
@@ -431,6 +392,7 @@ public function testGetCategoryUrl($blogCategoryId, $base, $useBase, $expected)
{
$this->truncateTable('contents');
$this->truncateTable('blog_contents');
+ $this->truncateTable('blog_categories');
$this->loadFixtureScenario(MultiSiteBlogScenario::class);
$blogContent = BlogContentFactory::get(6);
diff --git a/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php b/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php
index ac5e3cd4ca..f9d45595a3 100644
--- a/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php
+++ b/plugins/bc-custom-content/src/Model/Table/CustomContentsTable.php
@@ -30,6 +30,7 @@ class CustomContentsTable extends AppTable
* @param array $config テーブル設定
* @checked
* @unitTest
+ * @noTodo
*/
public function initialize(array $config): void
{
diff --git a/plugins/bc-installer/src/Controller/Admin/InstallationsController.php b/plugins/bc-installer/src/Controller/Admin/InstallationsController.php
index d7bc3b8456..fb358cd9f9 100644
--- a/plugins/bc-installer/src/Controller/Admin/InstallationsController.php
+++ b/plugins/bc-installer/src/Controller/Admin/InstallationsController.php
@@ -27,6 +27,7 @@
use BaserCore\Annotation\UnitTest;
use BaserCore\Annotation\NoTodo;
use BaserCore\Annotation\Checked;
+use Psr\Http\Message\ResponseInterface;
/**
* Class InstallationsController
@@ -46,6 +47,7 @@ class InstallationsController extends BcAdminAppController
*
* @return void
* @checked
+ * @noTodo
*/
public function beforeFilter(EventInterface $event)
{
@@ -138,8 +140,9 @@ public function step3(InstallationsAdminServiceInterface $service)
* Step 4: データベース生成／管理者ユーザー作成
*
* @param InstallationsAdminService $service
- * @return void
+ * @return void|ResponseInterface
* @checked
+ * @noTodo
*/
public function step4(InstallationsAdminServiceInterface $service)
{
diff --git a/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php b/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php
index 7444c92e86..14265b9c0c 100644
--- a/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php
+++ b/plugins/bc-installer/src/Service/Admin/InstallationsAdminService.php
@@ -134,6 +134,7 @@ public function getDefaultValuesStep4(ServerRequest $request): array
* @param array $data
* @return void
* @checked
+ * @noTodo
*/
public function writeDbSettingToSession(ServerRequest $request, array $data): void
{
@@ -330,6 +331,7 @@ public function login(ServerRequest $request, Response $response): void
*
* @param ServerRequest $request
* @checked
+ * @noTodo
*/
public function initDb(ServerRequest $request): void
{
diff --git a/plugins/bc-mail/src/Model/Validation/MailMessageValidation.php b/plugins/bc-mail/src/Model/Validation/MailMessageValidation.php
index 9ae91c684f..577ad727d4 100644
--- a/plugins/bc-mail/src/Model/Validation/MailMessageValidation.php
+++ b/plugins/bc-mail/src/Model/Validation/MailMessageValidation.php
@@ -108,6 +108,7 @@ public static function checkdate($value){
* @param array $context
* @return bool
* @checked
+ * @noTodo
*/
public static function checkSame(string $value, string $target, array $context)
{
diff --git a/plugins/bc-mail/src/Service/MailContentsService.php b/plugins/bc-mail/src/Service/MailContentsService.php
index 397cb2465f..f6d6241318 100644
--- a/plugins/bc-mail/src/Service/MailContentsService.php
+++ b/plugins/bc-mail/src/Service/MailContentsService.php
@@ -237,6 +237,7 @@ public function getList()
* @return EntityInterface $result
* @checked
* @unitTest
+ * @noTodo
*/
public function copy($postData)
{
diff --git a/plugins/bc-widget-area/src/Service/WidgetAreasService.php b/plugins/bc-widget-area/src/Service/WidgetAreasService.php
index 75f0bbefb9..915d8c55fa 100644
--- a/plugins/bc-widget-area/src/Service/WidgetAreasService.php
+++ b/plugins/bc-widget-area/src/Service/WidgetAreasService.php
@@ -137,6 +137,7 @@ public function delete(int $id)
* @return array
* @checked
* @unitTest
+ * @noTodo
*/
public function getTitlesById(array $ids): array
{
@@ -150,6 +151,7 @@ public function getTitlesById(array $ids): array
* @return bool
* @checked
* @unitTest
+ * @noTodo
*/
public function batch(string $method, array $ids): bool
{