From d6d08e5316a25666985d258e4da7ed21671297b0 Mon Sep 17 00:00:00 2001
From: berliner <berliner@dev030.com>
Date: Wed, 28 Feb 2024 01:25:29 +0100
Subject: [PATCH] HPC-9391: Fix service argument to prevent fatal errors

---
 .../ghi_hero_image.services.yml               |  2 +-
 .../src/HeroImageWidgetCropManager.php        | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/html/modules/custom/ghi_hero_image/ghi_hero_image.services.yml b/html/modules/custom/ghi_hero_image/ghi_hero_image.services.yml
index 68162952e..76d80a8da 100644
--- a/html/modules/custom/ghi_hero_image/ghi_hero_image.services.yml
+++ b/html/modules/custom/ghi_hero_image/ghi_hero_image.services.yml
@@ -4,4 +4,4 @@ services:
     arguments: ['@entity_type.manager', '@plugin.manager.endpoint_query_manager', '@smugmug_api.image', '@file_system']
   hero_image_widget_crop.manager:
     class: Drupal\ghi_hero_image\HeroImageWidgetCropManager
-    arguments: ['@entity_type.manager', '@config.factory', '@hero_image.manager', '@file.mime_type.guesser', '?@ghi_image.crop_manager']
\ No newline at end of file
+    arguments: ['@entity_type.manager', '@config.factory', '@hero_image.manager', '@file.mime_type.guesser', '@?ghi_image.crop_manager']
\ No newline at end of file
diff --git a/html/modules/custom/ghi_hero_image/src/HeroImageWidgetCropManager.php b/html/modules/custom/ghi_hero_image/src/HeroImageWidgetCropManager.php
index c2297401a..9f07d9fe4 100644
--- a/html/modules/custom/ghi_hero_image/src/HeroImageWidgetCropManager.php
+++ b/html/modules/custom/ghi_hero_image/src/HeroImageWidgetCropManager.php
@@ -2,17 +2,19 @@
 
 namespace Drupal\ghi_hero_image;
 
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\ContentEntityFormInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\crop\Entity\CropType;
 use Drupal\file\Entity\File;
 use Drupal\file\Plugin\Field\FieldType\FileFieldItemList;
 use Drupal\ghi_hero_image\Plugin\Field\FieldType\HeroImageItem;
+use Drupal\ghi_image\CropManager;
 use Drupal\image_widget_crop\ImageWidgetCropInterface;
 use Drupal\image_widget_crop\ImageWidgetCropManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Mime\MimeTypeGuesserInterface;
 
 /**
  * HeroImageWidgetCropManager class.
@@ -25,7 +27,7 @@
  *
  * @see \Drupal\ghi_image\CropManager
  */
-class HeroImageWidgetCropManager extends ImageWidgetCropManager implements ImageWidgetCropInterface, ContainerInjectionInterface {
+class HeroImageWidgetCropManager extends ImageWidgetCropManager implements ImageWidgetCropInterface {
 
   use DependencySerializationTrait;
 
@@ -61,17 +63,13 @@ class HeroImageWidgetCropManager extends ImageWidgetCropManager implements Image
   protected $cropManager;
 
   /**
-   * {@inheritdoc}
+   * Public constructor.
    */
-  public static function create(ContainerInterface $container) {
-    $instance = new static(
-      $container->get('entity_type.manager'),
-      $container->get('config.factory')
-    );
-    $instance->heroImageManager = $container->get('hero_image.manager');
-    $instance->mimeTypeGuesser = $container->get('file.mime_type.guesser');
-    $instance->cropManager = $container->get('ghi_image.crop_manager');
-    return $instance;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory, HeroImageManager $hero_image_manager, MimeTypeGuesserInterface $mime_type_guesser, CropManager $crop_manager) {
+    parent::__construct($entity_type_manager, $config_factory);
+    $this->heroImageManager = $hero_image_manager;
+    $this->mimeTypeGuesser = $mime_type_guesser;
+    $this->cropManager = $crop_manager;
   }
 
   /**