Merge branch '5.next' into 6.x

Author: josbeir

.vitepress/config.js

@@ -1,4 +1,4 @@
-import baseConfig from '@cakephp/docs-skeleton/config'
+import baseConfig, { substitutionsReplacer } from '@cakephp/docs-skeleton/config'
 
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
@@ -19,9 +19,21 @@ const versions = {
   ],
 };
 
+const substitutions = {
+  '|phpversion|': { value: '8.5', format: 'bold' },
+  '|minphpversion|': { value: '8.4', format: 'italic' },
+  '|cakeversion|': '6.0.0',
+  '|cakefullversion|': 'CakePHP 6 (dev)',
+};
+
 // This file contains overrides for .vitepress/config.js
 export default {
   extends: baseConfig,
+  markdown: {
+    config(md) {
+      md.use(substitutionsReplacer, { substitutions });
+    }
+  },
   base: "/6.x/",
   rewrites: {
     "en/:slug*": ":slug*",
@@ -50,12 +62,6 @@ export default {
       linkText: 'Go to latest docs.'
     }
   },
-  substitutions: {
-    '|phpversion|': { value: '8.5', format: 'bold' },
-    '|minphpversion|': { value: '8.4', format: 'italic' },
-    '|cakeversion|': '6.0.0',
-    '|cakefullversion|': 'CakePHP 6 (dev)',
-  },
   locales: {
     root: {
       label: "English",

docs/en/appendices/5-4-migration-guide.md

@@ -16,28 +16,48 @@ bin/cake upgrade rector --rules cakephp54 <path/to/app/src>
 
 ## Behavior Changes
 
+### Commands
+
+- `BaseCommand::initialize()` is now being triggered **AFTER** arguments and options have been parsed.
+
 ### I18n
 
-`Number::parseFloat()` now returns `null` instead of `0.0` when parsing
-fails. This also affects `FloatType` and `DecimalType` database types.
+- `Number::parseFloat()` now returns `null` instead of `0.0` when parsing
+  fails. This also affects `FloatType` and `DecimalType` database types.
 
 ### ORM
 
-The default eager loading strategy for `HasMany` and `BelongsToMany` associations
-has changed from `select` to `subquery`. If you need the previous behavior,
-explicitly set `'strategy' => 'select'` when defining associations.
+- The default eager loading strategy for `HasMany` and `BelongsToMany` associations
+  has changed from `select` to `subquery`. If you need the previous behavior,
+  explicitly set `'strategy' => 'select'` when defining associations.
 
 ### Controller
 
-Loading a component with the same alias as the controller's default table now
-triggers a warning. See [Component Alias Conflicts](../controllers/components#component-alias-conflicts).
+- Loading a component with the same alias as the controller's default table now
+  triggers a warning. See [Component Alias Conflicts](../controllers/components#component-alias-conflicts).
 
 ## Deprecations
 
-- WIP
+### Mailer
+
+- The `Mailer::$name` property is unused and has been deprecated.
 
 ## New Features
 
+### Core
+
+- `PluginConfig::getInstalledPlugins()` was added to retrieve a list of all installed plugins
+  including flags to indicate about their scope and state.
+- A backwards compatible Container implementation has been added to the core. You can opt-in to use it instead of the current
+  `league/container` implementation by setting `App.container` to `cake` inside your `config/app.php`.
+  See [Dependency Injection Container](../development/dependency-injection) for more details.
+
+### Commands
+
+- You can use `$this->io` and `$this->args` inside your commands to access input/output and argument objects
+  without needing to pass them down from the `execute()` method. **This will be the default in CakePHP 6.0**
+  as those arguments will be removed from the `execute()` method signature.
+
 ### Controller
 
 - Added `#[RequestToDto]` attribute for automatic mapping of request data to
@@ -75,7 +95,9 @@ triggers a warning. See [Component Alias Conflicts](../controllers/components#co
 
 - Added `Cake\Utility\Fs\Finder` class for fluent file discovery with pattern matching,
   depth control, and custom filters. Added `Cake\Utility\Fs\Path` for cross-platform
-  path manipulation.
+  path manipulation. See [Filesystem Utilities](../core-libraries/filesystem.md).
+- `Security::encrypt()` can now be configured to use longer keys with separate encryption and authentication keys that are derived from the provided key.
+  You can set `Security.encryptWithRawKey` to enable this behavior. See [here](https://github.com/cakephp/cakephp/pull/19325) for more details.
 
 ### Collection
 

docs/en/console-commands/commands.md

@@ -48,14 +48,16 @@ You should see the following output:
 
     Hello world.
 
-::: info
-The `Arguments` and `ConsoleIo` instances passed to `execute()` are also
-available on the command instance as `$this->args` and `$this->io`.
-In 6.x, the `execute()` method signature will drop these arguments
-and `$this->args` / `$this->io` will be the only way to access
-these objects. See the
-[6.x command refactor](https://github.com/cakephp/cakephp/pull/18983) for
-details.
+::: info Added in version 5.4.0
+In CakePHP 5.4 and newer, the `Arguments` and `ConsoleIo` instances are also
+available on the command instance as `$this->args` and `$this->io` properties.
+This lets you access input, output, and arguments inside your command methods
+without passing these objects down from `execute()`.
+
+This will become the default in CakePHP 6.0, where the `execute()` method
+signature will no longer include `Arguments $args` and `ConsoleIo $io`.
+Updating your commands to use `$this->args` and `$this->io` now is
+recommended.
 :::
 
 Our `execute()` method isn't very interesting let's read some input from the

docs/ja/development/dependency-injection.md

@@ -211,7 +211,7 @@ class BillingServiceProvider extends ServiceProvider
 
     public function services(ContainerInterface $container): void
     {
-        $container->add(StripService::class);
+        $container->add(StripeService::class);
         $container->add('configKey', 'some value');
     }
 }