From da91e5a9d4d88d2cb42688e42c21085b703004be Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 20 Apr 2014 11:16:35 +0100
Subject: [PATCH] Issue #2208015 by tim.plunkett: Remove "convert to trait"
comments about EntityWithPluginBagInterface.
---
core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php | 8 --------
.../Core/Config/Entity/EntityWithPluginBagInterface.php | 4 ----
2 files changed, 12 deletions(-)
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 76ba2ae103ae..f7c1832c3fdd 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -36,10 +36,6 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
* This is needed when the entity utilizes a PluginBag, to dictate where the
* plugin configuration should be stored.
*
- * @todo Move this to a trait along with
- * \Drupal\Core\Config\Entity\EntityWithPluginBagInterface, and give it a
- * default value of 'configuration'.
- *
* @var string
*/
protected $pluginConfigKey;
@@ -139,8 +135,6 @@ public function get($property_name) {
* {@inheritdoc}
*/
public function set($property_name, $value) {
- // @todo When \Drupal\Core\Config\Entity\EntityWithPluginBagInterface moves
- // to a trait, switch to class_uses() instead.
if ($this instanceof EntityWithPluginBagInterface) {
if ($property_name == $this->pluginConfigKey) {
// If external code updates the settings, pass it along to the plugin.
@@ -262,8 +256,6 @@ public function toArray() {
public function preSave(EntityStorageInterface $storage) {
parent::preSave($storage);
- // @todo When \Drupal\Core\Config\Entity\EntityWithPluginBagInterface moves
- // to a trait, switch to class_uses() instead.
if ($this instanceof EntityWithPluginBagInterface) {
// Any changes to the plugin configuration must be saved to the entity's
// copy as well.
diff --git a/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php b/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php
index 44c59589c69a..0d409548850e 100644
--- a/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php
@@ -11,8 +11,6 @@
* Provides an interface for an object utilizing a plugin bag.
*
* @see \Drupal\Component\Plugin\PluginBag
- *
- * @todo Turn this into a trait.
*/
interface EntityWithPluginBagInterface extends ConfigEntityInterface {
@@ -20,8 +18,6 @@ interface EntityWithPluginBagInterface extends ConfigEntityInterface {
* Returns the plugin bag used by this entity.
*
* @return \Drupal\Component\Plugin\PluginBag
- *
- * @todo Make this protected.
*/
public function getPluginBag();
--
GitLab