Merge branch '4.x' into 4.next

Author: othercorey

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - '4.x'
       - '4.next'
+      - '5.x'
   pull_request:
     branches:
       - '*'
@@ -79,7 +80,7 @@ jobs:
         coverage: none
 
     - name: Composer install
-      run: composer require --dev phpstan/phpstan:^0.12
+      run: composer require --dev phpstan/phpstan:^1.0.0
 
     - name: Run phpstan
-      run: vendor/bin/phpstan.phar analyse
+      run: vendor/bin/phpstan

.gitignore

@@ -13,7 +13,8 @@
 ._*
 .Spotlight-V100
 .Trashes
-Icon?
+# Icon must end with two \r
+Icon
 ehthumbs.db
 Thumbs.db
 .directory
@@ -22,6 +23,7 @@ Thumbs.db
 #######################
 # PHPUnit
 .phpunit.result.cache
+tests.sqlite
 # vim
 *~
 *.swp
@@ -39,5 +41,12 @@ Thumbs.db
 nbproject/*
 # Visual Studio Code
 .vscode
+# nova
+.nova
 # Sass preprocessor
 .sass-cache/
+# node
+/node_modules/*
+# yarn
+yarn-debug.log
+yarn-error.log

composer.json

@@ -6,23 +6,23 @@
     "license": "MIT",
     "require": {
         "php": ">=7.2",
-        "cakephp/cakephp": "dev-4.next as 4.3.0",
-        "cakephp/migrations": "dev-3.next as 3.2.0",
+        "cakephp/cakephp": "^4.3",
+        "cakephp/migrations": "^3.2",
         "cakephp/plugin-installer": "^1.3",
         "mobiledetect/mobiledetectlib": "^2.8"
     },
     "require-dev": {
-        "cakephp/bake": "^2.3",
-        "cakephp/repl": "^0.1",
+        "cakephp/bake": "^2.6",
         "cakephp/cakephp-codesniffer": "^4.5",
-        "cakephp/debug_kit": "dev-4.next as 4.5.0",
+        "cakephp/debug_kit": "^4.5",
         "josegonzalez/dotenv": "^3.2",
         "phpunit/phpunit": "~8.5.0 || ^9.3"
     },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
         "dereuromark/cakephp-ide-helper": "After baking your code, this keeps your annotations in sync with the code evolving from there on for maximum IDE and PHPStan/Psalm compatibility.",
-        "phpstan/phpstan": "PHPStan focuses on finding errors in your code without actually running it. It catches whole classes of bugs even before you write tests for the code."
+        "phpstan/phpstan": "PHPStan focuses on finding errors in your code without actually running it. It catches whole classes of bugs even before you write tests for the code.",
+        "cakephp/repl": "Console tools for a REPL interface for CakePHP applications."
     },
     "autoload": {
         "psr-4": {
@@ -49,6 +49,10 @@
     },
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "cakephp/plugin-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

config/.env.example

@@ -22,9 +22,9 @@ export SECURITY_SALT="__SALT__"
 
 # Uncomment these to define cache configuration via environment variables.
 #export CACHE_DURATION="+2 minutes"
-#export CACHE_DEFAULT_URL="file://tmp/cache/?prefix=${APP_NAME}_default&duration=${CACHE_DURATION}"
-#export CACHE_CAKECORE_URL="file://tmp/cache/persistent?prefix=${APP_NAME}_cake_core&serialize=true&duration=${CACHE_DURATION}"
-#export CACHE_CAKEMODEL_URL="file://tmp/cache/models?prefix=${APP_NAME}_cake_model&serialize=true&duration=${CACHE_DURATION}"
+#export CACHE_DEFAULT_URL="file:///path/to/tmp/cache/?prefix=${APP_NAME}_default_&duration=${CACHE_DURATION}"
+#export CACHE_CAKECORE_URL="file:///path/to/tmp/cache/persistent?prefix=${APP_NAME}_cake_core_&serialize=true&duration=${CACHE_DURATION}"
+#export CACHE_CAKEMODEL_URL="file:///path/to/tmp/cache/models?prefix=${APP_NAME}_cake_model_&serialize=true&duration=${CACHE_DURATION}"
 
 # Uncomment these to define email transport configuration via environment variables.
 #export EMAIL_TRANSPORT_DEFAULT_URL=""
@@ -34,5 +34,5 @@ export SECURITY_SALT="__SALT__"
 #export DATABASE_TEST_URL="mysql://my_app:secret@localhost/test_${APP_NAME}?encoding=utf8&timezone=UTC&cacheMetadata=true&quoteIdentifiers=false&persistent=false"
 
 # Uncomment these to define logging configuration via environment variables.
-#export LOG_DEBUG_URL="file://logs/?levels[]=notice&levels[]=info&levels[]=debug&file=debug"
-#export LOG_ERROR_URL="file://logs/?levels[]=warning&levels[]=error&levels[]=critical&levels[]=alert&levels[]=emergency&file=error"
+#export LOG_DEBUG_URL="file:///path/to/logs/?levels[]=notice&levels[]=info&levels[]=debug&file=debug"
+#export LOG_ERROR_URL="file:///path/to/logs/?levels[]=warning&levels[]=error&levels[]=critical&levels[]=alert&levels[]=emergency&file=error"

config/routes.php

@@ -39,8 +39,8 @@
      * `Route` (`Cake\Routing\Route\Route`)
      *
      * Note that `Route` does not do any inflections on URLs which will result in
-     * inconsistently cased URLs when used with `:plugin`, `:controller` and
-     * `:action` markers.
+     * inconsistently cased URLs when used with `{plugin}`, `{controller}` and
+     * `{action}` markers.
      */
     $routes->setRouteClass(DashedRoute::class);
 
