Move paginator class and interface to Datasource package.

cakephp · Jun 10, 2017 · f6f7b83 · f6f7b83
1 parent 969c219
commit f6f7b83
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/Controller/Component/PaginatorComponent.php b/src/Controller/Component/PaginatorComponent.php
@@ -16,10 +16,10 @@
 
 use Cake\Controller\Component;
 use Cake\Controller\ComponentRegistry;
+use Cake\Datasource\Exception\PageOutOfBoundsException;
+use Cake\Datasource\Paginator;
 use Cake\Datasource\QueryInterface;
 use Cake\Network\Exception\NotFoundException;
-use Cake\ORM\Exception\PageOutOfBoundsException;
-use Cake\ORM\Paginator;
 
 /**
  * This component is used to handle automatic model data pagination. The primary way to use this

diff --git a/...RM/Exception/PageOutOfBoundsException.php → ...ce/Exception/PageOutOfBoundsException.php b/...RM/Exception/PageOutOfBoundsException.php → ...ce/Exception/PageOutOfBoundsException.php
@@ -10,7 +10,7 @@
  * @since         3.5.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\ORM\Exception;
+namespace Cake\Datasource\Exception;
 
 use Cake\Core\Exception\Exception;
 

diff --git a/src/ORM/Paginator.php → src/Datasource/Paginator.php b/src/ORM/Paginator.php → src/Datasource/Paginator.php
@@ -12,12 +12,10 @@
  * @since         3.5.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\ORM;
+namespace Cake\Datasource;
 
 use Cake\Core\InstanceConfigTrait;
-use Cake\Datasource\QueryInterface;
-use Cake\Datasource\RepositoryInterface;
-use Cake\ORM\Exception\PageOutOfBoundsException;
+use Cake\Datasource\Exception\PageOutOfBoundsException;
 use Cake\Utility\Hash;
 
 /**

diff --git a/src/ORM/PaginatorInterface.php → src/Datasource/PaginatorInterface.php b/src/ORM/PaginatorInterface.php → src/Datasource/PaginatorInterface.php
@@ -12,7 +12,7 @@
  * @since         3.5.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\ORM;
+namespace Cake\Datasource;
 
 /**
  * This interface describes the methods for paginator instance.

diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -19,10 +19,10 @@
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
+use Cake\Datasource\Paginator;
 use Cake\Http\ServerRequest;
 use Cake\Network\Exception\NotFoundException;
 use Cake\ORM\Entity;
-use Cake\ORM\Paginator;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;