Merge branch '5.x' into 5.next

Author: ADmad

Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:bookworm
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 LABEL Description="This image is used to create an environment to contribute to the cakephp/docs"
 

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

@@ -129,7 +129,7 @@ View
 ----
 
 - ``FormHelper::deleteLink()`` has been added as convenience wrapper for delete links in
-   templates using ``DELETE`` method.
+  templates using ``DELETE`` method.
 - ``HtmlHelper::importmap()`` was added. This method allows you to define
   import maps for your JavaScript files.
 - ``FormHelper`` now uses the ``containerClass`` template to apply a class to

en/development/testing.rst

@@ -733,6 +733,17 @@ name::
 In the above example, both fixtures would be loaded from
 ``tests/Fixture/Blog/``.
 
+You can also directly include fixtures by FQCN::
+
+    public function getFixtures(): array
+    {
+        return [
+            UsersFixture::class,
+            ArticlesFixture::class,
+        ];
+    }
+
+
 Fixture Factories
 -----------------
 

en/orm/database-basics.rst

@@ -540,40 +540,39 @@ implement the following methods:
 * ``marshal``: Marshals flat data into PHP objects.
 
 To fulfill the basic interface, extend :php:class:`Cake\\Database\\Type`.
-For example if we wanted to add a JSON type, we could make the following type
+For example if we wanted to add a PointMutation type, we could make the following type
 class::
 
-    // in src/Database/Type/JsonType.php
+    // in src/Database/Type/PointMutationType.php
 
     namespace App\Database\Type;
 
     use Cake\Database\Driver;
     use Cake\Database\Type\BaseType;
     use PDO;
 
-    class JsonType extends BaseType
+    class PointMutationType extends BaseType
     {
         public function toPHP(mixed $value, Driver $driver): mixed
         {
             if ($value === null) {
                 return null;
             }
 
-            return json_decode($value, true);
-        }
+            return $this->pmDecode($valu
 
         public function marshal(mixed $value): mixed
         {
             if (is_array($value) || $value === null) {
                 return $value;
             }
 
-            return json_decode($value, true);
+            return $this->pmDecode($value);
         }
 
         public function toDatabase(mixed $value, Driver $driver): mixed
         {
-            return json_encode($value);
+            return sprintf('%d%s>%s', $value['position'], $value['from'], $value['to']);
         }
 
         public function toStatement(mixed $value, Driver $driver): int
@@ -584,6 +583,19 @@ class::
 
             return PDO::PARAM_STR;
         }
+
+        protected function pmDecode(mixed $value): mixed
+        {
+            if (preg_match('/^(\d+)([a-zA-Z])>([a-zA-Z])$/', $value, $matches)) {
+                return [
+                    'position' => (int) $matches[1],
+                    'from' => $matches[2],
+                    'to' => $matches[3]
+                ];
+            }
+
+            return null;
+        }
     }
 
 By default the ``toStatement()`` method will treat values as strings which will
@@ -597,7 +609,8 @@ the type mapping. During our application bootstrap we should do the following::
 
     use Cake\Database\TypeFactory;
 
-    TypeFactory::map('json', \App\Database\Type\JsonType::class);
+    TypeFactory::map('point_mutation', \App\Database\Type\PointMutationType:class);
+
 
 We then have two ways to use our datatype in our models.
 
@@ -606,27 +619,27 @@ We then have two ways to use our datatype in our models.
    and define the SQL column type and reflection logic.
 
 Overwriting the reflected schema with our custom type will enable CakePHP's
-database layer to automatically convert JSON data when creating queries. In your
-Table's :ref:`initialize() method <saving-complex-types>` add the
+database layer to automatically convert PointMutation data when creating queries. In your
+Table's :ref:`getSchema() method <saving-complex-types>` add the
+
 following::
 
     class WidgetsTable extends Table
     {
         public function initialize(array $config): void
         {
-            parent::initialize($config);
+            return parent::getSchema()->setColumnType('mutation', 'point_mutation');
 
-            $this->getSchema()->setColumnType('widget_prefs', 'json');
         }
     }
 
 Implementing ``ColumnSchemaAwareInterface`` gives you more control over
 custom datatypes.  This avoids overwriting schema definitions if your
 datatype has an unambiguous SQL column definition. For example, we could have
-our JSON type be used anytime a ``TEXT`` column with a specific comment is
+our PointMutation type be used anytime a ``TEXT`` column with a specific comment is
 used::
 
-    // in src/Database/Type/JsonType.php
+    // in src/Database/Type/PointMutationType.php
 
     namespace App\Database\Type;
 
@@ -636,7 +649,7 @@ used::
     use Cake\Database\Schema\TableSchemaInterface;
     use PDO;
 
