Merge pull request #8001 from cakephp/5.next-findorcreate

findOrCreate() with data array.

Author: markstory

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

@@ -101,16 +101,16 @@ Datasource
   This allows you to create dynamic validation messages based on the entity
   state and validation rule options.
 
-
 ORM
 ---
 
-- ``CounterCacheBehavior::updateCounterCache()`` has been addded. This method
+- ``CounterCacheBehavior::updateCounterCache()`` has been added. This method
   allows you to update the counter cache values for all records of the configured
   associations.
 - ``BelongsToMany::setJunctionProperty()`` and ``getJunctionProperty()`` were
   added. These methods allow you to customize the ``_joinData`` property that is
   used to hydrate junction table records.
+- ``Table::findOrCreate()`` now accepts an array as second argument to directly pass data in.
 
 View
 ----

en/orm/saving-data.rst

@@ -1182,6 +1182,15 @@ ideal in scenarios where you need to reduce the chance of duplicate records::
         }
     );
 
+As of 5.2.0, you can provide an array of data to set into the entity when it is
+created::
+
+    $otherData = ['name' => 'bobbi'];
+    $record = $table->findOrCreate(
+        ['email' => 'bobbi@example.com'],
+        $otherData,
+    );
+
 If your find conditions require custom order, associations or conditions, then
 the ``$search`` parameter can be a callable or ``SelectQuery`` object. If you use
 a callable, it should take a ``SelectQuery`` as its argument.
@@ -1193,6 +1202,9 @@ options for this method are:
 * ``defaults`` Set to ``false`` to not set ``$search`` properties into the
   created entity.
 
+.. versionadded:: 5.2.0
+    Support for ``$callback`` as an array of data was added.
+
 Creating with an existing primary key
 =====================================