@@ -63,8 +63,8 @@
          * The `fallbacks` method is a shortcut for
          *
          * ```
-         * $builder->connect('/:controller', ['action' => 'index']);
-         * $builder->connect('/:controller/:action/*', []);
+         * $builder->connect('/{controller}', ['action' => 'index']);
+         * $builder->connect('/{controller}/{action}/*', []);
          * ```
          *
          * You can remove these routes once you've connected the

phpstan.neon

@@ -1,8 +1,8 @@
 parameters:
-    level: 7
+    level: 8
     checkMissingIterableValueType: false
     treatPhpDocTypesAsCertain: false
     paths:
-        - src
-    excludes_analyse:
+        - src/
+    excludePaths:
         - src/Console/Installer.php

src/Console/Installer.php

@@ -20,6 +20,7 @@
     define('STDIN', fopen('php://stdin', 'r'));
 }
 
+use Cake\Codeception\Console\Installer as CodeceptionInstaller;
 use Cake\Utility\Security;
 use Composer\Script\Event;
 use Exception;
@@ -63,9 +64,8 @@ public static function postInstall(Event $event)
         static::setFolderPermissions($rootDir, $io);
         static::setSecuritySalt($rootDir, $io);
 
-        $class = 'Cake\Codeception\Console\Installer';
-        if (class_exists($class)) {
-            $class::customizeCodeceptionBinary($event);
+        if (class_exists(CodeceptionInstaller::class)) {
+            CodeceptionInstaller::customizeCodeceptionBinary($event);
         }
     }
 

templates/element/flash/info.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * @var \App\View\AppView $this
+ * @var array $params
+ * @var string $message
+ */
+if (!isset($params['escape']) || $params['escape'] !== false) {
+    $message = h($message);
+}
+?>
+<div class="message" onclick="this.classList.add('hidden');"><?= $message ?></div>

templates/element/flash/warning.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * @var \App\View\AppView $this
+ * @var array $params
+ * @var string $message
+ */
+if (!isset($params['escape']) || $params['escape'] !== false) {
+    $message = h($message);
+}
+?>
+<div class="message warning" onclick="this.classList.add('hidden');"><?= $message ?></div>

templates/email/html/default.php

@@ -12,10 +12,11 @@
  * @since         0.10.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  * @var \App\View\AppView $this
+ * @var string $content
  */
 
-$content = explode("\n", $content);
+$lines = explode("\n", $content);
 
-foreach ($content as $line) :
+foreach ($lines as $line) :
     echo '<p> ' . $line . "</p>\n";
 endforeach;