Moved too concrete class from Common to Core

module/Core/src/Paginator/Adapter/ShortUrlRepositoryAdapter.php

@@ -0,0 +1,68 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Paginator\Adapter;
+
+use Shlinkio\Shlink\Core\Repository\ShortUrlRepositoryInterface;
+use Zend\Paginator\Adapter\AdapterInterface;
+
+use function strip_tags;
+use function trim;
+
+class ShortUrlRepositoryAdapter implements AdapterInterface
+{
+    public const ITEMS_PER_PAGE = 10;
+
+    /** @var ShortUrlRepositoryInterface */
+    private $repository;
+    /** @var null|string */
+    private $searchTerm;
+    /** @var null|array|string */
+    private $orderBy;
+    /** @var array */
+    private $tags;
+
+    public function __construct(
+        ShortUrlRepositoryInterface $repository,
+        $searchTerm = null,
+        array $tags = [],
+        $orderBy = null
+    ) {
+        $this->repository = $repository;
+        $this->searchTerm = $searchTerm !== null ? trim(strip_tags($searchTerm)) : null;
+        $this->orderBy = $orderBy;
+        $this->tags = $tags;
+    }
+
+    /**
+     * Returns a collection of items for a page.
+     *
+     * @param  int $offset Page offset
+     * @param  int $itemCountPerPage Number of items per page
+     * @return array
+     */
+    public function getItems($offset, $itemCountPerPage): array
+    {
+        return $this->repository->findList(
+            $itemCountPerPage,
+            $offset,
+            $this->searchTerm,
+            $this->tags,
+            $this->orderBy
+        );
+    }
+
+    /**
+     * Count elements of an object
+     * @link http://php.net/manual/en/countable.count.php
+     * @return int The custom count as an integer.
+     * </p>
+     * <p>
+     * The return value is cast to an integer.
+     * @since 5.1.0
+     */
+    public function count(): int
+    {
+        return $this->repository->countList($this->searchTerm, $this->tags);
+    }
+}

module/Core/src/Repository/ShortUrlRepositoryInterface.php

@@ -4,10 +4,27 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Repository;
 
 use Doctrine\Common\Persistence\ObjectRepository;
-use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 
-interface ShortUrlRepositoryInterface extends ObjectRepository, PaginableRepositoryInterface
+interface ShortUrlRepositoryInterface extends ObjectRepository
 {
+    /**
+     * Gets a list of elements using provided filtering data
+     *
+     * @param string|array|null $orderBy
+     */
+    public function findList(
+        ?int $limit = null,
+        ?int $offset = null,
+        ?string $searchTerm = null,
+        array $tags = [],
+        $orderBy = null
+    ): array;
+
+    /**
+     * Counts the number of elements in a list using provided filtering data
+     */
+    public function countList(?string $searchTerm = null, array $tags = []): int;
+
     public function findOneByShortCode(string $shortCode): ?ShortUrl;
 }

module/Core/src/Service/ShortUrlService.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Service;
 
 use Doctrine\ORM;
-use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
+use Shlinkio\Shlink\Core\Paginator\Adapter\ShortUrlRepositoryAdapter;
 use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
 use Shlinkio\Shlink\Core\Service\ShortUrl\FindShortCodeTrait;
 use Shlinkio\Shlink\Core\Util\TagManagerTrait;
@@ -35,8 +35,8 @@ class ShortUrlService implements ShortUrlServiceInterface
     {
         /** @var ShortUrlRepository $repo */
         $repo = $this->em->getRepository(ShortUrl::class);
-        $paginator = new Paginator(new PaginableRepositoryAdapter($repo, $searchQuery, $tags, $orderBy));
-        $paginator->setItemCountPerPage(PaginableRepositoryAdapter::ITEMS_PER_PAGE)
+        $paginator = new Paginator(new ShortUrlRepositoryAdapter($repo, $searchQuery, $tags, $orderBy));
+        $paginator->setItemCountPerPage(ShortUrlRepositoryAdapter::ITEMS_PER_PAGE)
                   ->setCurrentPageNumber($page);
 
         return $paginator;