From 9ea57391cb62691a5e9920b1c2568fe72d87b234 Mon Sep 17 00:00:00 2001
From: Wolfy-J <wolfy.jd@gmail.com>
Date: Sat, 4 Feb 2017 15:03:26 +0300
Subject: [PATCH] pagination split

---
 .gitignore                                    |   2 +-
 composer.json                                 |   3 +-
 .../Spiral/Pagination/CountingInterface.php   |  24 --
 .../Exceptions/PaginationException.php        |  16 --
 source/Spiral/Pagination/PagedInterface.php   |  84 -------
 source/Spiral/Pagination/Paginator.php        | 205 ------------------
 .../Pagination/PaginatorAwareInterface.php    |  46 ----
 .../Spiral/Pagination/PaginatorInterface.php  |  29 ---
 .../Spiral/Pagination/PaginatorsInterface.php |  26 ---
 .../Spiral/Pagination/Traits/LimitsTrait.php  |  71 ------
 .../Pagination/Traits/PaginatorTrait.php      | 135 ------------
 tests/Pagination/PaginatorTest.php            | 181 ----------------
 tests/Pagination/Traits/LimitsTraitTest.php   |  48 ----
 .../Pagination/Traits/PaginatorTraitTest.php  |  98 ---------
 14 files changed, 3 insertions(+), 965 deletions(-)
 delete mode 100644 source/Spiral/Pagination/CountingInterface.php
 delete mode 100644 source/Spiral/Pagination/Exceptions/PaginationException.php
 delete mode 100644 source/Spiral/Pagination/PagedInterface.php
 delete mode 100644 source/Spiral/Pagination/Paginator.php
 delete mode 100644 source/Spiral/Pagination/PaginatorAwareInterface.php
 delete mode 100644 source/Spiral/Pagination/PaginatorInterface.php
 delete mode 100644 source/Spiral/Pagination/PaginatorsInterface.php
 delete mode 100644 source/Spiral/Pagination/Traits/LimitsTrait.php
 delete mode 100644 source/Spiral/Pagination/Traits/PaginatorTrait.php
 delete mode 100644 tests/Pagination/PaginatorTest.php
 delete mode 100644 tests/Pagination/Traits/LimitsTraitTest.php
 delete mode 100644 tests/Pagination/Traits/PaginatorTraitTest.php

