Merge branch '5.next' into 5.next-findorcreate

Author: markstory

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

@@ -33,6 +33,12 @@ Datasource
 - The ability to cast an ``EntityInterface`` instance to string has been deprecated.
   You should ``json_encode()`` the entity instead.
 
+Event
+-----
+
+- Returning values from event listeners / callbacks is deprecated. Use ``$event->setResult()``
+  instead or ``$event->stopPropogation()`` to just stop the event propogation.
+
 View
 ----
 
@@ -83,6 +89,13 @@ Database
   quote values to be used in SQL queries where prepared statements cannot be
   used.
 
+Datasource
+----------
+
+- Application rules can now use ``Closure`` to define the validation message.
+  This allows you to create dynamic validation messages based on the entity
+  state and validation rule options.
+
 ORM
 ---
 

en/orm/validation.rst

@@ -527,11 +527,28 @@ by the ones returned from the rule::
         ]
      );
 
+As of 5.2.0, you can also provide a ``Closure`` for the ``message`` key. When
+the validation rule fails, you can create dynamic error messages based on the
+entity and options::
+
+    $rules->add(
+        $rules->existsIn('article_id', 'Articles'),
+        'article_exists',
+        [
+            'message' => function ($entity, $options) {
+                return sprintf(
+                    'Article with ID %s does not exist',
+                    $entity->article_id
+                );
+            }
+        ]
+    );
+
 .. note::
 
     Note that in order for the returned message to be actually used, you *must* also supply the
     ``errorField`` option, otherwise the rule will just silently fail to pass, ie without an
-    error message being set on the entity!
+    error message being set on the entity.
 
 Creating Custom re-usable Rules
 -------------------------------