Adapted code to PHP8+ and removed unnecessary class aliases (#16)

Author: konradoboza

src/contracts/.gitkeep

@@ -59,5 +59,3 @@ private function getExpressions(iterable $criteria, CriterionMapper $mapper): ar
         return $expressions;
     }
 }
-
-class_alias(\Ibexa\Contracts\CoreSearch\Persistence\CriterionMapper\AbstractCompositeCriterionMapper::class, '\Ibexa\ProductCatalog\Local\Persistence\Legacy\Common\CriterionMapper\AbstractCompositeCriterionMapper');

src/contracts/Persistence/CriterionMapper/AbstractCompositeCriterionMapper.php

@@ -84,5 +84,3 @@ protected function getComparisonValue(FieldValueCriterion $criterion): mixed
         return $criterion->getValue();
     }
 }
-
-class_alias(\Ibexa\Contracts\CoreSearch\Persistence\CriterionMapper\AbstractFieldCriterionMapper::class, '\Ibexa\ProductCatalog\Local\Persistence\Legacy\Common\CriterionMapper\AbstractFieldCriterionMapper');

src/contracts/Persistence/CriterionMapper/AbstractFieldCriterionMapper.php

@@ -18,36 +18,26 @@ abstract class AbstractCriterionQuery
 {
     public const int DEFAULT_LIMIT = 25;
 
-    /** @phpstan-var TCriterion|null */
-    private ?CriterionInterface $query;
-
     /**
      * @var array<int, AbstractSortClause>
      *
      * @phpstan-var TSortClause[]
      */
     private array $sortClauses;
 
-    private ?int $limit;
-
-    private int $offset;
-
     /**
      * @param array<int, AbstractSortClause>|null $sortClauses
      *
      * @phpstan-param TSortClause[]|null $sortClauses
      * @phpstan-param TCriterion|null $query
      */
     public function __construct(
-        ?CriterionInterface $query = null,
+        private ?CriterionInterface $query = null,
         ?array $sortClauses = [],
-        ?int $limit = self::DEFAULT_LIMIT,
-        int $offset = 0
+        private ?int $limit = self::DEFAULT_LIMIT,
+        private int $offset = 0
     ) {
-        $this->query = $query;
         $this->sortClauses = $sortClauses ?? [];
-        $this->offset = $offset;
-        $this->limit = $limit;
     }
 
     /**

src/contracts/Values/Query/AbstractCriterionQuery.php

@@ -31,7 +31,7 @@ abstract class AbstractSortClause
      * @param string $sortDirection one of SortDirection::ASC or SortDirection::DESC
      */
     public function __construct(
-        string $sortDirection = self::SORT_ASC
+        readonly string $sortDirection = self::SORT_ASC
     ) {
         $this->setDirection($sortDirection);
     }

src/contracts/Values/Query/AbstractSortClause.php

@@ -35,19 +35,13 @@ class FieldValueCriterion implements CriterionInterface
     /** @final */
     public const string COMPARISON_ENDS_WITH = 'ENDS_WITH';
 
-    private string $field;
-
-    private mixed $value;
-
     private string $operator;
 
-    /**
-     * @param mixed $value
-     */
-    public function __construct(string $field, $value, ?string $operator = null)
-    {
-        $this->field = $field;
-        $this->value = $value;
+    public function __construct(
+        private readonly string $field,
+        private mixed $value,
+        ?string $operator = null
+    ) {
         $this->operator = $operator ?? (is_array($value) ? self::COMPARISON_IN : self::COMPARISON_EQ);
     }
 
@@ -76,5 +70,3 @@ public function getOperator(): string
         return $this->operator;
     }
 }
-
-class_alias(\Ibexa\Contracts\CoreSearch\Values\Query\Criterion\FieldValueCriterion::class, '\Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\FieldValueCriterion');

src/contracts/Values/Query/Criterion/FieldValueCriterion.php

@@ -11,5 +11,3 @@
 class LogicalAnd extends AbstractCompositeCriterion
 {
 }
-
-class_alias(\Ibexa\Contracts\CoreSearch\Values\Query\Criterion\LogicalAnd::class, '\Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\LogicalAnd');

src/contracts/Values/Query/Criterion/LogicalAnd.php

@@ -11,5 +11,3 @@
 class LogicalOr extends AbstractCompositeCriterion
 {
 }
-
-class_alias(\Ibexa\Contracts\CoreSearch\Values\Query\Criterion\LogicalOr::class, '\Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\LogicalOr');

src/contracts/Values/Query/Criterion/LogicalOr.php

@@ -14,26 +14,16 @@
 
 /**
  * Converts Criterion instances into objects that underlying Handler can understand.
- *
- * @final
  */
-class CriterionMapper
+final readonly class CriterionMapper
 {
-    /**
-     * @var iterable<\Ibexa\Contracts\CoreSearch\Values\Query\CriterionMapperInterface<
-     *     \Ibexa\Contracts\CoreSearch\Values\Query\Criterion\CriterionInterface,
-     * >>
-     */
-    private iterable $mappers;
-
     /**
      * @phpstan-param iterable<\Ibexa\Contracts\CoreSearch\Values\Query\CriterionMapperInterface<
      *     \Ibexa\Contracts\CoreSearch\Values\Query\Criterion\CriterionInterface,
      * >> $mappers
      */
-    public function __construct(iterable $mappers)
+    public function __construct(private iterable $mappers)
     {
-        $this->mappers = $mappers;
     }
 
     public function handle(CriterionInterface $criterion): Expression

src/contracts/Values/Query/CriterionMapper.php

@@ -12,13 +12,11 @@
 
 class FieldValueSortClause extends AbstractSortClause
 {
-    private string $field;
-
-    public function __construct(string $field, string $sortDirection = self::SORT_ASC)
-    {
+    public function __construct(
+        private readonly string $field,
+        string $sortDirection = self::SORT_ASC
+    ) {
         parent::__construct($sortDirection);
-
-        $this->field = $field;
     }
 
     public function getField(): string