- 
-
+
+ 
+
+
@@ -68,6 +70,7 @@ tests for CakePHP by doing the following:
## Get Support!
* [Slack](https://cakesf.herokuapp.com/) - Join us on Slack.
+* [Discord](https://discord.gg/k4trEMPebj) - Join us on Discord.
* [#cakephp](https://webchat.freenode.net/?channels=#cakephp) on irc.freenode.net - Come chat with us, we have cake.
* [Forum](https://discourse.cakephp.org/) - Official CakePHP forum.
* [GitHub Issues](https://github.com/cakephp/cakephp/issues) - Got issues? Please tell us!
@@ -80,12 +83,5 @@ tests for CakePHP by doing the following:
# Security
-If you’ve found a security issue in CakePHP, please use the following procedure instead of the normal bug reporting system. Instead of using the bug tracker, mailing list or IRC please send an email to security [at] cakephp.org. Emails sent to this address go to the CakePHP core team on a private mailing list.
-
-For each report, we try to first confirm the vulnerability. Once confirmed, the CakePHP team will take the following actions:
-
-- Acknowledge to the reporter that we’ve received the issue, and are working on a fix. We ask that the reporter keep the issue confidential until we announce it.
-- Get a fix/patch prepared.
-- Prepare a post describing the vulnerability, and the possible exploits.
-- Release new versions of all affected versions.
-- Prominently feature the problem in the release announcement.
+If you’ve found a security issue in CakePHP, please use the procedure
+described in [SECURITY.md](.github/SECURITY.md).
diff --git a/app/vendor/cakephp/cakephp/SECURITY.md b/app/vendor/cakephp/cakephp/SECURITY.md
deleted file mode 100644
index fed257e9..00000000
--- a/app/vendor/cakephp/cakephp/SECURITY.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-We support fixing security issues on the following releases:
-
-| Version | Supported |
-| ------- | ------------------ |
-| 4.0.x | :white_check_mark: |
-| 3.8.x | :white_check_mark: |
-| 3.7.x | :white_check_mark: |
-| <= 3.6 | :x: |
-| 2.10.x | :white_check_mark: |
-| <= 2.9 | :x: |
-
-## Reporting a Vulnerability
-
-If you’ve found a security issue in CakePHP, please use the following procedure
-instead of the normal bug reporting system. Instead of using the bug tracker,
-mailing list or IRC please send an email to security [at] cakephp.org. Emails
-sent to this address go to the CakePHP core team on a private mailing list.
-
-For each report, we try to first confirm the vulnerability. Once confirmed,
-the CakePHP team will take the following actions:
-
-* Acknowledge to the reporter that we’ve received the issue, and are
- working on a fix. We ask that the reporter keep the issue confidential until we announce it.
-* Get a fix/patch prepared.
-* Prepare a post describing the vulnerability, and the possible exploits.
-* Release new versions of all affected versions.
-* Prominently feature the problem in the release announcement
diff --git a/app/vendor/cakephp/cakephp/VERSION.txt b/app/vendor/cakephp/cakephp/VERSION.txt
index 8b1a2d88..43155def 100644
--- a/app/vendor/cakephp/cakephp/VERSION.txt
+++ b/app/vendor/cakephp/cakephp/VERSION.txt
@@ -16,4 +16,4 @@
// @license https://opensource.org/licenses/mit-license.php MIT License
// +--------------------------------------------------------------------------------------------+ //
////////////////////////////////////////////////////////////////////////////////////////////////////
-4.2.9
+4.3.9
diff --git a/app/vendor/cakephp/cakephp/composer.json b/app/vendor/cakephp/cakephp/composer.json
index 2575cda2..ba3abe71 100644
--- a/app/vendor/cakephp/cakephp/composer.json
+++ b/app/vendor/cakephp/cakephp/composer.json
@@ -26,16 +26,17 @@
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
- "cakephp/chronos": "^2.0",
+ "cakephp/chronos": "^2.2",
"composer/ca-bundle": "^1.2",
"laminas/laminas-diactoros": "^2.2.2",
"laminas/laminas-httphandlerrunner": "^1.1",
- "league/container": "^3.2",
+ "league/container": "^4.2.0",
+ "psr/container": "^1.1 || ^2.0",
"psr/http-client": "^1.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
- "psr/log": "^1.0.0",
- "psr/simple-cache": "^1.0.0"
+ "psr/log": "^1.0 || ^2.0",
+ "psr/simple-cache": "^1.0 || ^2.0"
},
"replace": {
"cakephp/cache": "self.version",
@@ -55,8 +56,8 @@
"cakephp/validation": "self.version"
},
"require-dev": {
- "cakephp/cakephp-codesniffer": "^4.0",
- "mikey179/vfsstream": "^1.6",
+ "cakephp/cakephp-codesniffer": "^4.5",
+ "mikey179/vfsstream": "^1.6.10",
"paragonie/csp-builder": "^2.3",
"phpunit/phpunit": "^8.5 || ^9.3"
},
@@ -68,7 +69,10 @@
},
"config": {
"process-timeout": 900,
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
},
"autoload": {
"psr-4": {
@@ -87,6 +91,7 @@
"Cake\\PHPStan\\": "tests/PHPStan/",
"Cake\\Test\\": "tests/",
"TestApp\\": "tests/test_app/TestApp/",
+ "TestApp\\Test\\": "tests/test_app/TestApp/tests/",
"TestPlugin\\": "tests/test_app/Plugin/TestPlugin/src/",
"TestPlugin\\Test\\": "tests/test_app/Plugin/TestPlugin/tests/",
"TestPluginTwo\\": "tests/test_app/Plugin/TestPluginTwo/src/",
@@ -108,7 +113,11 @@
"@phpstan",
"@psalm"
],
- "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.94 psalm/phar:~4.9.3 && mv composer.backup composer.json",
+ "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon",
+ "stan-baseline": "phpstan.phar --generate-baseline",
+ "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.6.0 psalm/phar:~4.22.0 && mv composer.backup composer.json",
+ "lowest": "validate-prefer-lowest",
+ "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover=clover.xml"
},
diff --git a/app/vendor/cakephp/cakephp/src/Auth/AbstractPasswordHasher.php b/app/vendor/cakephp/cakephp/src/Auth/AbstractPasswordHasher.php
index 9b55f797..c9f3b408 100644
--- a/app/vendor/cakephp/cakephp/src/Auth/AbstractPasswordHasher.php
+++ b/app/vendor/cakephp/cakephp/src/Auth/AbstractPasswordHasher.php
@@ -30,14 +30,14 @@ abstract class AbstractPasswordHasher
*
* These are merged with user-provided config when the object is used.
*
- * @var array
+ * @var array