chore: cleanup typehints (#117)

* chore: cleanup typehints * fix
rekalogika · Jul 9, 2024 · c7b450f · c7b450f
1 parent 520af06
commit c7b450f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * feat: repository now accept `ManagerRegistry` instead of `EntityManagerInterface`
 * feat: default items per page
 * feat: different default count strategies for full & minimal classes
+* chore: cleanup typehints
 
 ## 0.8.0
 

diff --git a/packages/collections-domain/src/CriteriaPageable.php b/packages/collections-domain/src/CriteriaPageable.php
@@ -18,11 +18,9 @@
 use Doctrine\Common\Collections\Selectable;
 use Rekalogika\Contracts\Collections\Exception\UnexpectedValueException;
 use Rekalogika\Contracts\Collections\PageableRecollection;
-use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Domain\Collections\Common\Configuration;
 use Rekalogika\Domain\Collections\Common\Count\CountStrategy;
 use Rekalogika\Domain\Collections\Common\Internal\ParameterUtil;
-use Rekalogika\Domain\Collections\Common\KeyTransformer\KeyTransformer;
 use Rekalogika\Domain\Collections\Common\Trait\PageableTrait;
 use Rekalogika\Domain\Collections\Common\Trait\RefreshCountTrait;
 use Rekalogika\Domain\Collections\Trait\RecollectionPageableTrait;
@@ -107,8 +105,7 @@ final public static function create(
         ?string $indexBy = null,
         int $itemsPerPage = 50,
         ?CountStrategy $count = null,
-        ?KeyTransformer $keyTransformer = null,
-    ): PageableInterface {
+    ): static {
         if (self::$instances === null) {
             /** @var \WeakMap<object,array<string,self<array-key,mixed>>> */
             $weakmap = new \WeakMap();

diff --git a/packages/collections-domain/src/MinimalRecollectionDecorator.php b/packages/collections-domain/src/MinimalRecollectionDecorator.php
@@ -19,7 +19,7 @@
 use Doctrine\Common\Collections\Selectable;
 use Rekalogika\Contracts\Collections\Exception\UnexpectedValueException;
 use Rekalogika\Contracts\Collections\MinimalRecollection;
-use Rekalogika\Contracts\Rekapager\PageableInterface;
+use Rekalogika\Contracts\Collections\PageableRecollection;
 use Rekalogika\Domain\Collections\Common\Configuration;
 use Rekalogika\Domain\Collections\Common\Count\CountStrategy;
 use Rekalogika\Domain\Collections\Common\Internal\ParameterUtil;
@@ -203,7 +203,7 @@ private function getUnderlyingCountable(): \Countable
     /**
      * @return MinimalCriteriaRecollection<TKey,T>
      */
-    final protected function createCriteriaCollection(
+    final protected function createCriteriaRecollection(
         Criteria $criteria,
         ?string $instanceId = null,
         ?CountStrategy $count = null,
@@ -223,19 +223,22 @@ final protected function createCriteriaCollection(
     }
 
     /**
-     * @return PageableInterface<TKey,T>
+     * @return PageableRecollection<TKey,T>
      */
     final protected function createCriteriaPageable(
         Criteria $criteria,
         ?string $instanceId = null,
         ?CountStrategy $count = null,
-    ): PageableInterface {
+    ): PageableRecollection {
         // if $criteria has no orderings, add the current ordering
         if (\count($criteria->orderings()) === 0) {
             $criteria = $criteria->orderBy($this->orderBy);
         }
 
-        /** @var PageableInterface<TKey,T> */
+        /**
+         * @var PageableRecollection<TKey,T>
+         * @phpstan-ignore-next-line
+         */
         return CriteriaPageable::create(
             collection: $this->collection,
             criteria: $criteria,

diff --git a/packages/collections-domain/src/Trait/RecollectionDxTrait.php b/packages/collections-domain/src/Trait/RecollectionDxTrait.php
@@ -15,7 +15,7 @@
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Order;
-use Rekalogika\Contracts\Rekapager\PageableInterface;
+use Rekalogika\Contracts\Collections\PageableRecollection;
 use Rekalogika\Domain\Collections\Common\Count\CountStrategy;
 use Rekalogika\Domain\Collections\CriteriaPageable;
 use Rekalogika\Domain\Collections\CriteriaRecollection;
@@ -39,7 +39,7 @@ final protected function createCriteria(): Criteria
     /**
      * @return CriteriaRecollection<TKey,T>
      */
-    final protected function createCriteriaCollection(
+    final protected function createCriteriaRecollection(
         Criteria $criteria,
         ?string $instanceId = null,
         ?CountStrategy $count = null,
@@ -61,19 +61,18 @@ final protected function createCriteriaCollection(
     }
 
     /**
-     * @return PageableInterface<TKey,T>
+     * @return PageableRecollection<TKey,T>
      */
     final protected function createCriteriaPageable(
         Criteria $criteria,
         ?string $instanceId = null,
         ?CountStrategy $count = null,
-    ): PageableInterface {
+    ): PageableRecollection {
         // if $criteria has no orderings, add the current ordering
         if (\count($criteria->orderings()) === 0) {
             $criteria = $criteria->orderBy($this->getOrderBy());
         }
 
-        /** @var PageableInterface<TKey,T> */
         return CriteriaPageable::create(
             collection: $this->collection,
             criteria: $criteria,

diff --git a/packages/collections-orm/src/QueryPageable.php b/packages/collections-orm/src/QueryPageable.php
@@ -16,7 +16,6 @@
 use Doctrine\ORM\QueryBuilder;
 use Rekalogika\Collections\ORM\Trait\QueryBuilderPageableTrait;
 use Rekalogika\Contracts\Collections\PageableRecollection;
-use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Domain\Collections\Common\Configuration;
 use Rekalogika\Domain\Collections\Common\Count\CountStrategy;
 use Rekalogika\Domain\Collections\Common\Internal\ParameterUtil;
@@ -78,7 +77,7 @@ final protected function getQueryBuilder(): QueryBuilder
     /**
      * @return self<TKey,T>
      */
-    final protected function createQueryCollection(
+    final protected function createQueryRecollection(
         QueryBuilder $queryBuilder,
         ?string $indexBy = null,
         ?CountStrategy $count = null,
@@ -96,15 +95,15 @@ final protected function createQueryCollection(
     }
 
     /**
-     * @return PageableInterface<TKey,T>
+     * @return PageableRecollection<TKey,T>
      */
     final protected function createQueryPageable(
         QueryBuilder $queryBuilder,
         ?string $indexBy = null,
         ?CountStrategy $count = null,
-    ): PageableInterface {
+    ): PageableRecollection {
         /**
-         * @var PageableInterface<TKey,T>
+         * @var PageableRecollection<TKey,T>
          * @phpstan-ignore-next-line
          */
         return new QueryPageable(

diff --git a/packages/collections-orm/src/QueryRecollection.php b/packages/collections-orm/src/QueryRecollection.php
@@ -15,8 +15,8 @@
 
 use Doctrine\ORM\QueryBuilder;
 use Rekalogika\Collections\ORM\Trait\QueryBuilderPageableTrait;
+use Rekalogika\Contracts\Collections\PageableRecollection;
 use Rekalogika\Contracts\Collections\ReadableRecollection;
-use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Domain\Collections\Common\Configuration;
 use Rekalogika\Domain\Collections\Common\Count\CountStrategy;
 use Rekalogika\Domain\Collections\Common\Internal\ParameterUtil;
@@ -115,7 +115,7 @@ final protected function getQueryBuilder(): QueryBuilder
     /**
      * @return self<TKey,T>
      */
-    final protected function createQueryCollection(
+    final protected function createQueryRecollection(
         QueryBuilder $queryBuilder,
         ?string $indexBy = null,
         ?CountStrategy $count = null,
@@ -132,15 +132,15 @@ final protected function createQueryCollection(
     }
 
     /**
-     * @return PageableInterface<TKey,T>
+     * @return PageableRecollection<TKey,T>
      */
     final protected function createQueryPageable(
         QueryBuilder $queryBuilder,
         ?string $indexBy = null,
         ?CountStrategy $count = null,
-    ): PageableInterface {
+    ): PageableRecollection {
         /**
-         * @var PageableInterface<TKey,T>
+         * @var PageableRecollection<TKey,T>
          * @phpstan-ignore-next-line
          */
         return new QueryPageable(

diff --git a/packages/collections-orm/src/Trait/RepositoryDxTrait.php b/packages/collections-orm/src/Trait/RepositoryDxTrait.php
@@ -21,7 +21,7 @@
 use Rekalogika\Collections\ORM\QueryPageable;
 use Rekalogika\Collections\ORM\QueryRecollection;
 use Rekalogika\Contracts\Collections\Exception\InvalidArgumentException;
-use Rekalogika\Contracts\Rekapager\PageableInterface;
+use Rekalogika\Contracts\Collections\PageableRecollection;
 use Rekalogika\Domain\Collections\Common\Count\CountStrategy;
 use Rekalogika\Domain\Collections\CriteriaPageable;
 use Rekalogika\Domain\Collections\CriteriaRecollection;
@@ -101,14 +101,14 @@ final protected function createCriteriaRecollection(
     }
 
     /**
-     * @return PageableInterface<TKey,T>
+     * @return PageableRecollection<TKey,T>
      */
     final protected function createCriteriaPageable(
         Criteria $criteria,
         ?string $instanceId = null,
         ?string $indexBy = null,
         ?CountStrategy $count = null,
-    ): PageableInterface {
+    ): PageableRecollection {
         return CriteriaPageable::create(
             collection: $this->getDoctrineRepository(),
             criteria: $criteria,
@@ -139,15 +139,15 @@ final protected function createQueryRecollection(
     }
 
     /**
-     * @return PageableInterface<TKey,T>
+     * @return PageableRecollection<TKey,T>
      */
     final protected function createQueryPageable(
         QueryBuilder $queryBuilder,
         ?string $indexBy = null,
         ?CountStrategy $count = null,
-    ): PageableInterface {
+    ): PageableRecollection {
         /**
-         * @var PageableInterface<TKey,T>
+         * @var PageableRecollection<TKey,T>
          * @phpstan-ignore-next-line
          */
         return new QueryPageable(