diff --git a/.gitignore b/.gitignore
index cb6d323c..7182f88b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ build/logs/*
 build/
 *.db
 clover.xml
-coveralls.json
\ No newline at end of file
+clover.json
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 3bf4f812..42a21f26 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
   ],
   "require": {
     "php": ">=7.0",
-    "spiral/common": "^0.9"
+    "spiral/common": "^0.9",
+    "spiral/pagination": "~1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~5.0",
diff --git a/source/Spiral/Pagination/CountingInterface.php b/source/Spiral/Pagination/CountingInterface.php
deleted file mode 100644
index 1df6f9a8..00000000
--- a/source/Spiral/Pagination/CountingInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination;
-
-/**
- * Paginator with dependency on count of items.
- */
-interface CountingInterface extends PaginatorInterface
-{
-    /**
-     * Get instance of paginator with a given count. Must not affect existed paginator.
-     *
-     * @param int $count
-     *
-     * @return self|$this
-     */
-    public function withCount(int $count): self;
-}
\ No newline at end of file
diff --git a/source/Spiral/Pagination/Exceptions/PaginationException.php b/source/Spiral/Pagination/Exceptions/PaginationException.php
deleted file mode 100644
index 4a415a57..00000000
--- a/source/Spiral/Pagination/Exceptions/PaginationException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination\Exceptions;
-
-/**
- * Generic pagination error.
- */
-class PaginationException extends \RuntimeException
-{
-}
diff --git a/source/Spiral/Pagination/PagedInterface.php b/source/Spiral/Pagination/PagedInterface.php
deleted file mode 100644
index 56c0b1bf..00000000
--- a/source/Spiral/Pagination/PagedInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination;
-
-/**
- * Paginator with predictable length (count).
- */
-interface PagedInterface extends CountingInterface
-{
-    /**
-     * Set pagination limit. Immutable.
-     *
-     * @param int $limit
-     *
-     * @return PagedInterface|$this
-     */
-    public function withLimit(int $limit): self;
-
-    /**
-     * Get pagination limit.
-     *
-     * @return int
-     */
-    public function getLimit(): int;
-
-    /**
-     * Set page number.
-     *
-     * @param int $number
-     *
-     * @return PagedInterface|$this
-     */
-    public function withPage(int $number): self;
-
-    /**
-     * Get current page number.
-     *
-     * @return int
-     */
-    public function getPage(): int;
-
-    /**
-     * The count of pages required to represent all records using a specified limit value.
-     *
-     * @return int
-     */
-    public function countPages(): int;
-
-    /**
-     * The count or records displayed on current page can vary from 0 to any limit value. Only the
-     * last page can have less records than is specified in the limit.
-     *
-     * @return int
-     */
-    public function countDisplayed(): int;
-
-    /**
-     * Does paginator needed to be applied? Should return false if all records can be shown on one
-     * page.
-     *
-     * @return bool
-     */
-    public function isRequired(): bool;
-
-    /**
-     * Next page number. Should return will be false if the current page is the last page.
-     *
-     * @return null|int
-     */
-    public function nextPage();
-
-    /**
-     * Previous page number. Should return false if the current page is first page.
-     *
-     * @return null|int
-     */
-    public function previousPage();
-}
diff --git a/source/Spiral/Pagination/Paginator.php b/source/Spiral/Pagination/Paginator.php
deleted file mode 100644
index c1d719f4..00000000
--- a/source/Spiral/Pagination/Paginator.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination;
-
-/**
- * Simple predictable paginator.
- */
-class Paginator implements PagedInterface, \Countable
-{
-    /**
-     * @var int
-     */
-    private $pageNumber = 1;
-
-    /**
-     * @var int
-     */
-    private $countPages = 1;
-
-    /**
-     * Pagination limit.
-     *
-     * @var int
-     */
-    private $limit = 25;
-
-    /**
-     * @var int
-     */
-    private $count = 0;
-
-    /**
-     * @param int $limit
-     * @param int $count
-     */
-    public function __construct(int $limit = 25, int $count = 0)
-    {
-        $this->limit = $limit;
-        $this->count = $count;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public function withLimit(int $limit): PagedInterface
-    {
-        $paginator = clone $this;
-        $paginator->limit = $limit;
-
-        return $paginator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLimit(): int
-    {
-        return $this->limit;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withPage(int $number): PagedInterface
-    {
-        $paginator = clone $this;
-        $paginator->pageNumber = max($number, 0);
-
-        //Real page number
-        return $paginator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPage(): int
-    {
-        if ($this->pageNumber < 1) {
-            return 1;
-        }
-
-        if ($this->pageNumber > $this->countPages) {
-            return $this->countPages;
-        }
-
-        return $this->pageNumber;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getOffset(): int
-    {
-        return ($this->getPage() - 1) * $this->limit;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public function withCount(int $count): CountingInterface
-    {
-        $paginator = clone $this;
-
-        return $paginator->setCount($count);
-    }
-
-    /**
-     * Alias for count.
-     *
-     * @return int
-     */
-    public function getCount(): int
-    {
-        return $this->count;
-    }
-
-    /**
-     * @return int
-     */
-    public function count()
-    {
-        return $this->count;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function countPages(): int
-    {
-        return $this->countPages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function countDisplayed(): int
-    {
-        if ($this->getPage() == $this->countPages) {
-            return $this->count - $this->getOffset();
-        }
-
-        return $this->limit;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isRequired(): bool
-    {
-        return ($this->countPages > 1);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function nextPage()
-    {
-        if ($this->getPage() != $this->countPages) {
-            return $this->getPage() + 1;
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function previousPage()
-    {
-        if ($this->getPage() > 1) {
-            return $this->getPage() - 1;
-        }
-
-        return null;
-    }
-
-    /**
-     * Non-Immutable version of withCount.
-     *
-     * @param int $count
-     *
-     * @return self|$this
-     */
-    private function setCount(int $count): self
-    {
-        $this->count = max($count, 0);
-        if ($this->count > 0) {
-            $this->countPages = (int)ceil($this->count / $this->limit);
-        } else {
-            $this->countPages = 1;
-        }
-
-        return $this;
-    }
-}
\ No newline at end of file
diff --git a/source/Spiral/Pagination/PaginatorAwareInterface.php b/source/Spiral/Pagination/PaginatorAwareInterface.php
deleted file mode 100644
index 51bc462a..00000000
--- a/source/Spiral/Pagination/PaginatorAwareInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination;
-
-use Spiral\Pagination\Exceptions\PaginationException;
-
-/**
- * Provides ability to associate paginator and execute pagination when needed.
- */
-interface PaginatorAwareInterface
-{
-    /**
-     * Indication that object has associated paginator.
-     *
-     * @return bool
-     */
-    public function hasPaginator(): bool;
-
-    /**
-     * Manually set paginator instance for specific object.
-     *
-     * @param PaginatorInterface $paginator
-     */
-    public function setPaginator(PaginatorInterface $paginator);
-
-    /**
-     * Get paginator for the current selection. Paginate method should be already called or
-     * paginator must be previously set.
-     *
-     * Potentially to be renamed to getPaginator method since this method does not create paginator
-     * automatically.
-     *
-     * @see paginate()
-     *
-     * @return PaginatorInterface
-     *
-     * @throws PaginationException
-     */
-    public function getPaginator(): PaginatorInterface;
-}
\ No newline at end of file
diff --git a/source/Spiral/Pagination/PaginatorInterface.php b/source/Spiral/Pagination/PaginatorInterface.php
deleted file mode 100644
index 2f31b411..00000000
--- a/source/Spiral/Pagination/PaginatorInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination;
-
-/**
- * Generic paginator interface with ability to set/get page and limit values.
- */
-interface PaginatorInterface
-{
-    /**
-     * Get pagination limit value.
-     *
-     * @return int
-     */
-    public function getLimit(): int;
-
-    /**
-     * Get calculated offset value.
-     *
-     * @return int
-     */
-    public function getOffset(): int;
-}
\ No newline at end of file
diff --git a/source/Spiral/Pagination/PaginatorsInterface.php b/source/Spiral/Pagination/PaginatorsInterface.php
deleted file mode 100644
index 43d2aa53..00000000
--- a/source/Spiral/Pagination/PaginatorsInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination;
-
-/**
- * Responsible for paginator creation based on a given pagination parameter (parameter in this case
- * is an abstract definition which might depend on specific implementation if needed).
- */
-interface PaginatorsInterface
-{
-    /**
-     * Create paginator for a given parameter, scope request must be resolved automatically.
-     *
-     * @param string $parameter
-     * @param int    $limit Pagination limit
-     *
-     * @return PaginatorInterface
-     */
-    public function createPaginator(string $parameter, int $limit = 25): PaginatorInterface;
-}
\ No newline at end of file
diff --git a/source/Spiral/Pagination/Traits/LimitsTrait.php b/source/Spiral/Pagination/Traits/LimitsTrait.php
deleted file mode 100644
index 950cf13e..00000000
--- a/source/Spiral/Pagination/Traits/LimitsTrait.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination\Traits;
-
-/**
- * Common functionality with ability to limit selection and specify offsets.
- */
-trait LimitsTrait
-{
-    /**
-     * @var int
-     */
-    private $limit = 0;
-
-    /**
-     * @var int
-     */
-    private $offset = 0;
-
-    /**
-     * Set selection limit. Attention, this limit value does not affect values set in paginator but
-     * only changes pagination window. Set to 0 to disable limiting.
-     *
-     * @param int $limit
-     *
-     * @return $this
-     */
-    public function limit(int $limit = 0)
-    {
-        $this->limit = $limit;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLimit(): int
-    {
-        return $this->limit;
-    }
-
-    /**
-     * Set selection offset. Attention, this value does not affect associated paginator but only
-     * changes pagination window.
-     *
-     * @param int $offset
-     *
-     * @return mixed
-     */
-    public function offset(int $offset = 0)
-    {
-        $this->offset = $offset;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOffset(): int
-    {
-        return $this->offset;
-    }
-}
\ No newline at end of file
diff --git a/source/Spiral/Pagination/Traits/PaginatorTrait.php b/source/Spiral/Pagination/Traits/PaginatorTrait.php
deleted file mode 100644
index 062c7db5..00000000
--- a/source/Spiral/Pagination/Traits/PaginatorTrait.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
-namespace Spiral\Pagination\Traits;
-
-use Interop\Container\ContainerInterface;
-use Spiral\Core\Exceptions\ScopeException;
-use Spiral\Pagination\CountingInterface;
-use Spiral\Pagination\Exceptions\PaginationException;
-use Spiral\Pagination\PaginatorInterface;
-use Spiral\Pagination\PaginatorsInterface;
-
-/**
- * Provides ability to paginate associated instance. Will work with default Paginator or fetch one
- * from container.
- *
- * Compatible with PaginatorAwareInterface.
- */
-trait PaginatorTrait
-{
-    /**
-     * @internal
-     *
-     * @var PaginatorInterface|null
-     */
-    private $paginator;
-
-    /**
-     * Indication that object was paginated.
-     *
-     * @return bool
-     */
-    public function hasPaginator(): bool
-    {
-        return $this->paginator instanceof PaginatorInterface;
-    }
-
-    /**
-     * Manually set paginator instance for specific object.
-     *
-     * @param PaginatorInterface $paginator
-     *
-     * @return $this
-     */
-    public function setPaginator(PaginatorInterface $paginator)
-    {
-        $this->paginator = $paginator;
-
-        return $this;
-    }
-
-    /**
-     * Get paginator for the current selection. Paginate method should be already called.
-     *
-     * @see hasPaginator()
-     * @see paginate()
-     *
-     * @return PaginatorInterface
-     */
-    public function getPaginator(): PaginatorInterface
-    {
-        if (!$this->hasPaginator()) {
-            throw new PaginationException("Unable to get paginator, no paginator were set");
-        }
-
-        return $this->paginator;
-    }
-
-    /**
-     * Paginate current selection using Paginator class.
-     *
-     * @param int    $limit     Pagination limit.
-     * @param string $parameter Name of parameter to associate paginator with, by default query
-     *                          parameter of active request to be used.
-     *
-     * @return $this
-     *
-     * @throws ScopeException
-     */
-    public function paginate(int $limit = 25, string $parameter = 'page')
-    {
-        //We are required to fetch paginator from associated container or shared container
-        $container = $this->iocContainer();
-
-        if (empty($container) || !$container->has(PaginatorsInterface::class)) {
-            throw new ScopeException(
-                'Unable to create paginator, PaginatorsInterface binding is missing or container not set'
-            );
-        }
-
-        /**
-         * @var PaginatorsInterface $factory
-         */
-        $factory = $container->get(PaginatorsInterface::class);
-
-        //Now we can create new instance of paginator using factory
-        $this->paginator = $factory->createPaginator($parameter, $limit);
-
-        return $this;
-    }
-
-    /**
-     * Get paginator instance configured for a given count. Must not affect already associated
-     * paginator instance.
-     *
-     * Attention: this method MUST be called from a child class in order to properly set paginator
-     * counts IF paginator support it.
-     *
-     * @param int|null $count Can be skipped.
-     *
-     * @return PaginatorInterface
-     */
-    protected function configurePaginator(int $count = null): PaginatorInterface
-    {
-        $paginator = $this->getPaginator();
-
-        if (!empty($count) && $paginator instanceof CountingInterface) {
-            $paginator = $paginator->withCount($count);
-        } else {
-            $paginator = clone $paginator;
-        }
-
-        return $paginator;
-    }
-
-    /**
-     * @return ContainerInterface
-     */
-    abstract protected function iocContainer();
-}
diff --git a/tests/Pagination/PaginatorTest.php b/tests/Pagination/PaginatorTest.php
deleted file mode 100644
index 9e629f7f..00000000
--- a/tests/Pagination/PaginatorTest.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-namespace Spiral\Tests\Pagination;
-
-use Mockery as m;
-use Spiral\Pagination\CountingInterface;
-use Spiral\Pagination\Paginator;
-use Spiral\Pagination\PaginatorInterface;
-use Spiral\Pagination\PagedInterface;
-
-class PaginatorTest extends \PHPUnit_Framework_TestCase
-{
-    public function testInterfaces()
-    {
-        $paginator = new Paginator(25);
-
-        $this->assertInstanceOf(PaginatorInterface::class, $paginator);
-        $this->assertInstanceOf(CountingInterface::class, $paginator);
-        $this->assertInstanceOf(PagedInterface::class, $paginator);
-    }
-
-    public function testLimit()
-    {
-        $paginator = new Paginator(25);
-
-        $this->assertSame(25, $paginator->getLimit());
-        $newPaginator = $paginator->withLimit(50);
-        $this->assertSame(25, $paginator->getLimit());
-        $this->assertSame(50, $newPaginator->getLimit());
-    }
-
-    public function testCountsAndPages()
-    {
-        $paginator = new Paginator(25);
-
-        $this->assertSame(0, $paginator->getCount());
-        $this->assertSame($paginator->count(), $paginator->getCount());
-        $this->assertSame($paginator->count(), count($paginator));
-
-        $this->assertSame(1, $paginator->getPage());
-        $this->assertSame(0, $paginator->getOffset());
-        $this->assertSame(1, $paginator->countPages());
-        $this->assertSame(0, $paginator->countDisplayed());
-    }
-
-    public function testFirstPage()
-    {
-        $paginator = new Paginator(25);
-        $paginator = $paginator->withCount(100);
-
-        $this->assertSame(1, $paginator->getPage());
-
-        $this->assertSame(null, $paginator->previousPage());
-        $this->assertSame(2, $paginator->nextPage());
-
-        $this->assertSame(100, $paginator->getCount());
-        $this->assertSame($paginator->count(), $paginator->getCount());
-        $this->assertSame($paginator->count(), count($paginator));
-
-        $this->assertSame(0, $paginator->getOffset());
-        $this->assertSame(4, $paginator->countPages());
-        $this->assertSame(25, $paginator->countDisplayed());
-    }
-
-
-    public function testSecondPage()
-    {
-        $paginator = new Paginator(25);
-        $paginator = $paginator->withCount(110);
-
-        $this->assertSame(110, $paginator->getCount());
-        $this->assertSame($paginator->count(), $paginator->getCount());
-        $this->assertSame($paginator->count(), count($paginator));
-
-        $this->assertSame(1, $paginator->getPage());
-
-        $paginator = $paginator->withPage(2);
-
-        $this->assertSame(1, $paginator->previousPage());
-        $this->assertSame(3, $paginator->nextPage());
-
-        $this->assertSame(2, $paginator->getPage());
-        $this->assertSame(25, $paginator->getOffset());
-        $this->assertSame(5, $paginator->countPages());
-        $this->assertSame(25, $paginator->countDisplayed());
-    }
-
-    public function testLastPage()
-    {
-        $paginator = new Paginator(25);
-        $paginator = $paginator->withCount(100);
-
-        $this->assertSame(1, $paginator->getPage());
-
-        $this->assertSame(null, $paginator->previousPage());
-        $this->assertSame(2, $paginator->nextPage());
-
-        $paginator = $paginator->withPage(100);
-
-        $this->assertSame(4, $paginator->getPage());
-        $this->assertSame(3, $paginator->previousPage());
-        $this->assertSame(null, $paginator->nextPage());
-
-        $this->assertSame(100, $paginator->getCount());
-        $this->assertSame($paginator->count(), $paginator->getCount());
-        $this->assertSame($paginator->count(), count($paginator));
-
-        $this->assertSame(75, $paginator->getOffset());
-        $this->assertSame(4, $paginator->countPages());
-        $this->assertSame(25, $paginator->countDisplayed());
-    }
-
-    public function testNegativePage()
-    {
-        $paginator = new Paginator(25);
-        $paginator = $paginator->withCount(100);
-        $paginator = $paginator->withPage(-1);
-
-        $this->assertSame(1, $paginator->getPage());
-
-        $this->assertSame(100, $paginator->getCount());
-        $this->assertSame($paginator->count(), $paginator->getCount());
-        $this->assertSame($paginator->count(), count($paginator));
-    }
-
-    public function testNegativeCount()
-    {
-        $paginator = new Paginator(25);
-        $paginator = $paginator->withCount(-100);
-
-        $paginator = $paginator->withPage(-10);
-        $this->assertSame(1, $paginator->getPage());
-
-        $this->assertSame(null, $paginator->previousPage());
-        $this->assertSame(null, $paginator->nextPage());
-
-        $this->assertSame(0, $paginator->getCount());
-        $this->assertSame(0, $paginator->getOffset());
-        $this->assertSame(1, $paginator->countPages());
-        $this->assertSame(0, $paginator->countDisplayed());
-    }
-
-    public function testLastPageNumber()
-    {
-        $paginator = new Paginator(25);
-        $paginator = $paginator->withCount(110);
-
-        $this->assertSame(110, $paginator->getCount());
-        $this->assertSame(1, $paginator->getPage());
-
-        $paginator = $paginator->withPage(100);
-
-        $this->assertSame($paginator->countPages(), $paginator->getPage());
-        $this->assertSame(
-            ($paginator->getPage() - 1) * $paginator->getLimit(),
-            $paginator->getOffset()
-        );
-
-        $this->assertSame(5, $paginator->countPages());
-        $this->assertSame(10, $paginator->countDisplayed());
-    }
-
-    public function testIsRequired()
-    {
-        $paginator = new Paginator(25);
-
-        $paginator = $paginator->withCount(24);
-        $this->assertFalse($paginator->isRequired());
-
-        $paginator = $paginator->withCount(25);
-        $this->assertFalse($paginator->isRequired());
-
-        $paginator = $paginator->withCount(26);
-        $this->assertTrue($paginator->isRequired());
-    }
-}
\ No newline at end of file
diff --git a/tests/Pagination/Traits/LimitsTraitTest.php b/tests/Pagination/Traits/LimitsTraitTest.php
deleted file mode 100644
index 53b54fc5..00000000
--- a/tests/Pagination/Traits/LimitsTraitTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Spiral, Core Components
- *
- * @author    Dmitry Mironov <dmitry.mironov@spiralscout.com>
- */
-
-namespace Spiral\Tests\Pagination\Traits;
-
-
-use Spiral\Pagination\Traits\LimitsTrait;
-
-/**
- * Class LimitTraitTest
- *
- * @package Spiral\Tests\Pagination\Traits
- */
-class LimitsTraitTest extends \PHPUnit_Framework_TestCase
-{
-    const DEFAULT_LIMIT  = 0;
-    const DEFAULT_OFFSET = 0;
-    const LIMIT          = 10;
-    const OFFSET         = 15;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|LimitsTrait
-     */
-    private $trait;
-
-    public function setUp()
-    {
-        $this->trait = $this->getMockForTrait(LimitsTrait::class);
-    }
-
-    public function testLimit()
-    {
-        $this->assertEquals(static::DEFAULT_LIMIT, $this->trait->getLimit());
-        $this->assertEquals($this->trait, $this->trait->limit(static::LIMIT));
-        $this->assertEquals(static::LIMIT, $this->trait->getLimit());
-    }
-
-    public function testOffset()
-    {
-        $this->assertEquals(static::DEFAULT_OFFSET, $this->trait->getOffset());
-        $this->assertEquals($this->trait, $this->trait->offset(static::OFFSET));
-        $this->assertEquals(static::OFFSET, $this->trait->getOffset());
-    }
-}
\ No newline at end of file
diff --git a/tests/Pagination/Traits/PaginatorTraitTest.php b/tests/Pagination/Traits/PaginatorTraitTest.php
deleted file mode 100644
index f5677358..00000000
--- a/tests/Pagination/Traits/PaginatorTraitTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Spiral, Core Components
- *
- * @author    Dmitry Mironov <dmitry.mironov@spiralscout.com>
- */
-
-namespace Spiral\Tests\Pagination\Traits;
-
-
-use Interop\Container\ContainerInterface;
-use Spiral\Core\Exceptions\ScopeException;
-use Spiral\Pagination\Exceptions\PaginationException;
-use Spiral\Pagination\Paginator;
-use Spiral\Pagination\PaginatorsInterface;
-use Spiral\Pagination\Traits\PaginatorTrait;
-
-/**
- * Class PaginatorTraitTest
- *
- * @package Spiral\Tests\Pagination\Traits
- */
-class PaginatorTraitTest extends \PHPUnit_Framework_TestCase
-{
-    const PAGINATOR_LIMIT     = 10;
-    const PAGINATOR_COUNT     = 15;
-    const PAGINATOR_PARAMETER = 'test';
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|PaginatorTrait
-     */
-    private $trait;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Paginator
-     */
-    private $paginator;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface
-     */
-    private $container;
-
-    public function setUp()
-    {
-        $this->trait = $this->getMockForTrait(PaginatorTrait::class);
-        $this->container = $this->createMock(ContainerInterface::class);
-        $this->paginator = $this->createMock(Paginator::class);
-
-        $this->trait->method('iocContainer')->willReturn($this->container);
-    }
-
-    public function testSetPaginator()
-    {
-        $this->assertFalse($this->trait->hasPaginator());
-        $this->assertEquals($this->trait, $this->trait->setPaginator($this->paginator));
-        $this->assertTrue($this->trait->hasPaginator());
-        $this->assertEquals($this->paginator, $this->trait->getPaginator());
-    }
-
-    public function testGetPaginatorWasNotSetException()
-    {
-        $this->expectException(PaginationException::class);
-        $this->trait->getPaginator();
-    }
-
-    public function testPaginate()
-    {
-        $paginators = $this->createMock(PaginatorsInterface::class);
-        $paginators->method('createPaginator')
-            ->with(static::PAGINATOR_PARAMETER, static::PAGINATOR_LIMIT)
-            ->willReturn($this->paginator);
-
-        $this->container->method('has')->with(PaginatorsInterface::class)->willReturn(true);
-        $this->container->method('get')->with(PaginatorsInterface::class)->willReturn($paginators);
-
-        $this->assertEquals($this->trait,
-            $this->trait->paginate(static::PAGINATOR_LIMIT, static::PAGINATOR_PARAMETER));
-    }
-
-    public function testPaginateScopeExceptionNoContainer()
-    {
-        $this->expectException(ScopeException::class);
-        $this->trait->paginate();
-    }
-
-    public function testConfigurePaginator()
-    {
-        $reflection = new \ReflectionObject($this->trait);
-        $method = $reflection->getMethod('configurePaginator');
-        $method->setAccessible(true);
-
-        $this->trait->setPaginator($this->paginator);
-        $this->assertNotSame($this->paginator, $method->invoke($this->trait));
-        $this->assertNotSame($this->paginator,
-            $method->invoke($this->trait, self::PAGINATOR_COUNT));
-    }
-}
\ No newline at end of file