Issue #3037376 by flocondetoile, mglaman, FiNeX, rhovland, andyg5000: Order product category condition matches non-taxonomy ids

Author: flocondetoile

modules/product/src/Plugin/Commerce/Condition/ProductCategoryTrait.php

@@ -134,7 +134,9 @@ protected function getReferencedIds(ProductInterface $product) {
     foreach ($this->getEntityReferenceFieldMap() as $field_name => $field_info) {
       if ($product->hasField($field_name)) {
         $field = $product->get($field_name);
-        if (!$field->isEmpty()) {
+        $field_definition = $field->getFieldDefinition();
+        $target_type = $field_definition->getSetting('target_type');
+        if ($target_type === 'taxonomy_term' && !$field->isEmpty()) {
           foreach ($field->getValue() as $index => $field_item) {
             $ids[] = $field_item['target_id'];
           }

modules/product/tests/src/Unit/Plugin/Commerce/Condition/OrderItemProductCategoryTest.php

@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemList;
+use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -57,7 +58,10 @@ public function testEvaluate() {
     $this->assertFalse($condition->evaluate($order_item));
 
     // Product with a non-matching product category.
+    $entity_reference_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+    $entity_reference_field_definition->getSetting('target_type')->willReturn('taxonomy_term');
     $entity_reference_item_list = $this->prophesize(EntityReferenceFieldItemList::class);
+    $entity_reference_item_list->getFieldDefinition()->willReturn($entity_reference_field_definition->reveal());
     $entity_reference_item_list->isEmpty()->willReturn(FALSE);
     $entity_reference_item_list->getValue()->willReturn([
       '1' => [

modules/product/tests/src/Unit/Plugin/Commerce/Condition/OrderProductCategoryTest.php

@@ -11,6 +11,7 @@
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemList;
+use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -57,7 +58,10 @@ public function testEvaluate() {
     $first_order_item = $first_order_item->reveal();
 
     // Product with a non-matching product category.
+    $entity_reference_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+    $entity_reference_field_definition->getSetting('target_type')->willReturn('taxonomy_term');
     $entity_reference_item_list = $this->prophesize(EntityReferenceFieldItemList::class);
+    $entity_reference_item_list->getFieldDefinition()->willReturn($entity_reference_field_definition->reveal());
     $entity_reference_item_list->isEmpty()->willReturn(FALSE);
     $entity_reference_item_list->getValue()->willReturn([
       '1' => [