Merge remote-tracking branch 'origin/5.x' into 5.next

Author: dereuromark

composer.json

@@ -52,7 +52,6 @@
         ],
         "cs-check": "phpcs --colors -p",
         "cs-fix": "phpcbf --colors -p",
-        "stan": "phpstan analyze",
         "test": "phpunit --colors=always"
     }
 }

config/app.php

@@ -412,9 +412,33 @@
     'Session' => [
         'defaults' => 'php',
     ],
+
+    /**
+     * DebugKit configuration.
+     *
+     * Contains an array of configurations to apply to the DebugKit plugin, if loaded.
+     * Documentation: https://book.cakephp.org/debugkit/5/en/index.html#configuration
+     *
+     * ## Options
+     *
+     *  - `panels` - Enable or disable panels. The key is the panel name, and the value is true to enable,
+     *     or false to disable.
+     *  - `includeSchemaReflection` - Set to true to enable logging of schema reflection queries. Disabled by default.
+     *  - `safeTld` - Set an array of whitelisted TLDs for local development.
+     *  - `forceEnable` - Force DebugKit to display. Careful with this, it is usually safer to simply whitelist
+     *     your local TLDs.
+     *  - `ignorePathsPattern` - Regex pattern (including delimiter) to ignore paths.
+     *     DebugKit won’t save data for request URLs that match this regex.
+     *  - `ignoreAuthorization` - Set to true to ignore Cake Authorization plugin for DebugKit requests.
+     *     Disabled by default.
+     *  - `maxDepth` - Defines how many levels of nested data should be shown in general for debug output.
+     *     Default is 5. WARNING: Increasing the max depth level can lead to an out of memory error.
+     *  - `variablesPanelMaxDepth` - Defines how many levels of nested data should be shown in the variables tab.
+     *     Default is 5. WARNING: Increasing the max depth level can lead to an out of memory error.
+     */
     'DebugKit' => [
         'forceEnable' => filter_var(env('DEBUG_KIT_FORCE_ENABLE', false), FILTER_VALIDATE_BOOLEAN),
         'safeTld' => env('DEBUG_KIT_SAFE_TLD', null),
-        'ignoreAuthorization' => env('DEBUG_KIT_IGNORE_AUTHORIZATION', false)
+        'ignoreAuthorization' => env('DEBUG_KIT_IGNORE_AUTHORIZATION', false),
     ],
 ];

config/bootstrap.php

@@ -15,19 +15,20 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+/*
+ * This file is loaded by your src/Application.php bootstrap method.
+ * Feel free to extend/extract parts of the bootstrap process into your own files
+ * to suit your needs/preferences.
+ */
+
 /*
  * Configure paths required to find CakePHP + general filepath constants
  */
 require __DIR__ . DIRECTORY_SEPARATOR . 'paths.php';
 
 /*
- * Bootstrap CakePHP.
- *
- * Does the various bits of setup that CakePHP needs to do.
- * This includes:
- *
- * - Registering the CakePHP autoloader.
- * - Setting the default application paths.
+ * Bootstrap CakePHP
+ * Currently all this does is initialize the router (without loading your routes)
  */
 require CORE_PATH . 'config' . DS . 'bootstrap.php';
 
@@ -44,8 +45,8 @@
 use Cake\Routing\Router;
 use Cake\Utility\Security;
 
-/**
- * Load global functions.
+/*
+ * Load global functions for collections, translations, debugging etc.
  */
 require CAKE . 'functions.php';
 