-    class JsonType extends BaseType
+    class PointMutationType extends BaseType
         implements ColumnSchemaAwareInterface
     {
         // other methods from earlier
@@ -691,8 +704,8 @@ no value for the current database driver:
 Mapping Custom Datatypes to SQL Expressions
 -------------------------------------------
 
-The previous example maps a custom datatype for a 'json' column type which is
-easily represented as a string in a SQL statement. Complex SQL data
+The previous example maps a custom datatype for a 'point_mutation' column type
+which is easily represented as a string in a SQL statement. Complex SQL data
 types cannot be represented as strings/integers in SQL queries. When working
 with these datatypes your Type class needs to implement the
 ``Cake\Database\Type\ExpressionTypeInterface`` interface. This interface lets

en/orm/deleting-data.rst

@@ -6,7 +6,7 @@ Deleting Data
 .. php:class:: Table
     :noindex:
 
-.. php:method:: delete(Entity $entity, $options = [])
+.. php:method:: delete(EntityInterface $entity, array $options = [])
 
 Once you've loaded an entity you can delete it by calling the originating
 table's delete method::
@@ -65,7 +65,7 @@ these options enabled would be::
 Bulk Deletes
 ------------
 
-.. php:method:: deleteMany($entities, $options = [])
+.. php:method:: deleteMany(iterable $entities, array $options = [])
 
 If you have an array of entities you want to delete you can use ``deleteMany()``
 to delete them in a single transaction::
@@ -86,7 +86,7 @@ In these cases it is more performant to use a bulk-delete to remove many rows at
 once::
 
     // Delete all the spam
-    function destroySpam()
+    public function destroySpam()
     {
         return $this->deleteAll(['is_spam' => true]);
     }
@@ -103,7 +103,7 @@ function returns the number of deleted records as an integer.
 Strict Deletes
 --------------
 
-.. php:method:: deleteOrFail($entity, $options = [])
+.. php:method:: deleteOrFail(EntityInterface $entity, array $options = [])
 
 Using this method will throw an
 :php:exc:`Cake\\ORM\\Exception\\PersistenceFailedException` if:

en/orm/saving-data.rst

@@ -1136,7 +1136,7 @@ would not normally be able to.
 Strict Saving
 =============
 
-.. php:method:: saveOrFail($entity, $options = [])
+.. php:method:: saveOrFail(EntityInterface $entity, array $options = [])
 
 Using this method will throw an
 :php:exc:`Cake\\ORM\\Exception\\PersistenceFailedException` if:
@@ -1222,7 +1222,7 @@ Instead, assign the primary key and then patch in the remaining entity data::
 Saving Multiple Entities
 ========================
 
-.. php:method:: saveMany($entities, $options = [])
+.. php:method:: saveMany(iterable $entities, array $options = [])
 
 Using this method you can save multiple entities atomically. ``$entities`` can
 be an array of entities created using ``newEntities()`` / ``patchEntities()``.

en/orm/table-objects.rst

@@ -269,10 +269,10 @@ Behaviors, can use this hook to add in validation methods.
 buildRules
 ----------
 
-.. php:method:: buildRules(EventInterface $event, RulesChecker $rules)
+.. php:method:: buildRules(RulesChecker $rules): RulesChecker
 
 The ``Model.buildRules`` event is fired after a rules instance has been
-created and after the table's ``buildRules()`` method has been called.
+created and after the ``Table::buildRules()`` method has been called.
 
 beforeRules
 -----------

en/views/helpers/form.rst

@@ -1596,7 +1596,7 @@ use::
 Creating Date & Time Related Controls
 -------------------------------------
 
-.. php:method:: dateTime($fieldName, $options = [])
+.. php:method:: dateTime(string $fieldName, array $options = [])
 
 * ``$fieldName`` - A string that will be used as a prefix for the HTML ``name``
   attribute of the ``select`` elements.
@@ -1630,7 +1630,7 @@ Output:
 Creating Date Controls
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. php:method:: date($fieldName, $options = [])
+.. php:method:: date(string $fieldName, array $options = [])
 
 * ``$fieldName`` - A field name that will be used as a prefix for the HTML
   ``name`` attribute of the ``select`` elements.
@@ -1652,7 +1652,7 @@ Output:
 Creating Time Controls
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. php:method:: time($fieldName, $options = [])
+.. php:method:: time(string $fieldName, array $options = [])
 
 * ``$fieldName`` - A field name that will be used as a prefix for the HTML
   ``name`` attribute of the ``select`` elements.
@@ -2333,7 +2333,7 @@ Generating Entire Forms
 Creating Multiple Controls
 --------------------------
 
-.. php:method:: controls(array $fields = [], $options = [])
+.. php:method:: controls(array $fields = [], array $options = [])
 
 * ``$fields`` - An array of fields to generate. Allows setting
   custom types, labels and other options for each specified field.

en/views/helpers/html.rst

@@ -532,7 +532,7 @@ and also wanted to include **webroot/js/Blog.plugins.js**, you would::
 Creating Inline Javascript Blocks
 ---------------------------------
 
-.. php:method:: scriptBlock($code, $options = [])
+.. php:method:: scriptBlock(string $code, array $options = [])
 
 To generate Javascript blocks from PHP view code, you can use one of the script
 block methods. Scripts can either be output in place, or buffered into a block::
@@ -543,7 +543,7 @@ block methods. Scripts can either be output in place, or buffered into a block::
     // Buffer a script block to be output later.
     $this->Html->scriptBlock('alert("hi")', ['block' => true]);
 
-.. php:method:: scriptStart($options = [])
+.. php:method:: scriptStart(array $options = [])
 .. php:method:: scriptEnd()
 
 You can use the ``scriptStart()`` method to create a capturing block that will

es/orm/deleting-data.rst

@@ -6,7 +6,7 @@ Deleting Data
 .. php:class:: Table
     :noindex:
 
-.. php:method:: delete(Entity $entity, $options = [])
+.. php:method:: delete(EntityInterface $entity, array $options = [])
 
 .. note::
     La documentación no es compatible actualmente con el idioma español en esta página.