IBX-10458: Refactor solution to use a distinct query

barw4 · barw4 · commit 9dfbc2f382c2 · 2025-09-21T16:16:04.000+02:00
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContainsFieldDefinitionId.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContainsFieldDefinitionId.php
@@ -16,6 +16,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContainsFieldDefinitionId>
+ */
 final class ContainsFieldDefinitionId implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeGroupId.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeGroupId.php
@@ -16,6 +16,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContentTypeGroupId>
+ */
 final class ContentTypeGroupId implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeId.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeId.php
@@ -16,6 +16,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContentTypeId>
+ */
 final class ContentTypeId implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeIdentifier.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/ContentTypeIdentifier.php
@@ -16,6 +16,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContentTypeIdentifier>
+ */
 final class ContentTypeIdentifier implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/IsSystem.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/IsSystem.php
@@ -15,6 +15,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\IsSystem>
+ */
 final class IsSystem implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/LogicalAnd.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/LogicalAnd.php
@@ -15,6 +15,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\LogicalAnd>
+ */
 final class LogicalAnd implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/LogicalNot.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/LogicalNot.php
@@ -14,6 +14,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\LogicalNot>
+ */
 final class LogicalNot implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool
diff --git a/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/LogicalOr.php b/src/lib/Persistence/Legacy/Content/Type/Gateway/CriterionHandler/LogicalOr.php
@@ -15,6 +15,9 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;
 use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;
 
+/**
+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\LogicalOr>
+ */
 final class LogicalOr implements CriterionHandlerInterface
 {
     public function supports(CriterionInterface $criterion): bool

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;`
`17`	`17`	`use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;`
`18`	`18`
	`19`	`+/**`
	`20`	`+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\ContainsFieldDefinitionId>`
	`21`	`+ */`
`19`	`22`	`final class ContainsFieldDefinitionId implements CriterionHandlerInterface`
`20`	`23`	`{`
`21`	`24`	`public function supports(CriterionInterface $criterion): bool`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;`
`16`	`16`	`use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;`
`17`	`17`
	`18`	`+/**`
	`19`	`+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\IsSystem>`
	`20`	`+ */`
`18`	`21`	`final class IsSystem implements CriterionHandlerInterface`
`19`	`22`	`{`
`20`	`23`	`public function supports(CriterionInterface $criterion): bool`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`use Ibexa\Contracts\Core\Repository\Values\ContentType\Query\CriterionInterface;`
`15`	`15`	`use Ibexa\Core\Persistence\Legacy\Content\Type\Gateway\CriterionVisitor\CriterionVisitor;`
`16`	`16`
	`17`	`+/**`
	`18`	`+ * @implements \Ibexa\Contracts\Core\Persistence\Content\Type\CriterionHandlerInterface<\Ibexa\Contracts\Core\Repository\Values\ContentType\Query\Criterion\LogicalNot>`
	`19`	`+ */`
`17`	`20`	`final class LogicalNot implements CriterionHandlerInterface`
`18`	`21`	`{`
`19`	`22`	`public function supports(CriterionInterface $criterion): bool`