diff --git a/core/includes/entity.inc b/core/includes/entity.inc index 6715721..460c0e3 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -70,7 +70,7 @@ function entity_get_bundles($entity_type = NULL) { function entity_invoke_bundle_hook($hook, $entity_type, $bundle, $bundle_new = NULL) { entity_info_cache_clear(); - // Notify the entity storage controller. + // Notify the entity storage. $method = 'onBundle' . ucfirst($hook); $storage = \Drupal::entityManager()->getStorage($entity_type); if (method_exists($storage, $method)) { diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 3a0dd76..9105c02 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -297,7 +297,7 @@ protected function importConfig($op, $name) { * otherwise. */ protected function importInvokeOwner($op, $name) { - // Call to the configuration entity's storage controller to handle the + // Call to the configuration entity's storage to handle the // configuration change. $handled_by_module = FALSE; // Validate the configuration object name before importing it. diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php index 0c21bcd..15059cd 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php @@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; /** - * Defines the storage controller class for configuration entities. + * Defines the storage class for configuration entities. * * Configuration object names of configuration entities are comprised of two * parts, separated by a dot: diff --git a/core/lib/Drupal/Core/Entity/DatabaseEntityStorage.php b/core/lib/Drupal/Core/Entity/DatabaseEntityStorage.php index 98043c7..3c36a90 100644 --- a/core/lib/Drupal/Core/Entity/DatabaseEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/DatabaseEntityStorage.php @@ -169,14 +169,14 @@ public function load($id) { * {@inheritdoc} */ public function loadRevision($revision_id) { - throw new \Exception('Database storage controller does not support revisions.'); + throw new \Exception('Database storage does not support revisions.'); } /** * {@inheritdoc} */ public function deleteRevision($revision_id) { - throw new \Exception('Database storage controller does not support revisions.'); + throw new \Exception('Database storage does not support revisions.'); } /** diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php index 10f64e6..122df34 100644 --- a/core/lib/Drupal/Core/Entity/EntityInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityInterface.php @@ -200,7 +200,7 @@ public function delete(); * Used before the entity is saved and before invoking the presave hook. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. */ public function preSave(EntityStorageInterface $storage); @@ -211,7 +211,7 @@ public function preSave(EntityStorageInterface $storage); * hook. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. * @param bool $update * TRUE if the entity has been updated, or FALSE if it has been inserted. */ @@ -223,7 +223,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE); * Load defaults for example. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. * @param array $values * An array of values to set, keyed by property name. If the entity type has * bundles the bundle key has to be specified. @@ -234,7 +234,7 @@ public static function preCreate(EntityStorageInterface $storage, array &$values * Acts on an entity after it is created but before hooks are invoked. * * @param EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. */ public function postCreate(EntityStorageInterface $storage); @@ -244,7 +244,7 @@ public function postCreate(EntityStorageInterface $storage); * Used before the entities are deleted and before invoking the delete hook. * * @param EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. * @param \Drupal\Core\Entity\EntityInterface[] $entities * An array of entities. */ @@ -256,7 +256,7 @@ public static function preDelete(EntityStorageInterface $storage, array $entitie * Used after the entities are deleted but before invoking the delete hook. * * @param EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. * @param \Drupal\Core\Entity\EntityInterface[] $entities * An array of entities. */ @@ -266,7 +266,7 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti * Acts on loaded entities. * * @param EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. * @param \Drupal\Core\Entity\EntityInterface[] $entities * An array of entities. */ diff --git a/core/lib/Drupal/Core/Entity/EntityListController.php b/core/lib/Drupal/Core/Entity/EntityListController.php index cd0fa6b..2c47ef0 100644 --- a/core/lib/Drupal/Core/Entity/EntityListController.php +++ b/core/lib/Drupal/Core/Entity/EntityListController.php @@ -18,7 +18,7 @@ class EntityListController extends EntityControllerBase implements EntityListControllerInterface, EntityControllerInterface { /** - * The entity storage controller class. + * The entity storage class. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -54,7 +54,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. */ public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage) { $this->entityTypeId = $entity_type->id(); diff --git a/core/lib/Drupal/Core/Entity/EntityListControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityListControllerInterface.php index 9512081..288fbdc 100644 --- a/core/lib/Drupal/Core/Entity/EntityListControllerInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityListControllerInterface.php @@ -13,10 +13,10 @@ interface EntityListControllerInterface { /** - * Gets the entity storage controller. + * Gets the entity storage. * * @return \Drupal\Core\Entity\EntityStorageInterface - * The storage controller used by this list controller. + * The storage used by this list controller. */ public function getStorage(); diff --git a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php index 34f4b08..46e8526 100644 --- a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php @@ -84,13 +84,13 @@ public function getAccessController($entity_type); public function getAdminRouteInfo($entity_type_id, $bundle); /** - * Creates a new storage controller instance. + * Creates a new storage instance. * * @param string $entity_type - * The entity type for this storage controller. + * The entity type for this storage. * * @return \Drupal\Core\Entity\EntityStorageInterface - * A storage controller instance. + * A storage instance. */ public function getStorage($entity_type); diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php index edc682e..1befefc 100644 --- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php @@ -11,7 +11,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; /** - * A base entity storage controller class. + * A base entity storage class. */ abstract class EntityStorageBase extends EntityControllerBase implements EntityStorageInterface, EntityControllerInterface { diff --git a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php index d11bc02..47af56a 100644 --- a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php @@ -165,7 +165,7 @@ public function getQueryServicename(); * @return \Drupal\Core\Entity\Query\QueryInterface * The query instance. * - * @see \Drupal\Core\Entity\EntityStorageControllerInterface::getQueryServicename() + * @see \Drupal\Core\Entity\EntityStorageInterface::getQueryServicename() */ public function getQuery($conjunction = 'AND'); diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageBase.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageBase.php index 705279c..9c91e3b 100644 --- a/core/lib/Drupal/Core/Entity/FieldableEntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageBase.php @@ -154,7 +154,7 @@ protected function loadFieldItems(array $entities) { // Fetch other entities from their storage location. if ($queried_entities) { - // Let the storage controller actually load the values. + // Let the storage actually load the values. $this->doLoadFieldItems($queried_entities, $age); // Build cache data. diff --git a/core/lib/Drupal/Core/Entity/RevisionableInterface.php b/core/lib/Drupal/Core/Entity/RevisionableInterface.php index 4405fdc..188127c 100644 --- a/core/lib/Drupal/Core/Entity/RevisionableInterface.php +++ b/core/lib/Drupal/Core/Entity/RevisionableInterface.php @@ -57,7 +57,7 @@ public function isDefaultRevision($new_value = NULL); * Acts on a revision before it gets saved. * * @param EntityStorageInterface $storage - * The entity storage controller object. + * The entity storage object. * @param \stdClass $record * The revision object. */ diff --git a/core/modules/action/lib/Drupal/action/ActionAddFormController.php b/core/modules/action/lib/Drupal/action/ActionAddFormController.php index 76a40f1..db02415 100644 --- a/core/modules/action/lib/Drupal/action/ActionAddFormController.php +++ b/core/modules/action/lib/Drupal/action/ActionAddFormController.php @@ -28,7 +28,7 @@ class ActionAddFormController extends ActionFormControllerBase { * Constructs a new ActionAddFormController. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The action storage controller. + * The action storage. * @param \Drupal\Core\Action\ActionManager $action_manager * The action plugin manager. */ diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php index 99363fd..f6dd192 100644 --- a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php +++ b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php @@ -25,7 +25,7 @@ protected $plugin; /** - * The action storage controller. + * The action storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -35,7 +35,7 @@ * Constructs a new action form. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The action storage controller. + * The action storage. */ public function __construct(EntityStorageInterface $storage) { $this->storage = $storage; diff --git a/core/modules/action/lib/Drupal/action/ActionListController.php b/core/modules/action/lib/Drupal/action/ActionListController.php index 74914a7..8c72d5c 100644 --- a/core/modules/action/lib/Drupal/action/ActionListController.php +++ b/core/modules/action/lib/Drupal/action/ActionListController.php @@ -38,7 +38,7 @@ class ActionListController extends ConfigEntityListController implements EntityC * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The action storage controller. + * The action storage. * @param \Drupal\Core\Action\ActionManager $action_manager * The action plugin manager. */ diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php b/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php index 8e9b85d..ff0dca6 100644 --- a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php +++ b/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php @@ -32,7 +32,7 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug protected $token; /** - * The user storage controller. + * The user storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php index f5a92e0..4284ee1 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php @@ -43,7 +43,7 @@ class OpmlFeedAdd extends FormBase { * The Guzzle HTTP client. */ public function __construct(FeedStorageInterface $feed_storage, ClientInterface $http_client) { - $this->feedStorageController = $feed_storage; + $this->feedStorage = $feed_storage; $this->httpClient = $http_client; } @@ -152,7 +152,7 @@ public function submitForm(array &$form, array &$form_state) { } // Check for duplicate titles or URLs. - $query = $this->feedStorageController->getQuery(); + $query = $this->feedStorage->getQuery(); $condition = $query->orConditionGroup() ->condition('title', $feed['title']) ->condition('url', $feed['url']); diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php index bf0a97d..6a370fe 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php @@ -26,7 +26,7 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInterface { /** - * The entity storage controller for feeds. + * The entity storage for feeds. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -49,7 +49,7 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt * @param array $plugin_definition * The plugin implementation definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller for feeds. + * The entity storage for feeds. * @param \Drupal\Core\Database\Connection $connection * The database connection. */ diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php index 5d01f9e..3f4d7b5 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php @@ -31,14 +31,14 @@ class IntegrationTest extends ViewUnitTestBase { public static $testViews = array('test_aggregator_items'); /** - * The entity storage controller for aggregator items. + * The entity storage for aggregator items. * * @var \Drupal\aggregator\ItemStorage */ protected $itemStorage; /** - * The entity storage controller for aggregator feeds. + * The entity storage for aggregator feeds. * * @var \Drupal\aggregator\FeedStorage */ diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php index eaeec88..e30c42d 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php @@ -17,14 +17,14 @@ class CustomBlockController extends ControllerBase { /** - * The custom block storage controller. + * The custom block storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ protected $customBlockStorage; /** - * The custom block type storage controller. + * The custom block type storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -45,9 +45,9 @@ public static function create(ContainerInterface $container) { * Constructs a CustomBlock object. * * @param \Drupal\Core\Entity\EntityStorageInterface $custom_block_storage - * The custom block storage controller. + * The custom block storage. * @param \Drupal\Core\Entity\EntityStorageInterface $custom_block_type_storage - * The custom block type storage controller. + * The custom block type storage. */ public function __construct(EntityStorageInterface $custom_block_storage, EntityStorageInterface $custom_block_type_storage) { $this->customBlockStorage = $custom_block_storage; diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php index 9eddefe..3fa55d6 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php @@ -40,7 +40,7 @@ class CustomBlockFormController extends ContentEntityFormController { * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The entity manager. * @param \Drupal\Core\Entity\EntityStorageInterface $custom_block_storage - * The custom block storage controller. + * The custom block storage. * @param \Drupal\Core\Language\LanguageManager $language_manager * The language manager. */ diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php index b22490f..d107ad7 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php @@ -146,7 +146,7 @@ public function testsCustomBlockAddTypes() { $type = $this->createCustomBlockType('foo'); $type = $this->createCustomBlockType('bar'); - // Get the custom block storage controller. + // Get the custom block storage. $storage = $this->container ->get('entity.manager') ->getStorage('custom_block'); diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php index 12274ae..c314ad8 100644 --- a/core/modules/block/lib/Drupal/block/BlockListController.php +++ b/core/modules/block/lib/Drupal/block/BlockListController.php @@ -60,7 +60,7 @@ class BlockListController extends ConfigEntityListController implements FormInte * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Component\Plugin\PluginManagerInterface $block_manager * The block manager. */ diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php index d737d09..c58a30f 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php @@ -27,7 +27,7 @@ class BlockStorageUnitTest extends DrupalUnitTestBase { public static $modules = array('block', 'block_test', 'system'); /** - * The block storage controller. + * The block storage. * * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface. */ @@ -51,7 +51,7 @@ protected function setUp() { * Tests CRUD operations. */ public function testBlockCRUD() { - $this->assertTrue($this->controller instanceof ConfigEntityStorage, 'The block storage controller is loaded.'); + $this->assertTrue($this->controller instanceof ConfigEntityStorage, 'The block storage is loaded.'); // Run each test method in the same installation. $this->createTests(); diff --git a/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php b/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php index a739545..126354a 100644 --- a/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php +++ b/core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php @@ -47,7 +47,7 @@ public function testGetUniqueMachineName() { ->method('execute') ->will($this->returnValue(array('test', 'other_test', 'other_test_1', 'other_test_2'))); - $block_storage = $this->getMock('Drupal\Core\Config\Entity\ConfigStorageControllerInterface'); + $block_storage = $this->getMock('Drupal\Core\Config\Entity\ConfigStorageInterface'); $block_storage->expects($this->exactly(5)) ->method('getQuery') ->will($this->returnValue($query)); diff --git a/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php b/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php index f38f329..1f8ff83 100644 --- a/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php +++ b/core/modules/book/lib/Drupal/book/BookBreadcrumbBuilder.php @@ -19,7 +19,7 @@ class BookBreadcrumbBuilder extends BreadcrumbBuilderBase { /** - * The node storage controller. + * The node storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ diff --git a/core/modules/book/lib/Drupal/book/BookExport.php b/core/modules/book/lib/Drupal/book/BookExport.php index 820ee92..b03de15 100644 --- a/core/modules/book/lib/Drupal/book/BookExport.php +++ b/core/modules/book/lib/Drupal/book/BookExport.php @@ -18,7 +18,7 @@ class BookExport { /** - * The node storage controller. + * The node storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ diff --git a/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php b/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php index 6e93a76..780e554 100644 --- a/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php +++ b/core/modules/book/lib/Drupal/book/Form/BookAdminEditForm.php @@ -28,7 +28,7 @@ class BookAdminEditForm extends FormBase { protected $cache; /** - * The node storage controller. + * The node storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -47,7 +47,7 @@ class BookAdminEditForm extends FormBase { * @param \Drupal\Core\Cache\CacheBackendInterface $cache * The menu cache object to be used by this controller. * @param \Drupal\Core\Entity\EntityStorageInterface $node_storage - * The custom block storage controller. + * The custom block storage. * @param \Drupal\book\BookManagerInterface $book_manager * The book manager. */ diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php index 8827ef6..59b15d3 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php @@ -38,7 +38,7 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryPluginInterface { /** - * The comment storage controller. + * The comment storage. * * @var \Drupal\comment\CommentStorageInterface */ @@ -93,7 +93,7 @@ public static function create(ContainerInterface $container, array $configuratio * @param \Drupal\Core\Session\AccountInterface $current_user * The current user. * @param \Drupal\comment\CommentStorageInterface $comment_storage - * The comment storage controller. + * The comment storage. * @param \Drupal\Core\Entity\EntityViewBuilderInterface $comment_view_builder * The comment view builder. */ diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php index efc8f68..b5227b2 100644 --- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php +++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php @@ -23,7 +23,7 @@ class ConfigEntityUnitTest extends DrupalUnitTestBase { public static $modules = array('config_test'); /** - * The config_test entity storage controller. + * The config_test entity storage. * * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface */ @@ -46,7 +46,7 @@ protected function setUp() { } /** - * Tests storage controller methods. + * Tests storage methods. */ public function testStorageMethods() { $entity_type = \Drupal::entityManager()->getDefinition('config_test'); diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php index d986835..fe3ace3 100644 --- a/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php +++ b/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php @@ -10,7 +10,7 @@ use Drupal\simpletest\DrupalUnitTestBase; /** - * Base class for testing storage controller operations. + * Base class for testing storage operations. * * All configuration storage controllers are expected to behave identically in * terms of reading, writing, listing, deleting, as well as error handling. diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php index c766ec3..9c4fde2 100644 --- a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php +++ b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php @@ -67,7 +67,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The entity manager. */ diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php index ba0ae1d..b5047c0 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php @@ -40,7 +40,7 @@ class DateTimeDefaultFormatter extends FormatterBase implements ContainerFactory protected $dateService; /** - * The date storage controller. + * The date storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -64,7 +64,7 @@ class DateTimeDefaultFormatter extends FormatterBase implements ContainerFactory * @param \Drupal\Core\Datetime\Date $date_service * The date service. * @param \Drupal\Core\Entity\EntityStorageInterface $date_storage - * The date storage controller. + * The date storage. */ public function __construct($plugin_id, array $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, Date $date_service, EntityStorageInterface $date_storage) { parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode); diff --git a/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php index 2684daa..bbbf597 100644 --- a/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php +++ b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php @@ -39,7 +39,7 @@ class EditEntityAccessCheckTest extends UnitTestCase { protected $entityManager; /** - * The mocked entity storage controller. + * The mocked entity storage. * * @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php index dd2836d..92d763f 100644 --- a/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php +++ b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php @@ -41,7 +41,7 @@ class EditEntityFieldAccessCheckTest extends UnitTestCase { protected $entityManager; /** - * The mocked entity storage controller. + * The mocked entity storage. * * @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php index c58d2fa..26644a5 100644 --- a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php +++ b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php @@ -87,7 +87,7 @@ public function __construct(array $values, $entity_type) { */ public function getFilterFormat() { if (!$this->filterFormat) { - $this->filterFormat = \Drupal::entityManager()->getStorageController('filter_format')->load($this->format); + $this->filterFormat = \Drupal::entityManager()->getStorage('filter_format')->load($this->format); } return $this->filterFormat; } diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php index bc24e45..eb61c8d 100644 --- a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php +++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php @@ -31,7 +31,7 @@ class EntityDisplayModeListController extends ConfigEntityListController { * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Entity\EntityTypeInterface[] $entity_types * List of all entity types. */ diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorage.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorage.php index 3c0f0e8..62c41c1 100644 --- a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorage.php +++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorage.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityInterface; /** - * Defines the storage controller class for entity form and view modes. + * Defines the storage class for entity form and view modes. */ class EntityDisplayModeStorage extends ConfigEntityStorage { diff --git a/core/modules/field/field.module b/core/modules/field/field.module index f0e280c..12e5879 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -48,7 +48,7 @@ * type 'image'. The administrator (again, via a UI) creates two Field * Instances, one attaching the field 'subtitle' to the 'node' bundle 'article' * and one attaching the field 'photo' to the 'node' bundle 'article'. When the - * node storage controller loads an Article node, it loads the values of the + * node storage loads an Article node, it loads the values of the * 'subtitle' and 'photo' fields because they are both attached to the 'node' * bundle 'article'. * diff --git a/core/modules/field/field.purge.inc b/core/modules/field/field.purge.inc index 82e96ac..212c2b5 100644 --- a/core/modules/field/field.purge.inc +++ b/core/modules/field/field.purge.inc @@ -17,7 +17,7 @@ * entities as well as deleting entire fields or field instances in a single * operation. * - * When a single entity is deleted, the Entity storage controller performs the + * When a single entity is deleted, the Entity storage performs the * following operations: * - Invoking the FieldItemListInterface delete() method for each field on the * entity. A file field type might use this method to delete uploaded files diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php index 24a5594..1145a2f 100644 --- a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php +++ b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php @@ -284,7 +284,7 @@ public function preSave(EntityStorageInterface $storage) { * Prepares saving a new field definition. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller. + * The entity storage. * * @throws \Drupal\field\FieldException If the field definition is invalid. */ @@ -323,7 +323,7 @@ protected function preSaveNew(EntityStorageInterface $storage) { // definition is passed to the various hooks and written to config. $this->settings += $field_type['settings']; - // Notify the entity storage controller. + // Notify the entity storage. $entity_manager->getStorage($this->entity_type)->onFieldCreate($this); } @@ -331,7 +331,7 @@ protected function preSaveNew(EntityStorageInterface $storage) { * Prepares saving an updated field definition. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller. + * The entity storage. */ protected function preSaveUpdated(EntityStorageInterface $storage) { $module_handler = \Drupal::moduleHandler(); @@ -354,7 +354,7 @@ protected function preSaveUpdated(EntityStorageInterface $storage) { // invokes hook_field_config_update_forbid(). $module_handler->invokeAll('field_config_update_forbid', array($this, $this->original)); - // Notify the storage controller. The controller can reject the definition + // Notify the storage. The controller can reject the definition // update as invalid by raising an exception, which stops execution before // the definition is written to config. $entity_manager->getStorage($this->entity_type)->onFieldUpdate($this); diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php index ec5ace8..1411a35 100644 --- a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php +++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php @@ -334,7 +334,7 @@ public function preSave(EntityStorageInterface $storage) { if ($this->isNew()) { // Set the default instance settings. $this->settings += $field_type_manager->getDefaultInstanceSettings($this->field->type); - // Notify the entity storage controller. + // Notify the entity storage. $entity_manager->getStorage($this->entity_type)->onInstanceCreate($this); } else { @@ -350,7 +350,7 @@ public function preSave(EntityStorageInterface $storage) { } // Set the default instance settings. $this->settings += $field_type_manager->getDefaultInstanceSettings($this->field->type); - // Notify the entity storage controller. + // Notify the entity storage. $entity_manager->getStorage($this->entity_type)->onInstanceUpdate($this); } } @@ -398,7 +398,7 @@ public static function postDelete(EntityStorageInterface $storage, array $instan // Clear the cache upfront, to refresh the results of getBundles(). field_cache_clear(); - // Notify the entity storage controller. + // Notify the entity storage. foreach ($instances as $instance) { if (!$instance->deleted) { \Drupal::entityManager()->getStorage($instance->entity_type)->onInstanceDelete($instance); diff --git a/core/modules/file/lib/Drupal/file/FileStorage.php b/core/modules/file/lib/Drupal/file/FileStorage.php index 4422a8c..80173eb 100644 --- a/core/modules/file/lib/Drupal/file/FileStorage.php +++ b/core/modules/file/lib/Drupal/file/FileStorage.php @@ -10,7 +10,7 @@ use Drupal\Core\Entity\FieldableDatabaseEntityStorage; /** - * File storage controller for files. + * File storage for files. */ class FileStorage extends FieldableDatabaseEntityStorage implements FileStorageInterface { diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php b/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php index 4aa31d9..4e7b15f 100644 --- a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php +++ b/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php @@ -39,7 +39,7 @@ class FilterFormatListController extends DraggableListController implements Enti * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The config factory. */ diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php index 287bb2f..5de156c 100644 --- a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php +++ b/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php @@ -27,14 +27,14 @@ class ForumController extends ControllerBase { protected $forumManager; /** - * Vocabulary storage controller. + * Vocabulary storage. * * @var \Drupal\taxonomy\VocabularyStorageInterface */ protected $vocabularyStorage; /** - * Term storage controller. + * Term storage. * * @var \Drupal\taxonomy\TermStorageInterface */ @@ -46,9 +46,9 @@ class ForumController extends ControllerBase { * @param \Drupal\forum\ForumManagerInterface $forum_manager * The forum manager service. * @param \Drupal\taxonomy\VocabularyStorageInterface $vocabulary_storage - * Vocabulary storage controller. + * Vocabulary storage. * @param \Drupal\taxonomy\TermStorageInterface $term_storage - * Term storage controller. + * Term storage. */ public function __construct(ForumManagerInterface $forum_manager, VocabularyStorageInterface $vocabulary_storage, TermStorageInterface $term_storage) { $this->forumManager = $forum_manager; diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php index a9e86a5..a73671f 100644 --- a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php +++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php @@ -30,7 +30,7 @@ class ImageStyleEditForm extends ImageStyleFormBase { * Constructs an ImageStyleEditForm object. * * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage - * The storage controller. + * The storage. * @param \Drupal\image\ImageEffectManager $image_effect_manager * The image effect manager service. */ diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php index fde1723..1547ca7 100644 --- a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php +++ b/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php @@ -17,7 +17,7 @@ abstract class ImageStyleFormBase extends EntityFormController { /** - * The image style entity storage controller. + * The image style entity storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -27,7 +27,7 @@ * Constructs a base class for image style add and edit forms. * * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage - * The image style entity storage controller. + * The image style entity storage. */ public function __construct(EntityStorageInterface $image_style_storage) { $this->imageStyleStorage = $image_style_storage; diff --git a/core/modules/image/lib/Drupal/image/ImageStyleListController.php b/core/modules/image/lib/Drupal/image/ImageStyleListController.php index 6600d5b..8cf3dc2 100644 --- a/core/modules/image/lib/Drupal/image/ImageStyleListController.php +++ b/core/modules/image/lib/Drupal/image/ImageStyleListController.php @@ -34,7 +34,7 @@ class ImageStyleListController extends ConfigEntityListController implements Ent * @param EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage - * The image style entity storage controller class. + * The image style entity storage class. * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator * The URL generator. */ diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php index 4a0a965..206a141 100644 --- a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php +++ b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php @@ -18,7 +18,7 @@ class MenuDeleteForm extends EntityConfirmFormBase { /** - * The menu link storage controller. + * The menu link storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -35,7 +35,7 @@ class MenuDeleteForm extends EntityConfirmFormBase { * Constructs a new MenuDeleteForm. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The menu link storage controller. + * The menu link storage. * @param \Drupal\Core\Database\Connection $connection * The database connection. */ diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php index 30e87bd..44243c7 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php @@ -27,7 +27,7 @@ class MenuFormController extends EntityFormController { protected $entityQueryFactory; /** - * The menu link storage controller. + * The menu link storage. * * @var \Drupal\menu_link\MenuLinkStorageInterface */ @@ -46,7 +46,7 @@ class MenuFormController extends EntityFormController { * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory * The factory for entity queries. * @param \Drupal\menu_link\MenuLinkStorageInterface $menu_link_storage - * The menu link storage controller. + * The menu link storage. */ public function __construct(QueryFactory $entity_query_factory, MenuLinkStorageInterface $menu_link_storage) { $this->entityQueryFactory = $entity_query_factory; diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php index b966fca..3f4617e 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php @@ -20,7 +20,7 @@ class MenuLinkFormController extends EntityFormController { /** - * The menu link storage controller. + * The menu link storage. * * @var \Drupal\menu_link\MenuLinkStorageInterface */ diff --git a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php index 0634169..3eff7e6 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php +++ b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php @@ -23,7 +23,7 @@ * label = @Translation("Migration"), * module = "migrate", * controllers = { - * "storage" = "Drupal\migrate\MigrationStorageController" + * "storage" = "Drupal\migrate\MigrationStorage" * }, * entity_keys = { * "id" = "id", @@ -316,7 +316,7 @@ public function checkRequirements() { } /** @var \Drupal\migrate\Entity\MigrationInterface[] $required_migrations */ - $required_migrations = \Drupal::entityManager()->getStorageController('migration')->loadMultiple($this->requirements); + $required_migrations = \Drupal::entityManager()->getStorage('migration')->loadMultiple($this->requirements); // Check if the dependencies are in good shape. foreach ($required_migrations as $required_migration) { // If the dependent source migration has no IDs then no mappings can diff --git a/core/modules/migrate/lib/Drupal/migrate/MigrationStorageController.php b/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php similarity index 91% rename from core/modules/migrate/lib/Drupal/migrate/MigrationStorageController.php rename to core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php index 1cd8561..e6b2de2 100644 --- a/core/modules/migrate/lib/Drupal/migrate/MigrationStorageController.php +++ b/core/modules/migrate/lib/Drupal/migrate/MigrationStorage.php @@ -2,24 +2,24 @@ /** * @file - * Contains \Drupal\migrate\MigrateStorageController. + * Contains \Drupal\migrate\MigrateStorage. */ namespace Drupal\migrate; use Drupal\Component\Graph\Graph; -use Drupal\Core\Config\Entity\ConfigStorageController; +use Drupal\Core\Config\Entity\ConfigEntityStorage; /** * Storage controller for migration entities. */ -class MigrationStorageController extends ConfigStorageController implements MigrateBuildDependencyInterface { +class MigrationStorage extends ConfigEntityStorage implements MigrateBuildDependencyInterface { /** * {@inheritdoc} */ public function buildDependencyMigration(array $migrations, array $dynamic_ids) { - // Dependencies defined in the migration storage controller can be soft + // Dependencies defined in the migration storage can be soft // dependencies: if a soft dependency does not run, the current migration // is still OK to go. This is indicated by adding ": false" (without // quotes) after the name of the dependency. Hard dependencies (default) diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php index 557e7cc..17b39ec 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php @@ -51,9 +51,9 @@ * @param array $bundles * The list of bundles this entity type has. */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage_controller, array $bundles) { + public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles) { parent::__construct($configuration, $plugin_id, $plugin_definition, $migration); - $this->storage = $storage_controller; + $this->storage = $storage; $this->bundles = $bundles; } diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php index cf3faba..3549d50 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php @@ -7,7 +7,7 @@ namespace Drupal\migrate\Plugin\migrate\destination; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\KeyValueStore\StateInterface; use Drupal\field\FieldInfo; use Drupal\migrate\Entity\MigrationInterface; @@ -40,8 +40,8 @@ class EntityComment extends EntityContentBase { * The plugin implementation definition. * @param MigrationInterface $migration * The migration. - * @param EntityStorageControllerInterface $storage_controller - * The storage controller for this entity type. + * @param EntityStorageInterface $storage + * The storage for this entity type. * @param array $bundles * The list of bundles this entity type has. * @param \Drupal\migrate\Plugin\MigratePluginManager $plugin_manager @@ -51,8 +51,8 @@ class EntityComment extends EntityContentBase { * @param \Drupal\Core\KeyValueStore\StateInterface $state * The state storage object. */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageControllerInterface $storage_controller, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info, StateInterface $state) { - parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage_controller, $bundles, $plugin_manager, $field_info); + public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info, StateInterface $state) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $plugin_manager, $field_info); $this->state = $state; } @@ -66,7 +66,7 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_id, $plugin_definition, $migration, - $container->get('entity.manager')->getStorageController($entity_type), + $container->get('entity.manager')->getStorage($entity_type), array_keys($container->get('entity.manager')->getBundleInfo($entity_type)), $container->get('plugin.manager.migrate.entity_field'), $container->get('field.info'), diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php index 70f2624..949b21a 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityInterface; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\TypedData\TypedDataInterface; use Drupal\field\FieldInfo; use Drupal\migrate\Entity\MigrationInterface; @@ -38,8 +38,8 @@ class EntityContentBase extends Entity { * The plugin implementation definition. * @param \Drupal\migrate\Entity\MigrationInterface $migration * The migration entity. - * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller - * The storage controller for this entity type. + * @param \Drupal\Core\Entity\EntityStorageInterface $storage + * The storage for this entity type. * @param array $bundles * The list of bundles this entity type has. * @param \Drupal\migrate\Plugin\MigratePluginManager $plugin_manager @@ -47,8 +47,8 @@ class EntityContentBase extends Entity { * @param \Drupal\Field\FieldInfo $field_info * The field info. */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageControllerInterface $storage_controller, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info) { - parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage_controller, $bundles); + public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles); $this->migrateEntityFieldPluginManager = $plugin_manager; $this->fieldInfo = $field_info; } @@ -63,7 +63,7 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_id, $plugin_definition, $migration, - $container->get('entity.manager')->getStorageController($entity_type), + $container->get('entity.manager')->getStorage($entity_type), array_keys($container->get('entity.manager')->getBundleInfo($entity_type)), $container->get('plugin.manager.migrate.entity_field'), $container->get('field.info') diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityFile.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityFile.php index 4c8a1f1..ed93243 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityFile.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityFile.php @@ -7,7 +7,7 @@ namespace Drupal\migrate\Plugin\migrate\destination; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\field\FieldInfo; use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\Plugin\MigratePluginManager; @@ -23,14 +23,14 @@ class EntityFile extends EntityContentBase { /** * {@inheritdoc} */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageControllerInterface $storage_controller, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info) { + public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info) { $configuration += array( 'source_base_path' => '', 'source_path_property' => 'filepath', 'destination_path_property' => 'uri', 'move' => FALSE, ); - parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage_controller, $bundles, $plugin_manager, $field_info); + parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $plugin_manager, $field_info); } /** diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php index d218b4b..24ff386 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php @@ -7,7 +7,7 @@ namespace Drupal\migrate\Plugin\migrate\destination; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Password\PasswordInterface; use Drupal\field\FieldInfo; use Drupal\migrate\Entity\MigrationInterface; @@ -42,8 +42,8 @@ class EntityUser extends EntityContentBase { * The plugin implementation definition. * @param MigrationInterface $migration * The migration. - * @param EntityStorageControllerInterface $storage_controller - * The storage controller for this entity type. + * @param EntityStorageInterface $storage + * The storage for this entity type. * @param array $bundles * The list of bundles this entity type has. * @param \Drupal\migrate\Plugin\MigratePluginManager $plugin_manager @@ -53,8 +53,8 @@ class EntityUser extends EntityContentBase { * @param \Drupal\Core\Password\PasswordInterface $password * The password service. */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageControllerInterface $storage_controller, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info, PasswordInterface $password) { - parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage_controller, $bundles, $plugin_manager, $field_info); + public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, MigratePluginManager $plugin_manager, FieldInfo $field_info, PasswordInterface $password) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $plugin_manager, $field_info); if (isset($configuration['md5_passwords'])) { $this->password = $password; } @@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_id, $plugin_definition, $migration, - $container->get('entity.manager')->getStorageController($entity_type), + $container->get('entity.manager')->getStorage($entity_type), array_keys($container->get('entity.manager')->getBundleInfo($entity_type)), $container->get('plugin.manager.migrate.entity_field'), $container->get('field.info'), diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Migration.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Migration.php index e64e93e..8ba2c45 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Migration.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Migration.php @@ -8,7 +8,7 @@ namespace Drupal\migrate\Plugin\migrate\process; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateSkipRowException; @@ -35,16 +35,16 @@ class Migration extends ProcessPluginBase implements ContainerFactoryPluginInter protected $processPluginManager; /** - * @var \Drupal\Core\Entity\EntityStorageControllerInterface + * @var \Drupal\Core\Entity\EntityStorageInterface */ - protected $migrationStorageController; + protected $migrationStorage; /** * {@inheritdoc} */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageControllerInterface $storage_controller, MigratePluginManager $process_plugin_manager) { + public function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, MigratePluginManager $process_plugin_manager) { parent::__construct($configuration, $plugin_id, $plugin_definition); - $this->migrationStorageController = $storage_controller; + $this->migrationStorage = $storage; $this->migration = $migration; $this->processPluginManager = $process_plugin_manager; } @@ -58,7 +58,7 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_id, $plugin_definition, $migration, - $container->get('entity.manager')->getStorageController('migration'), + $container->get('entity.manager')->getStorage('migration'), $container->get('plugin.manager.migrate.process') ); } @@ -78,7 +78,7 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro } $self = FALSE; /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */ - $migrations = $this->migrationStorageController->loadMultiple($migration_ids); + $migrations = $this->migrationStorage->loadMultiple($migration_ids); $destination_ids = NULL; $source_id_values = array(); foreach ($migrations as $migration_id => $migration) { diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorageController.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php similarity index 93% rename from core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorageController.php rename to core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php index 08e5d63..5e65cf1 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorageController.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/MigrationStorage.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\migrate_drupal\MigrateStorageController. + * Contains \Drupal\migrate_drupal\MigrateStorage. */ namespace Drupal\migrate_drupal; @@ -10,12 +10,12 @@ use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityStorageException; -use Drupal\migrate\MigrationStorageController as BaseMigrationStorageController; +use Drupal\migrate\MigrationStorage as BaseMigrationStorage; /** * Storage controller for migration entities. */ -class MigrationStorageController extends BaseMigrationStorageController { +class MigrationStorage extends BaseMigrationStorage { /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module index 726222d..7b85d80 100644 --- a/core/modules/migrate_drupal/migrate_drupal.module +++ b/core/modules/migrate_drupal/migrate_drupal.module @@ -7,5 +7,5 @@ function migrate_drupal_entity_type_alter(array &$entity_types) { /** @var \Drupal\Core\Config\Entity\ConfigEntityType[] $entity_types */ $entity_types['migration'] ->setClass('Drupal\migrate_drupal\Entity\Migration') - ->setControllerClass('storage', 'Drupal\migrate_drupal\MigrationStorageController'); + ->setControllerClass('storage', 'Drupal\migrate_drupal\MigrationStorage'); } diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php index dde11a6..fada9bb 100644 --- a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php +++ b/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php @@ -35,7 +35,7 @@ class DeleteMultiple extends ConfirmFormBase { protected $tempStoreFactory; /** - * The node storage controller. + * The node storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ diff --git a/core/modules/node/lib/Drupal/node/NodeListController.php b/core/modules/node/lib/Drupal/node/NodeListController.php index 3e4a832..bdd3406 100644 --- a/core/modules/node/lib/Drupal/node/NodeListController.php +++ b/core/modules/node/lib/Drupal/node/NodeListController.php @@ -35,7 +35,7 @@ class NodeListController extends EntityListController { * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Datetime\Date $date_service * The date service. */ diff --git a/core/modules/node/lib/Drupal/node/NodeTypeListController.php b/core/modules/node/lib/Drupal/node/NodeTypeListController.php index 5173258..3aa9a99 100644 --- a/core/modules/node/lib/Drupal/node/NodeTypeListController.php +++ b/core/modules/node/lib/Drupal/node/NodeTypeListController.php @@ -34,7 +34,7 @@ class NodeTypeListController extends ConfigEntityListController implements Entit * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator * The url generator service. */ diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php index e065be1..b1f00ef 100644 --- a/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/Views/FrontPageTest.php @@ -17,7 +17,7 @@ class FrontPageTest extends ViewTestBase { /** - * The entity storage controller for nodes. + * The entity storage for nodes. * * @var \Drupal\node\NodeStorage */ diff --git a/core/modules/search/lib/Drupal/search/SearchPageListController.php b/core/modules/search/lib/Drupal/search/SearchPageListController.php index 262e662..621cb36 100644 --- a/core/modules/search/lib/Drupal/search/SearchPageListController.php +++ b/core/modules/search/lib/Drupal/search/SearchPageListController.php @@ -47,7 +47,7 @@ class SearchPageListController extends DraggableListController implements FormIn * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\search\SearchPluginManager $search_manager * The search plugin manager. * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php index 99314c8..504b81e 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php @@ -25,7 +25,7 @@ class ShortcutSetDeleteForm extends EntityConfirmFormBase { protected $database; /** - * The shortcut storage controller. + * The shortcut storage. * * @var \Drupal\shortcut\ShortcutSetStorageInterface */ diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php index df1aa7d..402aca7 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php @@ -20,7 +20,7 @@ class ShortcutAccessController extends EntityAccessController implements EntityControllerInterface { /** - * The shortcut_set storage controller. + * The shortcut_set storage. * * @var \Drupal\shortcut\ShortcutSetStorage */ @@ -32,7 +32,7 @@ class ShortcutAccessController extends EntityAccessController implements EntityC * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\shortcut\ShortcutSetStorage $shortcut_set_storage - * The shortcut_set storage controller. + * The shortcut_set storage. */ public function __construct(EntityTypeInterface $entity_type, ShortcutSetStorage $shortcut_set_storage) { parent::__construct($entity_type); diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorage.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorage.php index 6d4ecc2..ea723d6 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorage.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorage.php @@ -10,7 +10,7 @@ use Drupal\Core\Config\Entity\ConfigEntityStorage; /** - * Defines a storage controller for shortcut_set entities. + * Defines a storage for shortcut_set entities. */ class ShortcutSetStorage extends ConfigEntityStorage implements ShortcutSetStorageInterface { diff --git a/core/modules/system/lib/Drupal/system/DateFormatListController.php b/core/modules/system/lib/Drupal/system/DateFormatListController.php index baecf3f..76d1149 100644 --- a/core/modules/system/lib/Drupal/system/DateFormatListController.php +++ b/core/modules/system/lib/Drupal/system/DateFormatListController.php @@ -33,7 +33,7 @@ class DateFormatListController extends ConfigEntityListController { * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Datetime\Date $date_service * The date service. */ diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php index 93e648e..8e987bc 100644 --- a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php +++ b/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php @@ -36,7 +36,7 @@ protected $dateService; /** - * The date format storage controller. + * The date format storage. * * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface */ @@ -48,7 +48,7 @@ * @param \Drupal\Core\Datetime\Date $date_service * The date service. * @param \Drupal\Core\Config\Entity\ConfigEntityStorageInterface $date_format_storage - * The date format storage controller. + * The date format storage. */ public function __construct(Date $date_service, ConfigEntityStorageInterface $date_format_storage) { $date = new DrupalDateTime(); diff --git a/core/modules/system/lib/Drupal/system/PathBasedBreadcrumbBuilder.php b/core/modules/system/lib/Drupal/system/PathBasedBreadcrumbBuilder.php index cc2f0db..623e672 100644 --- a/core/modules/system/lib/Drupal/system/PathBasedBreadcrumbBuilder.php +++ b/core/modules/system/lib/Drupal/system/PathBasedBreadcrumbBuilder.php @@ -40,7 +40,7 @@ class PathBasedBreadcrumbBuilder extends BreadcrumbBuilderBase { protected $accessManager; /** - * The menu storage controller. + * The menu storage. * * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface */ diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php index d15c715..d4206c3 100644 --- a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php +++ b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php @@ -23,7 +23,7 @@ class BulkForm extends FieldPluginBase { /** - * The action storage controller. + * The action storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -46,7 +46,7 @@ class BulkForm extends FieldPluginBase { * @param array $plugin_definition * The plugin implementation definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The action storage controller. + * The action storage. */ public function __construct(array $configuration, $plugin_id, array $plugin_definition, EntityStorageInterface $storage) { parent::__construct($configuration, $plugin_id, $plugin_definition); diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCacheTagsTestBase.php index f1a0c84..fcd0feb 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCacheTagsTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCacheTagsTestBase.php @@ -82,11 +82,11 @@ public function setUp() { ))->save(); // Reload the entity now that a new field has been added to it. - $storage_controller = $this->container + $storage = $this->container ->get('entity.manager') - ->getStorageController($this->entity->getEntityTypeId()); - $storage_controller->resetCache(); - $this->entity = $storage_controller->load($this->entity->id()); + ->getStorage($this->entity->getEntityTypeId()); + $storage->resetCache(); + $this->entity = $storage->load($this->entity->id()); } // Create a referencing and a non-referencing entity. diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php index 97e25bb..66940a7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php @@ -90,7 +90,7 @@ protected function assertFormCRUD($entity_type) { } /** - * Loads a test entity by name always resetting the storage controller cache. + * Loads a test entity by name always resetting the storage cache. */ protected function loadEntityByName($entity_type, $name) { // Always load the entity from the database to ensure that changes are diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php index ebdac0f..6ea5549 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php @@ -21,7 +21,7 @@ class EntityQueryAggregateTest extends EntityUnitTestBase { public static $modules = array(); /** - * The entity_test storage controller to create the test entities. + * The entity_test storage to create the test entities. * * @var \Drupal\entity_test\EntityTestStorage */ diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTypeConstraintValidatorTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTypeConstraintValidatorTest.php index 6428ef0..93b60cf 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTypeConstraintValidatorTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTypeConstraintValidatorTest.php @@ -51,7 +51,7 @@ public function testValidation() { ); // Test the validation. - $node = $this->container->get('entity.manager')->getStorageController('node')->create(array('type' => 'page')); + $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'page')); $typed_data = $this->typedData->create($definition, $node); $violations = $typed_data->validate(); $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.'); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 6b8d696..80c8860 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1717,15 +1717,15 @@ function system_get_module_admin_tasks($module, $info) { if (\Drupal::moduleHandler()->implementsHook($module, 'permission')) { /** @var \Drupal\Core\Access\AccessManager $access_manager */ $access_manager = \Drupal::service('access_manager'); - /** @var \Drupal\menu_link\MenuLinkStorageInterface $menu_link_storage_controller */ - $menu_link_storage_controller = \Drupal::entityManager() + /** @var \Drupal\menu_link\MenuLinkStorageInterface $menu_link_storage */ + $menu_link_storage = \Drupal::entityManager() ->getStorage('menu_link'); if ($access_manager->checkNamedRoute('user.admin_permissions', array(), \Drupal::currentUser())) { $path = \Drupal::urlGenerator() ->getPathFromRoute('user.admin_permissions'); $options = array(); $options['fragment'] = 'module-' . $module; - $menu_link = $menu_link_storage_controller->create(array( + $menu_link = $menu_link_storage->create(array( 'route_name' => 'user.admin_permissions', 'link_path' => $path, 'title' => t('Configure @module permissions', array('@module' => $info['name'])), diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Controller/EntityTestController.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Controller/EntityTestController.php index 98ac7cc..a9d114a 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Controller/EntityTestController.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Controller/EntityTestController.php @@ -104,7 +104,7 @@ public function testAdmin() { public function listReferencingEntities($entity_reference_field_name, $referenced_entity_type, $referenced_entity_id) { // Early return if the referenced entity does not exist (or is deleted). $referenced_entity = $this->entityManager() - ->getStorageController($referenced_entity_type) + ->getStorage($referenced_entity_type) ->load($referenced_entity_id); if ($referenced_entity === NULL) { return array(); @@ -114,7 +114,7 @@ public function listReferencingEntities($entity_reference_field_name, $reference ->get('entity_test') ->condition($entity_reference_field_name . '.target_id', $referenced_entity_id); $entities = $this->entityManager() - ->getStorageController('entity_test') + ->getStorage('entity_test') ->loadMultiple($query->execute()); return $this->entityManager() ->getViewBuilder('entity_test') diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php index faa3dad..ab1db7d 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php @@ -40,7 +40,7 @@ class TermAutocompleteController implements ContainerInjectionInterface { protected $fieldInfo; /** - * Term storage controller. + * Term storage. * * @var \Drupal\taxonomy\TermStorageInterface */ @@ -54,7 +54,7 @@ class TermAutocompleteController implements ContainerInjectionInterface { * @param \Drupal\field\FieldInfo $field_info * The field info service. * @param \Drupal\taxonomy\TermStorageInterface $term_storage - * The term storage controller. + * The term storage. */ public function __construct(QueryInterface $term_entity_query, FieldInfo $field_info, TermStorageInterface $term_storage) { $this->termEntityQuery = $term_entity_query; diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php index 6df2985..58fbb12 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php @@ -62,7 +62,7 @@ public function submit(array $form, array &$form_state) { $storage = $this->entityManager->getStorage('taxonomy_vocabulary'); $vocabulary = $storage->load($this->entity->bundle()); - // @todo Move to storage controller http://drupal.org/node/1988712 + // @todo Move to storage http://drupal.org/node/1988712 taxonomy_check_vocabulary_hierarchy($vocabulary, array('tid' => $this->entity->id())); drupal_set_message($this->t('Deleted term %name.', array('%name' => $this->entity->getName()))); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php index a1750d8..d6d270a 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php @@ -24,7 +24,7 @@ class TermName extends Entity { /** - * The taxonomy term storage controller. + * The taxonomy term storage. * * @var \Drupal\taxonomy\TermStorageInterface */ diff --git a/core/modules/user/lib/Drupal/user/Controller/UserListController.php b/core/modules/user/lib/Drupal/user/Controller/UserListController.php index a80b2be..d868d51 100644 --- a/core/modules/user/lib/Drupal/user/Controller/UserListController.php +++ b/core/modules/user/lib/Drupal/user/Controller/UserListController.php @@ -35,7 +35,7 @@ class UserListController extends EntityListController implements EntityControlle * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory * The entity query factory. */ diff --git a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php index 1131bc4..4dd180f 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php @@ -26,7 +26,7 @@ class UserLoginForm extends FormBase { protected $flood; /** - * The user storage controller. + * The user storage. * * @var \Drupal\user\UserStorageInterface */ diff --git a/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php b/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php index 95c5935..18d69d9 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserMultipleCancelConfirm.php @@ -37,7 +37,7 @@ class UserMultipleCancelConfirm extends ConfirmFormBase { protected $configFactory; /** - * The user storage controller. + * The user storage. * * @var \Drupal\user\UserStorageInterface */ @@ -58,7 +58,7 @@ class UserMultipleCancelConfirm extends ConfirmFormBase { * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The config factory. * @param \Drupal\user\UserStorageInterface $user_storage - * The user storage controller. + * The user storage. * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * The entity manager. */ diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php index d1a9a80..15d48c8 100644 --- a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php +++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php @@ -21,7 +21,7 @@ class UserPasswordForm extends FormBase { /** - * The user storage controller. + * The user storage. * * @var \Drupal\user\UserStorageInterface */ @@ -38,7 +38,7 @@ class UserPasswordForm extends FormBase { * Constructs a UserPasswordForm object. * * @param \Drupal\user\UserStorageInterface $user_storage - * The user storage controller. + * The user storage. * @param \Drupal\Core\Language\LanguageManager $language_manager * The language manager. */ diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php index 1666398..b293675 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php @@ -22,7 +22,7 @@ class RolesRid extends ManyToOne { /** - * The role entity storage controller + * The role entity storage * * @var \Drupal\user\RoleStorage */ diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php index 0756ca5..cb5013a 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php @@ -22,7 +22,7 @@ class Uid extends Numeric { /** - * The user storage controller. + * The user storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -38,7 +38,7 @@ class Uid extends Numeric { * @param array $plugin_definition * The plugin implementation definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The user storage controller. + * The user storage. */ public function __construct(array $configuration, $plugin_id, array $plugin_definition, EntityStorageInterface $storage) { parent::__construct($configuration, $plugin_id, $plugin_definition); diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php index 9a91fba..0e9b4ea 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php @@ -24,7 +24,7 @@ class Permissions extends PrerenderList { /** - * The role storage controller. + * The role storage. * * @var \Drupal\user\RoleStorageInterface */ diff --git a/core/modules/user/lib/Drupal/user/RoleStorageInterface.php b/core/modules/user/lib/Drupal/user/RoleStorageInterface.php index 9e1445c..d094d5e 100644 --- a/core/modules/user/lib/Drupal/user/RoleStorageInterface.php +++ b/core/modules/user/lib/Drupal/user/RoleStorageInterface.php @@ -18,7 +18,7 @@ * Delete role references. * * @param array $rids - * The list of role IDs being deleted. The storage controller should + * The list of role IDs being deleted. The storage should * remove permission and user references to this role. */ public function deleteRoleReferences(array $rids); diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php b/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php index f4958b5..eafc620 100644 --- a/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php +++ b/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php @@ -30,14 +30,14 @@ protected $users = array(); /** - * The entity storage controller for roles. + * The entity storage for roles. * * @var \Drupal\user\RoleStorage */ protected $roleStorage; /** - * The entity storage controller for users. + * The entity storage for users. * * @var \Drupal\user\UserStorage */ diff --git a/core/modules/user/lib/Drupal/user/UserAuth.php b/core/modules/user/lib/Drupal/user/UserAuth.php index 3ce2683..537c548 100644 --- a/core/modules/user/lib/Drupal/user/UserAuth.php +++ b/core/modules/user/lib/Drupal/user/UserAuth.php @@ -8,7 +8,7 @@ namespace Drupal\user; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\Core\Entity\EntityStorageControllerInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Password\PasswordInterface; /** @@ -19,7 +19,7 @@ class UserAuth implements UserAuthInterface { /** * The user storage. * - * @var \Drupal\Core\Entity\EntityStorageControllerInterface + * @var \Drupal\Core\Entity\EntityStorageInterface */ protected $storage; @@ -33,13 +33,13 @@ class UserAuth implements UserAuthInterface { /** * Constructs a UserAuth object. * - * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage + * @param \Drupal\Core\Entity\EntityStorageInterface $storage * The user storage. * @param \Drupal\Core\Password\PasswordInterface $password_checker * The password service. */ public function __construct(EntityManagerInterface $entity_manager, PasswordInterface $password_checker) { - $this->storage = $entity_manager->getStorageController('user'); + $this->storage = $entity_manager->getStorage('user'); $this->passwordChecker = $password_checker; } diff --git a/core/modules/user/tests/Drupal/user/Tests/UserAuthTest.php b/core/modules/user/tests/Drupal/user/Tests/UserAuthTest.php index c658e60..912b541 100644 --- a/core/modules/user/tests/Drupal/user/Tests/UserAuthTest.php +++ b/core/modules/user/tests/Drupal/user/Tests/UserAuthTest.php @@ -21,9 +21,9 @@ class UserAuthTest extends UnitTestCase { /** - * The mock user storage controller. + * The mock user storage. * - * @var \Drupal\Core\Entity\EntityStorageControllerInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $userStorage; @@ -77,12 +77,12 @@ public static function getInfo() { * {@inheritdoc} */ public function setUp() { - $this->userStorage = $this->getMock('Drupal\Core\Entity\EntityStorageControllerInterface'); + $this->userStorage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface'); $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface'); - // Getting the user storage controller should only happen once per test. + // Getting the user storage should only happen once per test. $entity_manager->expects($this->once()) - ->method('getStorageController') + ->method('getStorage') ->with('user') ->will($this->returnValue($this->userStorage)); diff --git a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php b/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php index 37b73d4..fabfec0 100644 --- a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php +++ b/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php @@ -43,7 +43,7 @@ public function testTitleQuery() { 'label' => 'test rid 2', ), 'user_role'); - // Creates a stub entity storage controller; + // Creates a stub entity storage; $role_storage = $this->getMockForAbstractClass('Drupal\Core\Entity\EntityStorageInterface'); $role_storage->expects($this->any()) ->method('loadMultiple') diff --git a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php index d92b145..70e4a9f 100644 --- a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php +++ b/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php @@ -25,7 +25,7 @@ class ViewAjaxController implements ContainerInjectionInterface { /** - * The entity storage controller for views. + * The entity storage for views. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -42,7 +42,7 @@ class ViewAjaxController implements ContainerInjectionInterface { * Constructs a ViewAjaxController object. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller for views. + * The entity storage for views. * @param \Drupal\views\ViewExecutableFactory $executable_factory * The factory to load a view executable with. */ diff --git a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php index bc41302..773c09a 100644 --- a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php +++ b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php @@ -40,7 +40,7 @@ class RouteSubscriber extends RouteSubscriberBase { protected $viewsDisplayPairs; /** - * The view storage controller. + * The view storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php index 4c080a9..32d000f 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php @@ -59,7 +59,7 @@ * @param \Drupal\views\ViewExecutableFactory $executable_factory * The view executable factory. * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The views storage controller. + * The views storage. * @param \Drupal\Core\Session\AccountInterface $user * The current user. */ diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php index a7f4eeb..58ecba0 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php @@ -33,7 +33,7 @@ class ViewsBlock implements ContainerDerivativeInterface { protected $basePluginId; /** - * The view storage controller. + * The view storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -55,7 +55,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) { * @param string $base_plugin_id * The base plugin ID. * @param \Drupal\Core\Entity\EntityStorageInterface $view_storage - * The entity storage controller to load views. + * The entity storage to load views. */ public function __construct($base_plugin_id, EntityStorageInterface $view_storage) { $this->basePluginId = $base_plugin_id; diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php index 22fee32..f3c5a02 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php @@ -26,7 +26,7 @@ class ViewsExposedFilterBlock implements ContainerDerivativeInterface { protected $derivatives = array(); /** - * The view storage controller. + * The view storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -45,7 +45,7 @@ class ViewsExposedFilterBlock implements ContainerDerivativeInterface { * @param string $base_plugin_id * The base plugin ID. * @param \Drupal\Core\Entity\EntityStorageInterface $view_storage - * The entity storage controller to load views. + * The entity storage to load views. */ public function __construct($base_plugin_id, EntityStorageInterface $view_storage) { $this->basePluginId = $base_plugin_id; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php index cd1ba14..ce0a5ae 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php @@ -28,7 +28,7 @@ class View extends AreaPluginBase { protected $isEmpty; /** - * The view storage controller. + * The view storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -44,7 +44,7 @@ class View extends AreaPluginBase { * @param array $plugin_definition * The plugin implementation definition. * @param \Drupal\Core\Entity\EntityStorageInterface $view_storage - * The view storage controller. + * The view storage. */ public function __construct(array $configuration, $plugin_id, array $plugin_definition, EntityStorageInterface $view_storage) { parent::__construct($configuration, $plugin_id, $plugin_definition); diff --git a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php b/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php index af91c17..3e34891 100644 --- a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php +++ b/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php @@ -21,7 +21,7 @@ class ViewPageController implements ContainerInjectionInterface { /** - * The entity storage controller. + * The entity storage. * * @var \Drupal\Core\Entity\EntityStorageInterface */ @@ -38,7 +38,7 @@ class ViewPageController implements ContainerInjectionInterface { * Constructs a ViewPageController object. * * @param \Drupal\Core\Entity\EntityStorageInterface $storage - * The entity storage controller. + * The entity storage. * @param \Drupal\views\ViewExecutableFactory $executable_factory * The view executable factory */ diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTagTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTagTest.php index 2c2be5c..f96354f 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTagTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTagTest.php @@ -31,7 +31,7 @@ class CacheTagTest extends PluginTestBase { public static $modules = array('node'); /** - * The node storage controller. + * The node storage. * * @var \Drupal\node\NodeStorage */ diff --git a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php b/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php index 9d956f4..5ef6c5e 100644 --- a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php @@ -29,7 +29,7 @@ class QueryGroupByTest extends ViewUnitTestBase { public static $modules = array('entity', 'entity_test', 'system', 'field', 'user'); /** - * The storage controller for the test entity type. + * The storage for the test entity type. * * @var \Drupal\Core\Entity\FieldableDatabaseEntityStorage */ diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php index 17927a8..d5cfaf3 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php @@ -48,7 +48,7 @@ class ViewStorageTest extends ViewUnitTestBase { protected $entityType; /** - * The configuration entity storage controller. + * The configuration entity storage. * * @var \Drupal\views\ViewStorage */ diff --git a/core/modules/views/lib/Drupal/views/ViewStorage.php b/core/modules/views/lib/Drupal/views/ViewStorage.php index 44b65af..29ccb26 100644 --- a/core/modules/views/lib/Drupal/views/ViewStorage.php +++ b/core/modules/views/lib/Drupal/views/ViewStorage.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityInterface; /** - * Defines the storage controller class for View entities. + * Defines the storage class for View entities. */ class ViewStorage extends ConfigEntityStorage { diff --git a/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php index fee832d..fb28519 100644 --- a/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php +++ b/core/modules/views/tests/Drupal/views/Tests/EventSubscriber/RouteSubscriberTest.php @@ -28,7 +28,7 @@ class RouteSubscriberTest extends UnitTestCase { protected $entityManager; /** - * The mocked view storage controller. + * The mocked view storage. * * @var \Drupal\views\ViewStorage|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php index 26626ee..3f91966 100644 --- a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php +++ b/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php @@ -48,7 +48,7 @@ class ViewsBlockTest extends UnitTestCase { protected $view; /** - * The view storage controller. + * The view storage. * * @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/core/modules/views/tests/Drupal/views/Tests/Routing/ViewPageControllerTest.php b/core/modules/views/tests/Drupal/views/Tests/Routing/ViewPageControllerTest.php index 151eb13..5a520dc 100644 --- a/core/modules/views/tests/Drupal/views/Tests/Routing/ViewPageControllerTest.php +++ b/core/modules/views/tests/Drupal/views/Tests/Routing/ViewPageControllerTest.php @@ -31,7 +31,7 @@ class ViewPageControllerTest extends UnitTestCase { public $pageController; /** - * The mocked view storage controller. + * The mocked view storage. * * @var \Drupal\views\ViewStorage|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php index eff54ae..e44c4ba 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php @@ -45,7 +45,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type definition. * @param \Drupal\Core\Entity\EntityStorageInterface $storage. - * The entity storage controller class. + * The entity storage class. * @param \Drupal\Component\Plugin\PluginManagerInterface $display_manager * The views display plugin manager to use. */ diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php b/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php index 8fd6269..85ba619 100644 --- a/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php +++ b/core/tests/Drupal/Tests/Component/PhpStorage/PhpStorageTestBase.php @@ -11,7 +11,7 @@ use Drupal\Component\PhpStorage\PhpStorageFactory; /** - * Base test for PHP storage controllers. + * Base test for PHP storages. */ abstract class PhpStorageTestBase extends UnitTestCase { @@ -32,7 +32,7 @@ function setUp() { } /** - * Assert that a PHP storage controller's load/save/delete operations work. + * Assert that a PHP storage's load/save/delete operations work. */ public function assertCRUD($php) { $name = $this->randomName() . '/' . $this->randomName() . '.php'; diff --git a/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php index 73be900..07eba27 100644 --- a/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php @@ -14,7 +14,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; /** - * Tests the fieldable database storage controller. + * Tests the fieldable database storage. * * @see \Drupal\Core\Entity\FieldableDatabaseEntityStorage * @@ -28,7 +28,7 @@ class FieldableDatabaseEntityStorageTest extends UnitTestCase { */ public static function getInfo() { return array( - 'name' => 'Fieldable database storage controller', + 'name' => 'Fieldable database storage', 'description' => 'Tests the fieldable database storage enhancer for entities.', 'group' => 'Entity' );