Commit f0fe2a07 authored by alexpott's avatar alexpott

Issue #2780255 by klausi: Replace incorrect EntityTypeBundleInfo type hints with interface

parent fdb71536
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\Core\Entity\Plugin\DataType\Deriver; namespace Drupal\Core\Entity\Plugin\DataType\Deriver;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityTypeBundleInfo; use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
...@@ -36,7 +36,7 @@ class EntityDeriver implements ContainerDeriverInterface { ...@@ -36,7 +36,7 @@ class EntityDeriver implements ContainerDeriverInterface {
/** /**
* The bundle info service. * The bundle info service.
* *
* @var \Drupal\Core\Entity\EntityTypeBundleInfo * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
*/ */
protected $bundleInfoService; protected $bundleInfoService;
...@@ -48,7 +48,7 @@ class EntityDeriver implements ContainerDeriverInterface { ...@@ -48,7 +48,7 @@ class EntityDeriver implements ContainerDeriverInterface {
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager. * The entity manager.
*/ */
public function __construct($base_plugin_id, EntityManagerInterface $entity_manager, EntityTypeBundleInfo $bundle_info_service) { public function __construct($base_plugin_id, EntityManagerInterface $entity_manager, EntityTypeBundleInfoInterface $bundle_info_service) {
$this->basePluginId = $base_plugin_id; $this->basePluginId = $base_plugin_id;
$this->entityManager = $entity_manager; $this->entityManager = $entity_manager;
$this->bundleInfoService = $bundle_info_service; $this->bundleInfoService = $bundle_info_service;
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
use Drupal\Core\Config\Entity\ConfigEntityListBuilder; use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityTypeBundleInfo;
use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Drupal\Core\Field\FieldTypePluginManagerInterface; use Drupal\Core\Field\FieldTypePluginManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
...@@ -56,7 +56,7 @@ class FieldStorageConfigListBuilder extends ConfigEntityListBuilder { ...@@ -56,7 +56,7 @@ class FieldStorageConfigListBuilder extends ConfigEntityListBuilder {
* @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
* The 'field type' plugin manager. * The 'field type' plugin manager.
*/ */
public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, EntityTypeBundleInfo $bundle_info_service) { public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, EntityTypeBundleInfoInterface $bundle_info_service) {
parent::__construct($entity_type, $entity_manager->getStorage($entity_type->id())); parent::__construct($entity_type, $entity_manager->getStorage($entity_type->id()));
$this->entityManager = $entity_manager; $this->entityManager = $entity_manager;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
use Drupal\Core\Cache\Cache; use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Entity\EntityTypeBundleInfo; use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
...@@ -28,7 +28,7 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac ...@@ -28,7 +28,7 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac
/** /**
* The bundle info service. * The bundle info service.
* *
* @var \Drupal\Core\Entity\EntityTypeBundleInfo * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
*/ */
protected $bundleInfoService; protected $bundleInfoService;
...@@ -43,10 +43,10 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac ...@@ -43,10 +43,10 @@ class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterfac
* The config factory service. * The config factory service.
* @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
* The request stack. * The request stack.
* @param \Drupal\Core\Entity\EntityTypeBundleInfo $bundle_info_service * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info_service
* The bundle info service. * The bundle info service.
*/ */
public function __construct(CacheBackendInterface $cache, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, RequestStack $request_stack, EntityTypeBundleInfo $bundle_info_service) { public function __construct(CacheBackendInterface $cache, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, RequestStack $request_stack, EntityTypeBundleInfoInterface $bundle_info_service) {
$this->cache = $cache; $this->cache = $cache;
$this->configFactory = $config_factory; $this->configFactory = $config_factory;
$this->moduleHandler = $module_handler; $this->moduleHandler = $module_handler;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\views\Plugin\views\filter; namespace Drupal\views\Plugin\views\filter;
use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityTypeBundleInfo; use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Drupal\views\ViewExecutable; use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
...@@ -41,7 +41,7 @@ class Bundle extends InOperator { ...@@ -41,7 +41,7 @@ class Bundle extends InOperator {
/** /**
* The bundle info service. * The bundle info service.
* *
* @var \Drupal\Core\Entity\EntityTypeBundleInfo * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
*/ */
protected $bundleInfoService; protected $bundleInfoService;
...@@ -57,7 +57,7 @@ class Bundle extends InOperator { ...@@ -57,7 +57,7 @@ class Bundle extends InOperator {
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager. * The entity manager.
*/ */
public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, EntityTypeBundleInfo $bundle_info_service) { public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, EntityTypeBundleInfoInterface $bundle_info_service) {
parent::__construct($configuration, $plugin_id, $plugin_definition); parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->entityManager = $entity_manager; $this->entityManager = $entity_manager;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace Drupal\views\Plugin\views\wizard; namespace Drupal\views\Plugin\views\wizard;
use Drupal\Component\Utility\NestedArray; use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Entity\EntityTypeBundleInfo; use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\UrlGeneratorTrait; use Drupal\Core\Routing\UrlGeneratorTrait;
use Drupal\views\Entity\View; use Drupal\views\Entity\View;
...@@ -113,7 +113,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface { ...@@ -113,7 +113,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
/** /**
* The bundle info service. * The bundle info service.
* *
* @var \Drupal\Core\Entity\EntityTypeBundleInfo * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
*/ */
protected $bundleInfoService; protected $bundleInfoService;
...@@ -132,7 +132,7 @@ public static function create(ContainerInterface $container, array $configuratio ...@@ -132,7 +132,7 @@ public static function create(ContainerInterface $container, array $configuratio
/** /**
* Constructs a WizardPluginBase object. * Constructs a WizardPluginBase object.
*/ */
public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeBundleInfo $bundle_info_service) { public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeBundleInfoInterface $bundle_info_service) {
parent::__construct($configuration, $plugin_id, $plugin_definition); parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->bundleInfoService = $bundle_info_service; $this->bundleInfoService = $bundle_info_service;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment