chore: remove unneeded intermediate interfaces (#72)

rekalogika · Jun 10, 2024 · 56468d2 · 56468d2
1 parent 38220d2
commit 56468d2
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.10.1
+
+* chore: remove unneeded intermediate interfaces
+
 # 0.10.0
 
 * chore: remove TIdentifier template as it feels superfluous in userland

diff --git a/packages/rekapager-keyset-pagination/src/Contracts/KeysetPageInterface.php b/packages/rekapager-keyset-pagination/src/Contracts/KeysetPageInterface.php
diff --git a/packages/rekapager-keyset-pagination/src/Contracts/KeysetPageableInterface.php b/packages/rekapager-keyset-pagination/src/Contracts/KeysetPageableInterface.php
diff --git a/packages/rekapager-keyset-pagination/src/Internal/KeysetPage.php b/packages/rekapager-keyset-pagination/src/Internal/KeysetPage.php
@@ -19,7 +19,6 @@
 use Rekalogika\Rekapager\Keyset\Contracts\BoundaryType;
 use Rekalogika\Rekapager\Keyset\Contracts\KeysetItemInterface;
 use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageIdentifier;
-use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageInterface;
 use Rekalogika\Rekapager\Keyset\KeysetPageable;
 use Rekalogika\Rekapager\Keyset\KeysetPaginationAdapterInterface;
 
@@ -28,12 +27,12 @@
  *
  * @template TKey of array-key
  * @template T
- * @implements KeysetPageInterface<TKey,T>
+ * @implements PageInterface<TKey,T>
  * @implements \IteratorAggregate<TKey,T>
  *
  * @internal
  */
-final class KeysetPage implements KeysetPageInterface, \IteratorAggregate
+final class KeysetPage implements PageInterface, \IteratorAggregate
 {
     /**
      * @var null|array<int,KeysetItemInterface<TKey,T>>

diff --git a/packages/rekapager-keyset-pagination/src/KeysetPageable.php b/packages/rekapager-keyset-pagination/src/KeysetPageable.php
@@ -14,20 +14,19 @@
 namespace Rekalogika\Rekapager\Keyset;
 
 use Rekalogika\Contracts\Rekapager\Exception\InvalidArgumentException;
+use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Contracts\Rekapager\PageInterface;
 use Rekalogika\Contracts\Rekapager\Trait\TotalPagesTrait;
 use Rekalogika\Rekapager\Keyset\Contracts\BoundaryType;
-use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageableInterface;
 use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageIdentifier;
-use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageInterface;
 use Rekalogika\Rekapager\Keyset\Internal\KeysetPage;
 
 /**
  * @template TKey of array-key
  * @template T
- * @implements KeysetPageableInterface<TKey,T>
+ * @implements PageableInterface<TKey,T>
  */
-final class KeysetPageable implements KeysetPageableInterface
+final class KeysetPageable implements PageableInterface
 {
     use TotalPagesTrait;
 
@@ -77,9 +76,9 @@ public function getPages(): \Traversable
     }
 
     /**
-     * @return KeysetPageInterface<TKey,T>
+     * @return PageInterface<TKey,T>
      */
-    public function getFirstPage(): KeysetPageInterface
+    public function getFirstPage(): PageInterface
     {
         $pageIdentifier = new KeysetPageIdentifier(
             pageNumber: 1,
@@ -98,9 +97,9 @@ public function getFirstPage(): KeysetPageInterface
     }
 
     /**
-     * @return KeysetPageInterface<TKey,T>
+     * @return PageInterface<TKey,T>
      */
-    public function getLastPage(): KeysetPageInterface
+    public function getLastPage(): PageInterface
     {
         $totalPages = $this->getTotalPages();
 

diff --git a/packages/rekapager-offset-pagination/src/Contracts/OffsetPageInterface.php b/packages/rekapager-offset-pagination/src/Contracts/OffsetPageInterface.php
diff --git a/packages/rekapager-offset-pagination/src/Contracts/OffsetPageableInterface.php b/packages/rekapager-offset-pagination/src/Contracts/OffsetPageableInterface.php
diff --git a/packages/rekapager-offset-pagination/src/Internal/OffsetPage.php b/packages/rekapager-offset-pagination/src/Internal/OffsetPage.php
@@ -17,20 +17,19 @@
 use Rekalogika\Contracts\Rekapager\Exception\OutOfBoundsException;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Contracts\Rekapager\PageInterface;
-use Rekalogika\Rekapager\Offset\Contracts\OffsetPageInterface;
 use Rekalogika\Rekapager\Offset\Contracts\PageNumber;
 use Rekalogika\Rekapager\Offset\OffsetPageable;
 use Rekalogika\Rekapager\Offset\OffsetPaginationAdapterInterface;
 
 /**
  * @template TKey of array-key
  * @template T
- * @implements OffsetPageInterface<TKey,T>
+ * @implements PageInterface<TKey,T>
  * @implements \IteratorAggregate<TKey,T>
  *
  * @internal
  */
-final class OffsetPage implements OffsetPageInterface, \IteratorAggregate
+final class OffsetPage implements PageInterface, \IteratorAggregate
 {
     /**
      * @var null|array<TKey,T>

diff --git a/packages/rekapager-offset-pagination/src/OffsetPageable.php b/packages/rekapager-offset-pagination/src/OffsetPageable.php
@@ -14,19 +14,19 @@
 namespace Rekalogika\Rekapager\Offset;
 
 use Rekalogika\Contracts\Rekapager\Exception\InvalidArgumentException;
+use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Contracts\Rekapager\PageInterface;
 use Rekalogika\Contracts\Rekapager\Trait\TotalPagesTrait;
-use Rekalogika\Rekapager\Offset\Contracts\OffsetPageableInterface;
 use Rekalogika\Rekapager\Offset\Contracts\PageNumber;
 use Rekalogika\Rekapager\Offset\Internal\NullOffsetPage;
 use Rekalogika\Rekapager\Offset\Internal\OffsetPage;
 
 /**
  * @template TKey of array-key
  * @template T
- * @implements OffsetPageableInterface<TKey,T>
+ * @implements PageableInterface<TKey,T>
  */
-final class OffsetPageable implements OffsetPageableInterface
+final class OffsetPageable implements PageableInterface
 {
     use TotalPagesTrait;
 

diff --git a/packages/rekapager-pagerfanta-adapter/src/PagerfantaPageable.php b/packages/rekapager-pagerfanta-adapter/src/PagerfantaPageable.php
@@ -14,15 +14,15 @@
 namespace Rekalogika\Rekapager\Pagerfanta;
 
 use Pagerfanta\PagerfantaInterface;
+use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Contracts\Rekapager\PageInterface;
-use Rekalogika\Rekapager\Offset\Contracts\OffsetPageableInterface;
 use Rekalogika\Rekapager\Offset\OffsetPageable;
 
 /**
  * @template T
- * @implements OffsetPageableInterface<array-key,T>
+ * @implements PageableInterface<array-key,T>
  */
-final class PagerfantaPageable implements OffsetPageableInterface
+final class PagerfantaPageable implements PageableInterface
 {
     /**
      * @var OffsetPageable<array-key,T>

diff --git a/tests/src/App/PageableGenerator/KeysetPageableQueryBuilderAdapterQueryBuilder.php b/tests/src/App/PageableGenerator/KeysetPageableQueryBuilderAdapterQueryBuilder.php
@@ -16,7 +16,6 @@
 use Doctrine\DBAL\Types\Types;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Rekapager\Doctrine\ORM\QueryBuilderAdapter;
-use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageIdentifier;
 use Rekalogika\Rekapager\Keyset\KeysetPageable;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;
 use Rekalogika\Rekapager\Tests\App\Entity\Post;

diff --git a/tests/src/App/PageableGenerator/KeysetPageableSelectableAdapterCollection.php b/tests/src/App/PageableGenerator/KeysetPageableSelectableAdapterCollection.php
@@ -17,7 +17,6 @@
 use Doctrine\Common\Collections\Order;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Rekapager\Doctrine\Collections\SelectableAdapter;
-use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageIdentifier;
 use Rekalogika\Rekapager\Keyset\KeysetPageable;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;
 use Rekalogika\Rekapager\Tests\App\Entity\Post;

diff --git a/tests/src/App/PageableGenerator/KeysetPageableSelectableAdapterEntityRepository.php b/tests/src/App/PageableGenerator/KeysetPageableSelectableAdapterEntityRepository.php
@@ -17,7 +17,6 @@
 use Doctrine\Common\Collections\Order;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Rekapager\Doctrine\Collections\SelectableAdapter;
-use Rekalogika\Rekapager\Keyset\Contracts\KeysetPageIdentifier;
 use Rekalogika\Rekapager\Keyset\KeysetPageable;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;
 use Rekalogika\Rekapager\Tests\App\Entity\Post;

diff --git a/tests/src/App/PageableGenerator/OffsetPageableCollectionAdapterCollection.php b/tests/src/App/PageableGenerator/OffsetPageableCollectionAdapterCollection.php
@@ -17,7 +17,6 @@
 use Rekalogika\Collections\Decorator\LazyMatching\LazyMatchingCollection;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Rekapager\Doctrine\Collections\CollectionAdapter;
-use Rekalogika\Rekapager\Offset\Contracts\PageNumber;
 use Rekalogika\Rekapager\Offset\OffsetPageable;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;
 use Rekalogika\Rekapager\Tests\App\Entity\Post;

diff --git a/tests/src/App/PageableGenerator/OffsetPageablePagerfantaAdapterAdapter.php b/tests/src/App/PageableGenerator/OffsetPageablePagerfantaAdapterAdapter.php
@@ -16,7 +16,6 @@
 use Doctrine\Common\Collections\Criteria;
 use Pagerfanta\Doctrine\Collections\SelectableAdapter;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
-use Rekalogika\Rekapager\Offset\Contracts\PageNumber;
 use Rekalogika\Rekapager\Offset\OffsetPageable;
 use Rekalogika\Rekapager\Pagerfanta\PagerfantaAdapterAdapter;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;

diff --git a/tests/src/App/PageableGenerator/OffsetPageableSelectableAdapterCollection.php b/tests/src/App/PageableGenerator/OffsetPageableSelectableAdapterCollection.php
@@ -17,7 +17,6 @@
 use Doctrine\Common\Collections\Order;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
 use Rekalogika\Rekapager\Doctrine\Collections\SelectableAdapter;
-use Rekalogika\Rekapager\Offset\Contracts\PageNumber;
 use Rekalogika\Rekapager\Offset\OffsetPageable;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;
 use Rekalogika\Rekapager\Tests\App\Entity\Post;

diff --git a/...ageableGenerator/PagerfantaPageable_Pagerfanta_PagerfantaSelectableAdapter_Collection.php b/...ageableGenerator/PagerfantaPageable_Pagerfanta_PagerfantaSelectableAdapter_Collection.php
@@ -17,7 +17,6 @@
 use Pagerfanta\Doctrine\Collections\SelectableAdapter;
 use Pagerfanta\Pagerfanta;
 use Rekalogika\Contracts\Rekapager\PageableInterface;
-use Rekalogika\Rekapager\Offset\Contracts\PageNumber;
 use Rekalogika\Rekapager\Pagerfanta\PagerfantaPageable;
 use Rekalogika\Rekapager\Tests\App\Contracts\PageableGeneratorInterface;
 use Rekalogika\Rekapager\Tests\App\Entity\Post;