@@ -72,12 +73,11 @@
 // }
 
 /*
- * Read configuration file and inject configuration into various
- * CakePHP classes.
+ * Initializes default Config store and loads the main configuration file (app.php)
  *
- * By default there is only one configuration file. It is often a good
- * idea to create multiple configuration files, and separate the configuration
- * that changes from configuration that does not. This makes deployment simpler.
+ * CakePHP contains 2 configuration files after project creation:
+ * - `config/app.php` for the default application configuration.
+ * - `config/app_local.php` for environment specific configuration.
  */
 try {
     Configure::config('default', new PhpConfig());
@@ -95,8 +95,7 @@
 }
 
 /*
- * When debug = true the metadata cache should only last
- * for a short time.
+ * When debug = true the metadata cache should only last for a short time.
  */
 if (Configure::read('debug')) {
     Configure::write('Cache._cake_model_.duration', '+2 minutes');
@@ -127,15 +126,26 @@
 (new ExceptionTrap(Configure::read('Error')))->register();
 
 /*
- * Include the CLI bootstrap overrides.
+ * CLI/Command specific configuration.
  */
 if (PHP_SAPI === 'cli') {
-    require CONFIG . 'bootstrap_cli.php';
+    // Set the fullBaseUrl to allow URLs to be generated in commands.
+    // This is useful when sending email from commands.
+    // Configure::write('App.fullBaseUrl', php_uname('n'));
+
+    // Set logs to different files so they don't have permission conflicts.
+    if (Configure::check('Log.debug')) {
+        Configure::write('Log.debug.file', 'cli-debug');
+    }
+    if (Configure::check('Log.error')) {
+        Configure::write('Log.error.file', 'cli-error');
+    }
 }
 
 /*
  * Set the full base URL.
  * This URL is used as the base of all absolute links.
+ * Can be very useful for CLI/Commandline applications.
  */
 $fullBaseUrl = Configure::read('App.fullBaseUrl');
 if (!$fullBaseUrl) {
@@ -165,6 +175,10 @@
 }
 unset($fullBaseUrl);
 
+/*
+ * Apply the loaded configuration settings to their respective systems.
+ * This will also remove the loaded config data from memory.
+ */
 Cache::setConfig(Configure::consume('Cache'));
 ConnectionManager::setConfig(Configure::consume('Datasources'));
 TransportFactory::setConfig(Configure::consume('EmailTransport'));
@@ -191,37 +205,29 @@
 /*
  * You can enable default locale format parsing by adding calls
  * to `useLocaleParser()`. This enables the automatic conversion of
- * locale specific date formats. For details see
+ * locale specific date formats when processing request data. For details see
  * @link https://book.cakephp.org/5/en/core-libraries/internationalization-and-localization.html#parsing-localized-datetime-data
  */
-// \Cake\Database\TypeFactory::build('time')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('date')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('datetime')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('timestamp')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('datetimefractional')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('timestampfractional')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('datetimetimezone')
-//    ->useLocaleParser();
-// \Cake\Database\TypeFactory::build('timestamptimezone')
-//    ->useLocaleParser();
+// \Cake\Database\TypeFactory::build('time')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('date')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('datetime')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('timestamp')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('datetimefractional')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('timestampfractional')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('datetimetimezone')->useLocaleParser();
+// \Cake\Database\TypeFactory::build('timestamptimezone')->useLocaleParser();
 
 /*
  * Custom Inflector rules, can be set to correctly pluralize or singularize
  * table, model, controller names or whatever other string is passed to the
  * inflection functions.
  */
-//Inflector::rules('plural', ['/^(inflect)or$/i' => '\1ables']);
-//Inflector::rules('irregular', ['red' => 'redlings']);
-//Inflector::rules('uninflected', ['dontinflectme']);
+// \Cake\Utility\Inflector::rules('plural', ['/^(inflect)or$/i' => '\1ables']);
+// \Cake\Utility\Inflector::rules('irregular', ['red' => 'redlings']);
+// \Cake\Utility\Inflector::rules('uninflected', ['dontinflectme']);
 
 // set a custom date and time format
 // see https://book.cakephp.org/5/en/core-libraries/time.html#setting-the-default-locale-and-format-string
 // and https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
-//\Cake\I18n\Date::setToStringFormat('dd.MM.yyyy');
-//\Cake\I18n\Time::setToStringFormat('dd.MM.yyyy HH:mm');
+// \Cake\I18n\Date::setToStringFormat('dd.MM.yyyy');
+// \Cake\I18n\Time::setToStringFormat('dd.MM.yyyy HH:mm');

config/bootstrap_cli.php

@@ -155,8 +155,7 @@ public static function setFolderPermissions(string $dir, IOInterface $io): void
         };
 
         $walker = function (string $dir) use (&$walker, $changePerms): void {
-            /** @phpstan-ignore-next-line */
-            $files = array_diff(scandir($dir), ['.', '..']);
+            $files = array_diff(scandir($dir) ?: [], ['.', '..']);
             foreach ($files as $file) {
                 $path = $dir . '/' . $file;
 
@@ -200,8 +199,12 @@ public static function setSecuritySaltInFile(string $dir, IOInterface $io, strin
     {
         $config = $dir . '/config/' . $file;
         $content = file_get_contents($config);
+        if ($content === false) {
+            $io->write('Config file not readable or not found: config/' . $file);
+
+            return;
+        }
 
-        /** @phpstan-ignore-next-line */
         $content = str_replace('__SALT__', $newKey, $content, $count);
 
         if ($count == 0) {
@@ -232,7 +235,12 @@ public static function setAppNameInFile(string $dir, IOInterface $io, string $ap
     {
         $config = $dir . '/config/' . $file;
         $content = file_get_contents($config);
-        /** @phpstan-ignore-next-line */
+        if ($content === false) {
+            $io->write('Config file not readable or not found: config/' . $file);
+
+            return;
+        }
+
         $content = str_replace('__APP_NAME__', $appName, $content, $count);
 
         if ($count == 0) {

src/Console/Installer.php

@@ -179,32 +179,34 @@ th {
 }
 
 /* Forms */
-.input.radio,
-.input.checkbox,
-.input.multicheckbox {
-    margin-bottom: 2.0rem;
-}
-.input.radio input,
-.input.checkbox input,
-.input.multicheckbox input {
-    margin: 0;
+.input {
+    margin-bottom: 1.5rem;
 }
-.input.radio label,
-.input.checkbox label,
-.input.multicheckbox label {
-    margin: 0;
+.input input,
+.input select,
+.input textarea {
+    margin-bottom: 0;
+}
+.input label:has(input[type='checkbox']),
+.input label:has(input[type='radio']) {
     display: flex;
     align-items: center;
 }
-.input.radio label > input,
-.input.checkbox label > input,
-.input.multicheckbox label > input {
+.input label:has(~ label),
+.input label:has(input[type='radio']) {
+    margin-bottom: 0;
+}
+.input label > input[type='checkbox'],
+.input label > input[type='radio'] {
     margin-right: 1.0rem;
 }
 input[type='color'] {
     max-width: 4rem;
     padding: 0.3rem .5rem 0.3rem;
 }
+.error-message {
+    color: var(--color-message-error-text);
+}
 
 /* Paginator */
 .paginator {