Merge remote-tracking branch 'origin/4.6' into main

ibexa · Oct 14, 2024 · d0d195a · d0d195a
2 parents 1d91509 + af5f1f0
commit d0d195a
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 187 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,7 +1,6 @@
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-symfony/extension.neon
-    - phpstan-baseline.neon
 
 parameters:
     level: 8

diff --git a/src/contracts/Persistence/CriterionMapper/AbstractCompositeCriterionMapper.php b/src/contracts/Persistence/CriterionMapper/AbstractCompositeCriterionMapper.php
diff --git a/src/contracts/Persistence/CriterionMapper/AbstractFieldCriterionMapper.php b/src/contracts/Persistence/CriterionMapper/AbstractFieldCriterionMapper.php
diff --git a/src/contracts/Values/Query/Criterion/CriterionInterface.php b/src/contracts/Values/Query/Criterion/CriterionInterface.php
@@ -11,5 +11,3 @@
 interface CriterionInterface
 {
 }
-
-class_alias(CriterionInterface::class, \Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\CriterionInterface::class);
diff --git a/src/contracts/Values/Query/Criterion/FieldValueCriterion.php b/src/contracts/Values/Query/Criterion/FieldValueCriterion.php
@@ -83,5 +83,3 @@ public function getOperator(): string
         return $this->operator;
     }
 }
-
-class_alias(FieldValueCriterion::class, \Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\FieldValueCriterion::class);
diff --git a/src/contracts/Values/Query/CriterionMapper.php b/src/contracts/Values/Query/CriterionMapper.php
@@ -14,10 +14,8 @@
 
 /**
  * Converts Criterion instances into objects that underlying Handler can understand.
- *
- * @final
  */
-class CriterionMapper
+final class CriterionMapper
 {
     /**
      * @var iterable<\Ibexa\Contracts\CoreSearch\Values\Query\CriterionMapperInterface<

diff --git a/src/contracts/Values/Query/SortDirection.php b/src/contracts/Values/Query/SortDirection.php
@@ -8,10 +8,7 @@
 
 namespace Ibexa\Contracts\CoreSearch\Values\Query;
 
-/**
- * @final
- */
-class SortDirection
+final class SortDirection
 {
     public const ASC = 'ascending';
     public const DESC = 'descending';
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,3 @@ @@
     interface CriterionInterface
     {
     }
-    class_alias(CriterionInterface::class, \Ibexa\Contracts\ProductCatalog\Values\Common\Query\Criterion\CriterionInterface::class);