Issue #2985362 by DanielVeza, tim.plunkett, mstrelan, quietone, kim.pepper,...

Issue #2985362 by DanielVeza, tim.plunkett, mstrelan, quietone, kim.pepper, acbramley: Create an interface to share the definition of the overridable methods on DefaultsSectionStorageInterface and LayoutEntityDisplayInterface

(cherry picked from commit a99e0b57)

core/modules/layout_builder/src/DefaultsSectionStorageInterface.php

@@ -6,27 +6,5 @@
 
 /**
  * Defines an interface for an object that stores layout sections for defaults.
- *
- * @todo Refactor this interface in https://www.drupal.org/node/2985362.
  */
-interface DefaultsSectionStorageInterface extends SectionStorageInterface, ThirdPartySettingsInterface, LayoutBuilderEnabledInterface {
-
-  /**
-   * Determines if the defaults allow custom overrides.
-   *
-   * @return bool
-   *   TRUE if custom overrides are allowed, FALSE otherwise.
-   */
-  public function isOverridable();
-
-  /**
-   * Sets the defaults to allow or disallow overrides.
-   *
-   * @param bool $overridable
-   *   TRUE if the display should allow overrides, FALSE otherwise.
-   *
-   * @return $this
-   */
-  public function setOverridable($overridable = TRUE);
-
-}
+interface DefaultsSectionStorageInterface extends SectionStorageInterface, ThirdPartySettingsInterface, LayoutBuilderEnabledInterface, LayoutBuilderOverridableInterface {}

core/modules/layout_builder/src/Entity/LayoutEntityDisplayInterface.php

@@ -5,30 +5,9 @@
 use Drupal\Core\Entity\Display\EntityDisplayInterface;
 use Drupal\layout_builder\LayoutBuilderEnabledInterface;
 use Drupal\layout_builder\SectionListInterface;
+use Drupal\layout_builder\LayoutBuilderOverridableInterface;
 
 /**
  * Provides an interface for entity displays that have layout.
- *
- * @todo Refactor this interface in https://www.drupal.org/node/2985362.
  */
-interface LayoutEntityDisplayInterface extends EntityDisplayInterface, SectionListInterface, LayoutBuilderEnabledInterface {
-
-  /**
-   * Determines if the display allows custom overrides.
-   *
-   * @return bool
-   *   TRUE if custom overrides are allowed, FALSE otherwise.
-   */
-  public function isOverridable();
-
-  /**
-   * Sets the display to allow or disallow overrides.
-   *
-   * @param bool $overridable
-   *   TRUE if the display should allow overrides, FALSE otherwise.
-   *
-   * @return $this
-   */
-  public function setOverridable($overridable = TRUE);
-
-}
+interface LayoutEntityDisplayInterface extends EntityDisplayInterface, SectionListInterface, LayoutBuilderEnabledInterface, LayoutBuilderOverridableInterface {}

core/modules/layout_builder/src/LayoutBuilderOverridableInterface.php

+<?php
+
+namespace Drupal\layout_builder;
+
+/**
+ * Provides an interface for displays that could be overridable.
+ */
+interface LayoutBuilderOverridableInterface {
+
+  /**
+   * Determines if the display allows custom overrides.
+   *
+   * @return bool
+   *   TRUE if custom overrides are allowed, FALSE otherwise.
+   */
+  public function isOverridable();
+
+  /**
+   * Sets the display to allow or disallow overrides.
+   *
+   * @param bool $overridable
+   *   TRUE if the display should allow overrides, FALSE otherwise.
+   *
+   * @return $this
+   */
+  public function setOverridable($overridable = TRUE);
+
+}