Merge branch '5.x' into 5.next

Author: ADmad

en/appendices/5-0-migration-guide.rst

@@ -68,6 +68,9 @@ Console
 - ``BaseCommand::__construct()`` was removed.
 - ``ConsoleIntegrationTestTrait::useCommandRunner()`` was removed since it's no longer needed.
 - ``Shell`` has been removed and should be replaced with `Command <https://book.cakephp.org/5/en/console-commands/commands.html>`__
+- ``ConsoleOptionParser::addSubcommand()`` was removed alongside the removal of
+  ``Shell``. Subcommands should be replaced with ``Command`` classes that
+  implement ``Command::defaultName()`` to define the necessary command name.
 - ``BaseCommand`` now emits ``Command.beforeExecute`` and
   ``Command.afterExecute`` events around the command's ``execute()`` method
   being invoked by the framework.

en/console-commands/commands.rst

@@ -482,7 +482,7 @@ Update the command class to the following::
         }
     }
 
-Now that we have an interactive subcommand, we can add a test case that tests
+Now that we have an interactive command, we can add a test case that tests
 that we receive the proper response, and one that tests that we receive an
 incorrect response. Remove the ``testUpdateModified`` method and, add the following methods to
 **tests/TestCase/Command/UpdateTableCommandTest.php**::

en/console-commands/option-parsers.rst

@@ -194,32 +194,12 @@ Building a ConsoleOptionParser from an Array
 
 .. php:method:: buildFromArray($spec)
 
-As previously mentioned, when creating subcommand option parsers, you can define
-the parser spec as an array for that method. This can help make building
-subcommand parsers easier, as everything is an array::
-
-    $parser->addSubcommand('check', [
-        'help' => __('Check the permissions between an ACO and ARO.'),
-        'parser' => [
-            'description' => [
-                __("Use this command to grant ACL permissions. Once executed, the "),
-                __("ARO specified (and its children, if any) will have ALLOW access "),
-                __("to the specified ACO action (and the ACO's children, if any)."),
-            ],
-            'arguments' => [
-                'aro' => ['help' => __('ARO to check.'), 'required' => true],
-                'aco' => ['help' => __('ACO to check.'), 'required' => true],
-                'action' => ['help' => __('Action to check')],
-            ],
-        ],
-    ]);
-
-Inside the parser spec, you can define keys for ``arguments``, ``options``,
-``description`` and ``epilog``. You cannot define ``subcommands`` inside an
-array style builder. The values for arguments, and options, should follow the
-format that :php:func:`Cake\\Console\\ConsoleOptionParser::addArguments()` and
+Option parsers can also be defined as arrays. Within the array, you can define
+keys for ``arguments``, ``options``, ``description`` and ``epilog``.  The values
+for arguments, and options, should follow the format that
+:php:func:`Cake\\Console\\ConsoleOptionParser::addArguments()` and
 :php:func:`Cake\\Console\\ConsoleOptionParser::addOptions()` use. You can also
-use buildFromArray on its own, to build an option parser::
+use ``buildFromArray`` on its own, to build an option parser::
 
     public function getOptionParser()
     {
@@ -287,8 +267,8 @@ returned as XML:
     cake bake --help xml
     cake bake -h xml
 
-The above would return an XML document with the generated help, options,
-arguments and subcommands for the selected shell. A sample XML document would
+The above would return an XML document with the generated help, options, and
+arguments for the selected shell. A sample XML document would
 look like:
 
 .. code-block:: xml

en/installation.rst

@@ -117,19 +117,35 @@ Each time you run ``php composer.phar update`` you will receive patch
 releases for this minor version. You can instead change this to ``^5.0`` to
 also receive the latest stable minor releases of the ``5.x`` branch.
 
-Installation using Oven
+Installation using DDEV
 -----------------------
 
-Another quick way to install CakePHP is via `Oven <https://github.com/CakeDC/oven>`_.
-It is a small PHP script which checks the necessary system requirements,
-and creates a new CakePHP application.
+Another quick way to install CakePHP is via `DDEV <https://ddev.com/>`_.
+It is an open source tool for launching local web development environments.
+
+If you want to configure a new project, you just need::
+
+    mkdir my-cakephp-app
+    cd my-cakephp-app
+    ddev config --project-type=cakephp --docroot=webroot
+    ddev composer create --prefer-dist cakephp/app:~5.0
+    ddev launch
+
+If you have an existing project::
+
+    git clone <your-cakephp-repo>
+    cd <your-cakephp-project>
+    ddev config --project-type=cakephp --docroot=webroot
+    ddev composer install
+    ddev launch
+
+Please check `DDEV Docs <https://ddev.readthedocs.io/>`_ for details on how to install / update DDEV.
 
 .. note::
 
     IMPORTANT: This is not a deployment script. It is aimed to help developers
-    install CakePHP for the first time and set up a development environment
-    quickly. Production environments should consider several other factors, like
-    file permissions, virtualhost configuration, etc.
+    to set up a development environment quickly. It is not intended for
+    production environments.
 
 Permissions
 ===========

es/installation.rst

@@ -91,6 +91,36 @@ Donde ``<branch>`` es el nombre del branch que quieres seguir. Cada vez que
 ejecutes ``php composer.phar update`` recibirás las últimas actualizaciones del
 branch seleccionado.
 
+Instalación usando DDEV
+-----------------------
+
+Otra manera rápida de instalar CakePHP es via `DDEV <https://ddev.com/>`_.
+DDEV es una herramienta de código abierto para lanzar ambientes de desarrollo web en local.
+
+Si quieres configurar un nuevo proyecto, sólo necesitas ejecutar::
+
+    mkdir my-cakephp-app
+    cd my-cakephp-app
+    ddev config --project-type=cakephp --docroot=webroot
+    ddev composer create --prefer-dist cakephp/app:~5.0
+    ddev launch
+
+Si tienes un proyecto existente::
+
+    git clone <your-cakephp-repo>
+    cd <your-cakephp-project>
+    ddev config --project-type=cakephp --docroot=webroot
+    ddev composer install
+    ddev launch
+
+Por favor revisa la `Documentación de DDEV <https://ddev.readthedocs.io/>`_ para más detalles de cómo instalar / actualizar DDEV.
+
+.. note::
+
+    IMPORTANTE: Ésto no es un script de despliegue. Su objetivo es ayudar desarrolladores a
+    configurar ambientes de desarrollo rápidamente. En ningún caso su intención es que sea utilizado
+    en ambientes de producción.
+
 Permisos
 ========
 

ja/appendices.rst

@@ -4,22 +4,19 @@
 ここでは、各バージョンで導入された新機能に関する情報と、
 バージョン間の移行手順を解説します。
 
-4.x 移行ガイド
+5.x 移行ガイド
 ==============
 
 .. toctree::
     :maxdepth: 1
 
-    appendices/4-0-migration-guide
-    appendices/4-1-migration-guide
-    appendices/4-2-migration-guide
-    appendices/4-3-migration-guide
-    appendices/fixture-upgrade
+    appendices/5-0-upgrade-guide
+    appendices/5-0-migration-guide
 
 後方互換性の補完
 ================
 
-3.x の挙動に関する対応が必要な場合、または段階的な移行に関する助けが必要な場合、
+4.x の挙動に関する対応が必要な場合、または段階的な移行に関する助けが必要な場合、
 `Shim プラグイン <https://github.com/dereuromark/cakephp-shim>`__ を確認してください。
 後方互換性を損なう変更を移行するのに役立ちます。