diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php index 8fecdbc..c72b707 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php @@ -15,6 +15,13 @@ class ConfigEntityType extends EntityType { /** + * Returns the config prefix used by the configuration entity type. + * + * @var string + */ + protected $config_prefix; + + /** * {@inheritdoc} */ public function getControllerClasses() { diff --git a/core/lib/Drupal/Core/Entity/ContentEntityType.php b/core/lib/Drupal/Core/Entity/ContentEntityType.php index 16b97bd..14f7ee2 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityType.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityType.php @@ -15,6 +15,15 @@ class ContentEntityType extends EntityType { /** * {@inheritdoc} */ + public function getControllerClasses() { + return parent::getControllerClasses() + array( + 'storage' => 'Drupal\Core\Entity\FieldableDatabaseStorageController', + ); + } + + /** + * {@inheritdoc} + */ public function getConfigPrefix() { return FALSE; } diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php index b26e963..4eae0df 100644 --- a/core/lib/Drupal/Core/Entity/EntityType.php +++ b/core/lib/Drupal/Core/Entity/EntityType.php @@ -164,13 +164,6 @@ class EntityType implements EntityTypeInterface { protected $translatable = FALSE; /** - * Returns the config prefix used by the configuration entity type. - * - * @var string - */ - protected $config_prefix; - - /** * The human-readable name of the type. * * @var string diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php index adecb7e..cdaea5a 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php @@ -20,7 +20,6 @@ * label = @Translation("Custom Block"), * bundle_label = @Translation("Custom Block type"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "access" = "Drupal\custom_block\CustomBlockAccessController", * "list" = "Drupal\custom_block\CustomBlockListController", * "view_builder" = "Drupal\custom_block\CustomBlockViewBuilder", diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php index 4f225f6..b8f2a0e 100644 --- a/core/modules/node/lib/Drupal/node/Entity/Node.php +++ b/core/modules/node/lib/Drupal/node/Entity/Node.php @@ -23,7 +23,6 @@ * label = @Translation("Content"), * bundle_label = @Translation("Content type"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "view_builder" = "Drupal\node\NodeViewBuilder", * "access" = "Drupal\node\NodeAccessController", * "form" = { diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php index 39d4f15..b609bbd 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php @@ -22,7 +22,6 @@ * label = @Translation("Shortcut link"), * module = "shortcut", * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "access" = "Drupal\shortcut\ShortcutAccessController", * "form" = { * "default" = "Drupal\shortcut\ShortcutFormController", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php index 405449c..72acdf2 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php @@ -21,7 +21,6 @@ * id = "entity_test", * label = @Translation("Test entity"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "list" = "Drupal\entity_test\EntityTestListController", * "view_builder" = "Drupal\entity_test\EntityTestViewBuilder", * "access" = "Drupal\entity_test\EntityTestAccessController", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php index 8134acf..14ed78a 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php @@ -16,7 +16,6 @@ * id = "entity_test_base_field_display", * label = @Translation("Test entity - base field display"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "access" = "Drupal\entity_test\EntityTestAccessController", * "form" = { * "default" = "Drupal\entity_test\EntityTestFormController" diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php index 2925514..6e509b5 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php @@ -16,7 +16,6 @@ * id = "entity_test_cache", * label = @Translation("Test entity with field cache"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "access" = "Drupal\entity_test\EntityTestAccessController", * "form" = { * "default" = "Drupal\entity_test\EntityTestFormController" diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php index 5a58511..7df4362 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php @@ -13,9 +13,6 @@ * @ContentEntityType( * id = "entity_test_default_access", * label = @Translation("Test entity with default access"), - * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController" - * }, * base_table = "entity_test", * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php index bb26eb5..90a56a5 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php @@ -14,7 +14,6 @@ * id = "entity_test_label", * label = @Translation("Entity Test label"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "view_builder" = "Drupal\entity_test\EntityTestViewBuilder" * }, * base_table = "entity_test", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php index d09e935..481711f 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php @@ -13,9 +13,6 @@ * @ContentEntityType( * id = "entity_test_label_callback", * label = @Translation("Entity test label callback"), - * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController" - * }, * field_cache = FALSE, * base_table = "entity_test", * revision_table = "entity_test_revision", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php index 668520a..2292ca5 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php @@ -17,7 +17,6 @@ * id = "entity_test_mul", * label = @Translation("Test entity - data table"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "view_builder" = "Drupal\entity_test\EntityTestViewBuilder", * "access" = "Drupal\entity_test\EntityTestAccessController", * "form" = { diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php index 89a54a9..e82dde3 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php @@ -17,7 +17,6 @@ * id = "entity_test_mulrev", * label = @Translation("Test entity - revisions and data table"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "access" = "Drupal\entity_test\EntityTestAccessController", * "form" = { * "default" = "Drupal\entity_test\EntityTestFormController" diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php index fc31836..6dc35d4 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php @@ -13,9 +13,6 @@ * @ContentEntityType( * id = "entity_test_no_label", * label = @Translation("Entity Test without label"), - * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController" - * }, * field_cache = FALSE, * base_table = "entity_test", * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php index 987bcae..5ab2561 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php @@ -17,7 +17,6 @@ * id = "entity_test_rev", * label = @Translation("Test entity - revisions"), * controllers = { - * "storage" = "Drupal\Core\Entity\FieldableDatabaseStorageController", * "access" = "Drupal\entity_test\EntityTestAccessController", * "form" = { * "default" = "Drupal\entity_test\EntityTestFormController" diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php index 66ac456..33753da 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php @@ -22,7 +22,6 @@ * label = @Translation("Taxonomy term"), * bundle_label = @Translation("Vocabulary"), * controllers = { - * "storage" = "Drupal\taxonomy\TermStorageController", * "view_builder" = "Drupal\taxonomy\TermViewBuilder", * "access" = "Drupal\taxonomy\TermAccessController", * "form" = {