From 6b3ae938e92b0b5b553c1c5595807b9552fdbc31 Mon Sep 17 00:00:00 2001
From: "a.dmitriiev" <a.dmitriiev@3235287.no-reply.drupal.org>
Date: Mon, 5 Sep 2022 16:43:43 +0000
Subject: [PATCH] Issue #3305155: Use type declaration
EntityTypeManagerInterface instead of EntityTypeManager
---
src/Form/FillPdfFormForm.php | 4 ++--
src/Form/FillPdfOverviewForm.php | 8 ++++----
src/InputHelper.php | 8 ++++----
src/Service/BackendProxy.php | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 86539ad..0048b10 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -6,7 +6,7 @@ use Drupal\Component\Datetime\TimeInterface;
use Drupal\Core\Entity\ContentEntityForm;
use Drupal\Core\Entity\EntityRepositoryInterface;
use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Form\FormStateInterface;
@@ -97,7 +97,7 @@ class FillPdfFormForm extends ContentEntityForm {
InputHelperInterface $input_helper,
SerializerInterface $fillpdf_serializer,
FileSystemInterface $file_system,
- EntityTypeManager $entity_type_manager,
+ EntityTypeManagerInterface $entity_type_manager,
TokenResolverInterface $token_resolver,
EntityTypeBundleInfoInterface $entity_type_bundle_info,
RendererInterface $renderer,
diff --git a/src/Form/FillPdfOverviewForm.php b/src/Form/FillPdfOverviewForm.php
index f2ca507..5fa43b4 100644
--- a/src/Form/FillPdfOverviewForm.php
+++ b/src/Form/FillPdfOverviewForm.php
@@ -3,12 +3,12 @@
namespace Drupal\fillpdf\Form;
use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
-use Drupal\Core\Entity\EntityTypeManager;
use Drupal\fillpdf\InputHelperInterface;
use Drupal\fillpdf\Component\Utility\FillPdf;
use Drupal\fillpdf\Plugin\PdfBackendManager;
@@ -51,7 +51,7 @@ class FillPdfOverviewForm extends FormBase {
/**
* The Entity Type Manager.
*
- * @var \Drupal\Core\Entity\EntityTypeManager
+ * @var \Drupal\Core\Entity\EntityTypeManagerInterface
*/
protected $entityTypeManager;
@@ -66,7 +66,7 @@ class FillPdfOverviewForm extends FormBase {
* The file system.
* @param \Drupal\fillpdf\InputHelperInterface $input_helper
* The FillPDF input helper.
- * @param \Drupal\Core\Entity\EntityTypeManager $entity_type_manager
+ * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The Entity type manager service.
*/
public function __construct(
@@ -74,7 +74,7 @@ class FillPdfOverviewForm extends FormBase {
PdfBackendManager $backend_manager,
FileSystemInterface $file_system,
InputHelperInterface $input_helper,
- EntityTypeManager $entity_type_manager
+ EntityTypeManagerInterface $entity_type_manager
) {
$this->moduleHandler = $module_handler;
$this->backendManager = $backend_manager;
diff --git a/src/InputHelper.php b/src/InputHelper.php
index 6b27015..6ce70d2 100644
--- a/src/InputHelper.php
+++ b/src/InputHelper.php
@@ -3,8 +3,8 @@
namespace Drupal\fillpdf;
use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\file\FileInterface;
-use Drupal\Core\Entity\EntityTypeManager;
use Drupal\fillpdf\Entity\FillPdfForm;
use Drupal\fillpdf\Entity\FillPdfFormField;
use Drupal\fillpdf\Plugin\PdfBackendManager;
@@ -33,7 +33,7 @@ class InputHelper implements InputHelperInterface {
/**
* The Entity Type Manager.
*
- * @var \Drupal\Core\Entity\EntityTypeManager
+ * @var \Drupal\Core\Entity\EntityTypeManagerInterface
*/
protected $entityTypeManager;
@@ -44,10 +44,10 @@ class InputHelper implements InputHelperInterface {
* The config factory service.
* @param \Drupal\fillpdf\Plugin\PdfBackendManager $backend_manager
* The FillPDF backend manager.
- * @param \Drupal\Core\Entity\EntityTypeManager $entity_type_manager
+ * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The Entity type manager service.
*/
- public function __construct(ConfigFactoryInterface $config_factory, PdfBackendManager $backend_manager, EntityTypeManager $entity_type_manager) {
+ public function __construct(ConfigFactoryInterface $config_factory, PdfBackendManager $backend_manager, EntityTypeManagerInterface $entity_type_manager) {
$this->configManager = $config_factory;
$this->backendManager = $backend_manager;
$this->entityTypeManager = $entity_type_manager;
diff --git a/src/Service/BackendProxy.php b/src/Service/BackendProxy.php
index 0c27fb8..65f0e9f 100644
--- a/src/Service/BackendProxy.php
+++ b/src/Service/BackendProxy.php
@@ -3,7 +3,7 @@
namespace Drupal\fillpdf\Service;
use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\fillpdf\Component\Helper\FillPdfMappingHelper;
use Drupal\fillpdf\FieldMapping\TextFieldMapping;
use Drupal\fillpdf\FillPdfFormInterface;
@@ -38,7 +38,7 @@ class BackendProxy implements BackendProxyInterface {
/**
* The Entity Type Manager.
*
- * @var \Drupal\Core\Entity\EntityTypeManager
+ * @var \Drupal\Core\Entity\EntityTypeManagerInterface
*/
protected $entityTypeManager;
@@ -51,10 +51,10 @@ class BackendProxy implements BackendProxyInterface {
* The plugin.manager.fillpdf.pdf_backend service.
* @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
* The configuration factory.
- * @param \Drupal\Core\Entity\EntityTypeManager $entity_type_manager
+ * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The Entity type manager service.
*/
- public function __construct(TokenResolverInterface $tokenResolver, PdfBackendManager $backendManager, ConfigFactoryInterface $configFactory, EntityTypeManager $entity_type_manager) {
+ public function __construct(TokenResolverInterface $tokenResolver, PdfBackendManager $backendManager, ConfigFactoryInterface $configFactory, EntityTypeManagerInterface $entity_type_manager) {
$this->tokenResolver = $tokenResolver;
$this->backendManager = $backendManager;
$this->configFactory = $configFactory;
--
GitLab