Merge branch '4.6'

src/bundle/Resources/config/services/query.yaml

@@ -7,3 +7,15 @@ services:
     Ibexa\Contracts\CoreSearch\Values\Query\CriterionMapper:
         arguments:
             $mappers: !tagged_iterator ibexa.core_search.criterion_mapper
+
+    Ibexa\CoreSearch\CriterionMapper\FieldValueCriterionMapper:
+        tags:
+            - { name: ibexa.core_search.criterion_mapper, priority: -100 }
+
+    Ibexa\CoreSearch\CriterionMapper\LogicalAndCriterionMapper:
+        tags:
+            - { name: ibexa.core_search.criterion_mapper, priority: -100 }
+
+    Ibexa\CoreSearch\CriterionMapper\LogicalOrCriterionMapper:
+        tags:
+            - { name: ibexa.core_search.criterion_mapper, priority: -100 }

src/lib/CriterionMapper/FieldValueCriterionMapper.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\CoreSearch\CriterionMapper;
+
+use Ibexa\Contracts\CoreSearch\Persistence\CriterionMapper\AbstractFieldCriterionMapper;
+use Ibexa\Contracts\CoreSearch\Values\Query\Criterion\CriterionInterface;
+use Ibexa\Contracts\CoreSearch\Values\Query\Criterion\FieldValueCriterion;
+
+/**
+ * @template-extends \Ibexa\Contracts\CoreSearch\Persistence\CriterionMapper\AbstractFieldCriterionMapper<
+ *     \Ibexa\Contracts\CoreSearch\Values\Query\Criterion\FieldValueCriterion
+ * >
+ */
+final class FieldValueCriterionMapper extends AbstractFieldCriterionMapper
+{
+    public function canHandle(CriterionInterface $criterion): bool
+    {
+        return $criterion instanceof FieldValueCriterion;
+    }
+}

src/lib/CriterionMapper/LogicalAndCriterionMapper.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\CoreSearch\CriterionMapper;
+
+use Doctrine\Common\Collections\Expr\CompositeExpression;
+use Ibexa\Contracts\CoreSearch\Persistence\CriterionMapper\AbstractCompositeCriterionMapper;
+use Ibexa\Contracts\CoreSearch\Values\Query\Criterion\LogicalAnd;
+
+final class LogicalAndCriterionMapper extends AbstractCompositeCriterionMapper
+{
+    protected function getHandledClass(): string
+    {
+        return LogicalAnd::class;
+    }
+
+    protected function getType(): string
+    {
+        return CompositeExpression::TYPE_AND;
+    }
+}

src/lib/CriterionMapper/LogicalOrCriterionMapper.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\CoreSearch\CriterionMapper;
+
+use Doctrine\Common\Collections\Expr\CompositeExpression;
+use Ibexa\Contracts\CoreSearch\Persistence\CriterionMapper\AbstractCompositeCriterionMapper;
+use Ibexa\Contracts\CoreSearch\Values\Query\Criterion\LogicalOr;
+
+final class LogicalOrCriterionMapper extends AbstractCompositeCriterionMapper
+{
+    protected function getHandledClass(): string
+    {
+        return LogicalOr::class;
+    }
+
+    protected function getType(): string
+    {
+        return CompositeExpression::TYPE_OR;
+    }
+}