Pull merge.

[yaffs-website] / web / core / lib / Drupal / Core / Layout / Annotation / Layout.php

diff --git a/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php b/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php
index 1cb5ff0a542c9b8a20ea91f0e0bae80650a31100..eae930cf4eb1bfe338c6830722e0ed309083bb04 100644 (file)
--- a/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php
+++ b/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php
@@ -14,11 +14,6 @@ use Drupal\Core\Layout\LayoutDefinition;
  *
  * Plugin namespace: Plugin\Layout
  *
- * @internal
- *   The layout system is currently experimental and should only be leveraged by
- *   experimental modules and development releases of contributed modules.
- *   See https://www.drupal.org/core/experimental for more information.
- *
  * @see \Drupal\Core\Layout\LayoutInterface
  * @see \Drupal\Core\Layout\LayoutDefault
  * @see \Drupal\Core\Layout\LayoutPluginManager
@@ -116,6 +111,15 @@ class Layout extends Plugin {
    */
   public $icon;
 
+  /**
+   * The icon map.
+   *
+   * @var string[][] optional
+   *
+   * @see \Drupal\Core\Layout\Icon\IconBuilderInterface::build()
+   */
+  public $icon_map;
+
   /**
    * An associative array of regions in this layout.
    *