From b2086a34ec49edbb2d246a95c9d857fc2c5b3d61 Mon Sep 17 00:00:00 2001
From: Stefan Korn <drupal@stefan-korn.de>
Date: Mon, 30 Sep 2024 18:43:41 +0200
Subject: [PATCH] #4296: Typehint interfaces instead of concrete classes for
 some services (#4297)

---
 .../metastore/modules/metastore_search/src/Search.php  |  8 ++++----
 modules/metastore/src/NodeWrapper/Data.php             |  8 ++++----
 modules/metastore/src/NodeWrapper/NodeDataFactory.php  | 10 +++++-----
 modules/metastore/src/Storage/DataFactory.php          |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/metastore/modules/metastore_search/src/Search.php b/modules/metastore/modules/metastore_search/src/Search.php
index 86380ddef0..fc2f8c0b17 100644
--- a/modules/metastore/modules/metastore_search/src/Search.php
+++ b/modules/metastore/modules/metastore_search/src/Search.php
@@ -3,7 +3,7 @@
 namespace Drupal\metastore_search;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\metastore\MetastoreService;
 use Drupal\search_api\Query\ResultSet;
 use Drupal\search_api\Utility\QueryHelperInterface;
@@ -45,7 +45,7 @@ class Search implements ContainerInjectionInterface {
   /**
    * Entity Type Manager.
    *
-   * @var \Drupal\Core\Entity\EntityTypeManager
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   private $entityTypeManager;
 
@@ -61,14 +61,14 @@ class Search implements ContainerInjectionInterface {
    *
    * @param \Drupal\metastore\MetastoreService $metastoreService
    *   Metastore service.
-   * @param \Drupal\Core\Entity\EntityTypeManager $entityTypeManager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   Entity type manager.
    * @param \Drupal\search_api\Utility\QueryHelperInterface $queryHelper
    *   Query helper.
    */
   public function __construct(
     MetastoreService $metastoreService,
-    EntityTypeManager $entityTypeManager,
+    EntityTypeManagerInterface $entityTypeManager,
     QueryHelperInterface $queryHelper
   ) {
     $this->metastoreService = $metastoreService;
diff --git a/modules/metastore/src/NodeWrapper/Data.php b/modules/metastore/src/NodeWrapper/Data.php
index 5ef9c8e041..2d3cd7980c 100644
--- a/modules/metastore/src/NodeWrapper/Data.php
+++ b/modules/metastore/src/NodeWrapper/Data.php
@@ -3,8 +3,8 @@
 namespace Drupal\metastore\NodeWrapper;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\common\Exception\DataNodeLifeCycleEntityValidationException;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\metastore\MetastoreItemInterface;
 use Drupal\node\Entity\Node;
 
@@ -30,7 +30,7 @@ class Data implements MetastoreItemInterface {
   /**
    * Entity Type Manager.
    *
-   * @var \Drupal\Core\Entity\EntityTypeManager
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   private $entityTypeManager;
 
@@ -46,12 +46,12 @@ class Data implements MetastoreItemInterface {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   A Drupal entity.
-   * @param \Drupal\Core\Entity\EntityTypeManager $entityTypeManager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   Entity Type Manager service.
    *
    * @throws \Drupal\common\Exception\DataNodeLifeCycleEntityValidationException
    */
-  public function __construct(EntityInterface $entity, EntityTypeManager $entityTypeManager) {
+  public function __construct(EntityInterface $entity, EntityTypeManagerInterface $entityTypeManager) {
     $this->validate($entity);
     $this->node = $entity;
     $this->entityTypeManager = $entityTypeManager;
diff --git a/modules/metastore/src/NodeWrapper/NodeDataFactory.php b/modules/metastore/src/NodeWrapper/NodeDataFactory.php
index 935abf3cc1..470ebfb288 100644
--- a/modules/metastore/src/NodeWrapper/NodeDataFactory.php
+++ b/modules/metastore/src/NodeWrapper/NodeDataFactory.php
@@ -3,7 +3,7 @@
 namespace Drupal\metastore\NodeWrapper;
 
 use Drupal\Core\Entity\EntityRepository;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\metastore\Factory\MetastoreEntityItemFactoryInterface;
 
 /**
@@ -16,14 +16,14 @@ class NodeDataFactory implements MetastoreEntityItemFactoryInterface {
   /**
    * EntityRepository object.
    *
-   * @var Drupal\Core\Entity\EntityRepository
+   * @var \Drupal\Core\Entity\EntityRepository
    */
   private $entityRepository;
 
   /**
    * Entity Type Manager.
    *
-   * @var Drupal\Core\Entity\EntityTypeManager
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   private $entityTypeManager;
 
@@ -32,10 +32,10 @@ class NodeDataFactory implements MetastoreEntityItemFactoryInterface {
    *
    * @param \Drupal\Core\Entity\EntityRepository $entityRepository
    *   The entity repository service.
-   * @param \Drupal\Core\Entity\EntityTypeManager $entityTypeManager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   Entity Type Manager service.
    */
-  public function __construct(EntityRepository $entityRepository, EntityTypeManager $entityTypeManager) {
+  public function __construct(EntityRepository $entityRepository, EntityTypeManagerInterface $entityTypeManager) {
     $this->entityRepository = $entityRepository;
     $this->entityTypeManager = $entityTypeManager;
   }
diff --git a/modules/metastore/src/Storage/DataFactory.php b/modules/metastore/src/Storage/DataFactory.php
index d9b2cdd091..2d36a48444 100644
--- a/modules/metastore/src/Storage/DataFactory.php
+++ b/modules/metastore/src/Storage/DataFactory.php
@@ -4,7 +4,7 @@
 
 use Contracts\FactoryInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -22,7 +22,7 @@ class DataFactory implements FactoryInterface {
   /**
    * Entity type manager service.
    *
-   * @var \Drupal\Core\Entity\EntityTypeManager
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   private $entityTypeManager;
 
@@ -44,7 +44,7 @@ class DataFactory implements FactoryInterface {
    * Constructor.
    */
   public function __construct(
-    EntityTypeManager $entityTypeManager,
+    EntityTypeManagerInterface $entityTypeManager,
     ConfigFactoryInterface $config_factory,
     LoggerInterface $loggerChannel
   ) {