Unverified Commit ba351b47 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3118998 by katherined, neelam_wadhwani, phenaproxima, effulgentsia:... 

Issue #3118998 by katherined, neelam_wadhwani, phenaproxima, effulgentsia: Remove null default for $memory_cache in entity storage handler constructors
parent d5fc3d94

core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php

+2 −2
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora 
   *   The UUID service.

   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager

   *   The language manager.

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface|null $memory_cache

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface $memory_cache

   *   The memory cache backend.

   */

  public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, MemoryCacheInterface $memory_cache = NULL) {

  public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, MemoryCacheInterface $memory_cache) {

    parent::__construct($entity_type, $memory_cache);



    $this->configFactory = $config_factory;

core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con 
   *   The entity field manager.

   * @param \Drupal\Core\Cache\CacheBackendInterface $cache

   *   The cache backend to be used.

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface|null $memory_cache

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface $memory_cache

   *   The memory cache backend.

   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info

   *   The entity type bundle info.

core/lib/Drupal/Core/Entity/EntityStorageBase.php

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor 
   *

   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type

   *   The entity type definition.

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface|null $memory_cache

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface $memory_cache

   *   The memory cache.

   */

  public function __construct(EntityTypeInterface $entity_type, MemoryCacheInterface $memory_cache) {

core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI 
   *   The cache backend to be used.

   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager

   *   The language manager.

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface|null $memory_cache

   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface $memory_cache

   *   The memory cache backend to be used.

   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info

   *   The entity type bundle info.