Merge remote-tracking branch 'origin/MAUT-11515' into development

Author: dadarya0

CustomFieldType/AbstractCustomFieldType.php

@@ -65,7 +65,7 @@ public function getTableAlias(): string
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array
+    public function getOperators(): array
     {
         return $this->filterOperatorProvider->getAllOperators();
     }

CustomFieldType/AbstractMultivalueType.php

@@ -58,7 +58,7 @@ public function getEntityClass(): string
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array
+    public function getOperators(): array
     {
         $allOperators     = parent::getOperators();
         $allowedOperators = array_flip(['empty', '!empty', 'in', '!in']);

CustomFieldType/AbstractTextType.php

@@ -34,7 +34,7 @@ public function getEntityClass(): string
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array
+    public function getOperators(): array
     {
         $allOperators     = parent::getOperators();
         $allowedOperators = array_flip(['=', '!=', 'empty', '!empty', 'like', '!like', 'startsWith', 'endsWith', 'contains']);

CustomFieldType/CustomFieldTypeInterface.php

@@ -60,7 +60,7 @@ public function getTableAlias(): string;
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array;
+    public function getOperators(): array;
 
     /**
      * @return mixed[]

CustomFieldType/DateOperatorTrait.php

@@ -23,14 +23,16 @@ public function getOperatorOptions(): array
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array
+    public function getOperators(): array
     {
         $allOperators     = parent::getOperators();
-        if ('segment' === $context) {
-            return $allOperators;
-        }
         $allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between', 'inLast', 'inNext']);
 
         return array_intersect_key($allOperators, $allowedOperators);
     }
+
+    public function getOperatorsForSegment(): array
+    {
+        return parent::getOperators();
+    }
 }

CustomFieldType/IntType.php

@@ -58,7 +58,7 @@ public function getOperatorOptions(): array
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array
+    public function getOperators(): array
     {
         $allOperators     = parent::getOperators();
         $allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between']);

CustomFieldType/SelectType.php

@@ -36,7 +36,7 @@ public function getSymfonyFormFieldType(): string
     /**
      * @return mixed[]
      */
-    public function getOperators(string $context = null): array
+    public function getOperators(): array
     {
         $allOperators     = parent::getOperators();
         $allowedOperators = array_flip(['=', '!=', 'empty', '!empty']);

EventListener/SegmentFiltersChoicesGenerateSubscriber.php

@@ -91,12 +91,20 @@ function (CustomObject $customObject) use ($event, $fieldTypes): void {
 
                 /** @var CustomField $customField */
                 foreach ($customObject->getCustomFields()->getIterator() as $customField) {
-                    if ($customField->getType() === $fieldTypes[HiddenType::NAME]) { // We don't want to show hidden types in filter list
+                    if ($customField->getType() === $fieldTypes[HiddenType::NAME]) {
+                        // We don't want to show hidden types in filter list
                         continue;
                     }
 
-                    $context = method_exists($this->typeOperatorProvider, 'getContext') ? $this->typeOperatorProvider->getContext() : '';
-                    $allowedOperators = $customField->getTypeObject()->getOperators($context);
+                    if (method_exists($this->typeOperatorProvider, 'getContext') &&
+                        'segment' === $this->typeOperatorProvider->getContext() &&
+                        method_exists($customField->getTypeObject(), 'getOperatorsForSegment')
+                    ) {
+                        $allowedOperators = $customField->getTypeObject()->getOperatorsForSegment();
+                    } else {
+                        $allowedOperators = $customField->getTypeObject()->getOperators();
+                    }
+
                     $typeOperators = $this->typeOperatorProvider->getOperatorsForFieldType($customField->getType());
                     $availableOperators = array_flip($typeOperators);
                     $operators = array_intersect_key($availableOperators, $allowedOperators);