Pull merge.

[yaffs-website] / web / core / lib / Drupal / Core / Entity / EntityForm.php

diff --git a/web/core/lib/Drupal/Core/Entity/EntityForm.php b/web/core/lib/Drupal/Core/Entity/EntityForm.php
index 35062185e9f86f0f2b907687b2b10cda48b7c276..796502861cae0a900ea63bae3e9205f8e3fa48ba 100644 (file)
--- a/web/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -38,6 +38,8 @@ class EntityForm extends FormBase implements EntityFormInterface {
    * @var \Drupal\Core\Entity\EntityManagerInterface
    *
    * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
+   *
+   * @see https://www.drupal.org/node/2549139
    */
   protected $entityManager;
 
@@ -219,6 +221,17 @@ class EntityForm extends FormBase implements EntityFormInterface {
   /**
    * Returns an array of supported actions for the current entity form.
    *
+   * This function generates a list of Form API elements which represent
+   * actions supported by the current entity form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   An array of supported Form API action elements keyed by name.
+   *
    * @todo Consider introducing a 'preview' action here, since it is used by
    *   many entity types.
    */