Merge branch 'staging' into MAUT-11616

acquia · Jul 5, 2024 · 367cd2e · 367cd2e
2 parents 488e2d8 + 9a9ebd3
commit 367cd2e
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 23 deletions.
diff --git a/CustomFieldType/DateOperatorTrait.php b/CustomFieldType/DateOperatorTrait.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MauticPlugin\CustomObjectsBundle\CustomFieldType;
+
+trait DateOperatorTrait
+{
+    /**
+     * Remove operators that are supported only by segment filters.
+     *
+     * @return string[]
+     */
+    public function getOperatorOptions(): array
+    {
+        $options = parent::getOperatorOptions();
+
+        unset($options['between'], $options['!between'], $options['inLast'], $options['inNext']);
+
+        return $options;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getOperators(): array
+    {
+        $allOperators     = parent::getOperators();
+        $allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between', 'inLast', 'inNext']);
+
+        return array_intersect_key($allOperators, $allowedOperators);
+    }
+}
diff --git a/CustomFieldType/DateTimeType.php b/CustomFieldType/DateTimeType.php
@@ -17,6 +17,8 @@
 
 class DateTimeType extends AbstractCustomFieldType
 {
+    use DateOperatorTrait;
+
     /**
      * @var string
      */
@@ -70,17 +72,6 @@ public function getEntityClass(): string
         return CustomFieldValueDateTime::class;
     }
 
-    /**
-     * @return mixed[]
-     */
-    public function getOperators(): array
-    {
-        $allOperators     = parent::getOperators();
-        $allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between', 'inLast', 'inNext']);
-
-        return array_intersect_key($allOperators, $allowedOperators);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/CustomFieldType/DateType.php b/CustomFieldType/DateType.php
@@ -16,6 +16,8 @@
 
 class DateType extends AbstractCustomFieldType
 {
+    use DateOperatorTrait;
+
     /**
      * @var string
      */
@@ -70,17 +72,6 @@ public function getEntityClass(): string
         return CustomFieldValueDate::class;
     }
 
-    /**
-     * @return mixed[]
-     */
-    public function getOperators(): array
-    {
-        $allOperators     = parent::getOperators();
-        $allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between', 'inLast', 'inNext']);
-
-        return array_intersect_key($allOperators, $allowedOperators);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/CustomFieldType/IntType.php b/CustomFieldType/IntType.php
@@ -41,6 +41,20 @@ public function createValueEntity(CustomField $customField, CustomItem $customIt
         return new CustomFieldValueInt($customField, $customItem, (int) $value);
     }
 
+    /**
+     * Remove operators that are supported only by segment filters.
+     *
+     * @return string[]
+     */
+    public function getOperatorOptions(): array
+    {
+        $options = parent::getOperatorOptions();
+
+        unset($options['between'], $options['!between']);
+
+        return $options;
+    }
+
     /**
      * @return mixed[]
      */

diff --git a/Entity/CustomField.php b/Entity/CustomField.php
@@ -578,7 +578,7 @@ public function valueToLabel(string $value): string
             throw new NotFoundException("Label was not found for value {$value}");
         }
 
-        return $label;
+        return (string) $label;
     }
 
     /**

diff --git a/Tests/Unit/Entity/CustomFieldTest.php b/Tests/Unit/Entity/CustomFieldTest.php
@@ -316,6 +316,22 @@ public function testValueToLabel(): void
         $this->assertSame('Option B', $customField->valueToLabel('option_b'));
     }
 
+    public function testValueToLabelWithInteger(): void
+    {
+        $customField = new CustomField();
+        $optionB     = new CustomFieldOption();
+        $optionB->setLabel('1');
+        $optionB->setValue('1');
+        $customField->addOption($optionB);
+        $customField->setTypeObject(
+            new SelectType(
+                $this->createMock(TranslatorInterface::class),
+                $this->createMock(FilterOperatorProviderInterface::class)
+            )
+        );
+        $this->assertSame('1', $customField->valueToLabel('1'));
+    }
+
     public function testValueToLabelIfOptionNotFound(): void
     {
         $customField = new CustomField();