Merge branch '5.x' into 5.next

Author: markstory

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.11
 

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open for 120 days with no activity. Remove the `stale` label or comment or this will be closed in 15 days'

config/conf.py

@@ -115,3 +115,5 @@
 .. |phpversion| replace:: **8.2**
 .. |minphpversion| replace:: 8.1
 """
+
+# todo_include_todos = True

en/appendices.rst

@@ -4,7 +4,7 @@ Appendices
 Appendices contain information regarding the new features
 introduced in each version and the migration path between versions.
 
-4.x Migration Guide
+5.x Migration Guide
 ===================
 
 .. toctree::
@@ -17,7 +17,7 @@ introduced in each version and the migration path between versions.
 Backwards Compatibility Shimming
 ================================
 
-If you need/want to shim 3.x behavior, or partially migrate in steps, check out
+If you need/want to shim 4.x behavior, or partially migrate in steps, check out
 the `Shim plugin <https://github.com/dereuromark/cakephp-shim>`__ that can help mitigate some BC breaking changes.
 
 Forwards Compatibility Shimming

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

@@ -132,6 +132,7 @@ Database
 - ``Connection::disconnect()`` has been removed. Use
   ``$connection->getDriver()->disconnect()`` instead.
 - ``cake.database.queries`` has been added as an alternative to the ``queriesLog`` scope
+- The ability to enable/disable ResultSet buffering has been removed. Results are always buffered.
 
 Datasource
 ----------

en/console-commands/input-output.rst

@@ -195,7 +195,7 @@ Writing to ``stdout`` and ``stderr`` is another common operation in CakePHP::
     $io->err('Error message');
 
 In addition to vanilla output methods, CakePHP provides wrapper methods that
-style output with appropriate ANSI colours::
+style output with appropriate ANSI colors::
 
     // Green text on stdout
     $io->success('Success message');
@@ -307,9 +307,9 @@ new output style you could do::
     $io->setStyle('flashy', ['text' => 'magenta', 'blink' => true]);
 
 This would then allow you to use a ``<flashy>`` tag in your shell output, and if
-ansi colours are enabled, the following would be rendered as blinking magenta
+ansi colors are enabled, the following would be rendered as blinking magenta
 text ``$this->out('<flashy>Whoooa</flashy> Something went wrong');``. When
-defining styles you can use the following colours for the ``text`` and
+defining styles you can use the following colors for the ``text`` and
 ``background`` attributes:
 
 * black
@@ -332,10 +332,10 @@ truthy value enables them.
 Adding a style makes it available on all instances of ConsoleOutput as well,
 so you don't have to redeclare styles for both stdout and stderr objects.
 
-Turning Off Colouring
-=====================
+Turning Off Coloring
+====================
 
-Although colouring is pretty, there may be times when you want to turn it off,
+Although coloring is pretty, there may be times when you want to turn it off,
 or force it on::
 
     $io->outputAs(ConsoleOutput::RAW);
@@ -350,6 +350,6 @@ no styling is done at all. There are three modes you can use.
   This is a good mode to use if you are outputting XML or, want to debug why
   your styling isn't working.
 
-By default on \*nix systems ConsoleOutput objects default to colour output.
+By default on \*nix systems ConsoleOutput objects default to color output.
 On Windows systems, plain output is the default unless the ``ANSICON``
 environment variable is present.

en/controllers.rst

@@ -68,8 +68,8 @@ is invoked at the end of a Controller's constructor for this kind of use::
     {
         public function initialize(): void
         {
-            // Always enable the CSRF component.
-            $this->loadComponent('Csrf');
+            // Always enable the FormProtection component.
+            $this->loadComponent('FormProtection');
         }
     }
 
@@ -320,8 +320,8 @@ actions, you can call ``addClasses()`` within your action too::
         // Rest of the action code
     }
 
-If within your controller actions you need to process request or load data
-differently based on the controller action you can use
+If within your controller actions you need to process the request or load data
+differently based on the content type you can use
 :ref:`check-the-request`::
 
     // In a controller action
@@ -510,7 +510,7 @@ want loaded, and any configuration data for them::
     public function initialize(): void
     {
         parent::initialize();
-        $this->loadComponent('Csrf');
+        $this->loadComponent('Flash');
         $this->loadComponent('Comments', Configure::read('Comments'));
     }
 

en/controllers/components.rst

@@ -25,7 +25,7 @@ Configuring Components
 ======================
 
 Many of the core components require configuration. One example would be
-the :doc:`/controllers/components/form-protection`.  Configuration for these components,
+the :doc:`/controllers/components/form-protection`. Configuration for these components,
 and for components in general, is usually done via ``loadComponent()`` in your
 Controller's ``initialize()`` method or via the ``$components`` array::
 
@@ -37,9 +37,8 @@ Controller's ``initialize()`` method or via the ``$components`` array::
             $this->loadComponent('FormProtection', [
                 'unlockedActions' => ['index'],
             ]);
-            $this->loadComponent('Csrf');
+            $this->loadComponent('Flash');
         }
-
     }
 
 You can configure components at runtime using the ``setConfig()`` method. Often,
@@ -58,7 +57,7 @@ to read and write configuration data::
     $this->FormProtection->getConfig('unlockedActions');
 
     // Set config
-    $this->Csrf->setConfig('cookieName', 'token');
+    $this->Flash->setConfig('key', 'myFlash');
 
 As with helpers, components will automatically merge their ``$_defaultConfig``
 property with constructor configuration to create the ``$_config`` property
@@ -193,12 +192,12 @@ component, through which we can access an instance of it::
 
     // In a controller
     // Make the new component available at $this->Math,
-    // as well as the standard $this->Csrf
+    // as well as the standard $this->Flash
     public function initialize(): void
     {
         parent::initialize();
         $this->loadComponent('Math');
-        $this->loadComponent('Csrf');
+        $this->loadComponent('Flash');
     }
 
 When including Components in a Controller you can also declare a
@@ -214,7 +213,7 @@ the Component::
             'precision' => 2,
             'randomGenerator' => 'srand',
         ]);
-        $this->loadComponent('Csrf');
+        $this->loadComponent('Flash');
     }
 
 The above would pass the array containing precision and randomGenerator to

en/development/testing.rst

@@ -111,7 +111,7 @@ and number passed.
 
 .. note::
 
-    If you are on a Windows system you probably won't see any colours.
+    If you are on a Windows system you probably won't see any colors.
 
 Test Case Conventions
 =====================
@@ -412,7 +412,7 @@ contains the fixture extension:
     <!-- in phpunit.xml -->
     <!-- Setup the extension for fixtures -->
     <extensions>
-        <extension class="\Cake\TestSuite\Fixture\PHPUnitExtension"/>
+        <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
     </extensions>
 
 The extension is included in your application and plugins generated by ``bake``

en/intro/cakephp-folder-structure.rst

@@ -55,7 +55,7 @@ View
 
 .. note::
 
-    The folder ``Shell`` is not present by default.
+    The folder ``Command`` is not present by default.
     You can add it when you need it.
 
 .. meta::