DDST-922 : WIP (#34)

* Refactor WIP. * Modifying field_default_image retrieval. * Removing development statements. * Coding standards.
discoverygarden · Jan 7, 2025 · a344528 · a344528
1 parent 8d1a6c8
commit a344528
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/EventSubscriber/ModelDefaultFallbackSubscriber.php b/src/EventSubscriber/ModelDefaultFallbackSubscriber.php
@@ -26,20 +26,25 @@ public function discoverImage(ImageDiscoveryEvent $event) : void {
     /** @var \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $term_item */
     foreach ($entity->get('field_model') as $term_item) {
       /** @var \Drupal\taxonomy\TermInterface $term */
-      $term = $term_item?->get('entity')?->getTarget();
+      $term = $term_item?->get('entity')?->getTarget()?->getEntity();
       $term_access = $term?->access('view', NULL, TRUE);
+
       if (!$term_access?->isAllowed()) {
         continue;
       }
+
       if (!$term?->hasField('field_default_image')) {
         continue;
       }
+
       /** @var \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $candidate_item */
       foreach ($term->get('field_default_image') as $candidate_item) {
-        /** @var \Drupal\media\MediaInterface $candidate */
-        if (!$candidate = $candidate_item?->get('entity')?->getTarget()) {
+
+        /** @var \Drupal\media\Entity\Media $candidate */
+        if (!$candidate = $candidate_item?->get('entity')?->getTarget()?->getEntity()) {
           continue;
         }
+
         $candidate_access = $candidate?->access('view', NULL, TRUE);
         if (!$candidate_access->isAllowed()) {
           continue;

diff --git a/src/Plugin/Field/FieldType/DIDImageItem.php b/src/Plugin/Field/FieldType/DIDImageItem.php
@@ -45,7 +45,7 @@ class DIDImageItem extends EntityReferenceItem implements RefinableCacheableDepe
   public function __construct(
     DataDefinitionInterface $definition,
     $name = NULL,
-    TypedDataInterface $parent = NULL,
+    ?TypedDataInterface $parent = NULL,
   ) {
     parent::__construct($definition, $name, $parent);
 

diff --git a/src/Plugin/search_api/processor/DgiImageDiscovery.php b/src/Plugin/search_api/processor/DgiImageDiscovery.php
@@ -77,7 +77,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function getPropertyDefinitions(DatasourceInterface $datasource = NULL) {
+  public function getPropertyDefinitions(?DatasourceInterface $datasource = NULL) {
     $properties = [];
 
     if (!$datasource) {