Refactoring: remove pagerfanta (#8)

composer.json

@@ -32,8 +32,7 @@
  "symfony/property-info": "^4.3",
  "doctrine/annotations": "^1.8",
  "ramsey/uuid": "^3.8",
- "webgriffe/amp-elasticsearch": "dev-master",
- "pagerfanta/pagerfanta": "^2.1"
+ "webgriffe/amp-elasticsearch": "dev-master"
  },
  "autoload": {
  "psr-4": {

src/Console/Controller/FlowController.php

@@ -7,8 +7,8 @@
 use Amp\Http\Server\Response;
 use Amp\Http\Status;
 use Amp\Promise;
-use Webgriffe\Esb\Console\AmpElasticsearchUriSearchAdapter;
-use Webgriffe\Esb\Console\AsyncPager;
+use Webgriffe\Esb\Console\Pager\AmpElasticsearchUriSearchAdapter;
+use Webgriffe\Esb\Console\Pager\AsyncPager;
 use function Amp\call;
 
 /**

src/Console/AmpElasticsearchUriSearchAdapter.php → src/Console/Pager/AmpElasticsearchUriSearchAdapter.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace Webgriffe\Esb\Console;
+namespace Webgriffe\Esb\Console\Pager;
 
 use Amp\Promise;
 use Amp\Success;
 use Webgriffe\AmpElasticsearch\Client;
+use Webgriffe\Esb\Console\Pager\AsyncPagerAdapterInterface;
 use function Amp\call;
 
-class AmpElasticsearchUriSearchAdapter implements AsyncPagerAdapterInterface
+final class AmpElasticsearchUriSearchAdapter implements AsyncPagerAdapterInterface
 {
  /**
  * @var Client

src/Console/AsyncPager.php → src/Console/Pager/AsyncPager.php

@@ -2,19 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Webgriffe\Esb\Console;
+namespace Webgriffe\Esb\Console\Pager;
 
 use Amp\Promise;
-use Pagerfanta\Exception\LessThan1CurrentPageException;
-use Pagerfanta\Exception\LessThan1MaxPerPageException;
-use Pagerfanta\Exception\LogicException;
-use Pagerfanta\Exception\NotBooleanException;
-use Pagerfanta\Exception\NotIntegerCurrentPageException;
-use Pagerfanta\Exception\NotIntegerException;
-use Pagerfanta\Exception\NotIntegerMaxPerPageException;
-use Pagerfanta\Exception\OutOfRangeCurrentPageException;
 use function Amp\call;
 
+/**
+ * @internal
+ */
 class AsyncPager
 {
  /**
@@ -296,7 +291,13 @@ private function normalizeOutOfRangeCurrentPage($currentPage)
  return $this->getNbPages();
  }
 
- throw new OutOfRangeCurrentPageException(sprintf('Page "%d" does not exist. The currentPage must be inferior to "%d"', $currentPage, $this->getNbPages()));
+ throw new OutOfRangeCurrentPageException(
+ sprintf(
+ 'Page "%d" does not exist. The currentPage must be inferior to "%d"',
+ $currentPage,
+ $this->getNbPages()
+ )
+ );
  }
 
  private function resetForCurrentPageChange()
@@ -428,12 +429,12 @@ public function hasPreviousPage()
  *
  * @return integer
  *
- * @throws LogicException If there is no previous page.
+ * @throws \LogicException If there is no previous page.
  */
  public function getPreviousPage()
  {
  if (!$this->hasPreviousPage()) {
- throw new LogicException('There is no previous page.');
+ throw new \LogicException('There is no previous page.');
  }
 
  return $this->currentPage - 1;
@@ -454,12 +455,12 @@ public function hasNextPage()
  *
  * @return integer
  *
- * @throws LogicException If there is no next page.
+ * @throws \LogicException If there is no next page.
  */
  public function getNextPage()
  {
  if (!$this->hasNextPage()) {
- throw new LogicException('There is no next page.');
+ throw new \LogicException('There is no next page.');
  }
 
  return $this->currentPage + 1;
@@ -538,7 +539,7 @@ public function getPageNumberForItemAtPosition($position)
  }
 
  if ($this->getNbResults() < $position) {
- throw new OutOfBoundsException(sprintf(
+ throw new \OutOfBoundsException(sprintf(
  'Item requested at position %d, but there are only %d items.',
  $position,
  $this->getNbResults()

src/Console/AsyncPagerAdapterInterface.php → src/Console/Pager/AsyncPagerAdapterInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Webgriffe\Esb\Console;
+namespace Webgriffe\Esb\Console\Pager;
 
 use Amp\Promise;
 

src/Console/Pager/LessThan1CurrentPageException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class LessThan1CurrentPageException extends NotValidCurrentPageException
+{
+}

src/Console/Pager/LessThan1MaxPerPageException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class LessThan1MaxPerPageException extends NotValidMaxPerPageException
+{
+}

src/Console/Pager/NotBooleanException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class NotBooleanException extends \InvalidArgumentException
+{
+}

src/Console/Pager/NotIntegerCurrentPageException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class NotIntegerCurrentPageException extends NotValidCurrentPageException
+{
+
+}

src/Console/Pager/NotIntegerException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class NotIntegerException extends \InvalidArgumentException
+{
+}

src/Console/Pager/NotIntegerMaxPerPageException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class NotIntegerMaxPerPageException extends NotValidMaxPerPageException
+{
+}

src/Console/Pager/NotValidCurrentPageException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+/**
+ * @internal
+ */
+class NotValidCurrentPageException extends \InvalidArgumentException
+{
+}

src/Console/Pager/NotValidMaxPerPageException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+/**
+ * @internal
+ */
+class NotValidMaxPerPageException extends \InvalidArgumentException
+{
+}

src/Console/Pager/OutOfRangeCurrentPageException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Webgriffe\Esb\Console\Pager;
+
+final class OutOfRangeCurrentPageException extends NotValidCurrentPageException
+{
+}