From 4e80dc54c28bd428260ca2fd319806cf9842213b Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sat, 16 Nov 2013 17:24:05 +0100
Subject: [PATCH] removed hard dependency of Pagination -> web\Request

issue #1207
---
 framework/yii/data/Pagination.php                    | 9 +++++++--
 tests/unit/framework/data/ActiveDataProviderTest.php | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/yii/data/Pagination.php b/framework/yii/data/Pagination.php
index 23f8944..20c0fed 100644
--- a/framework/yii/data/Pagination.php
+++ b/framework/yii/data/Pagination.php
@@ -9,6 +9,7 @@ namespace yii\data;
 
 use Yii;
 use yii\base\Object;
+use yii\web\Request;
 
 /**
  * Pagination represents information relevant to pagination of data items.
@@ -131,7 +132,9 @@ class Pagination extends Object
 	public function getPage($recalculate = false)
 	{
 		if ($this->_page === null || $recalculate) {
-			$params = $this->params === null ? Yii::$app->request->get() : $this->params;
+			if (($params = $this->params) === null) {
+				$params = (Yii::$app->request instanceof Request) ? Yii::$app->request->get : [];
+			}
 			if (isset($params[$this->pageVar]) && is_scalar($params[$this->pageVar])) {
 				$this->_page = (int)$params[$this->pageVar] - 1;
 				if ($this->validatePage) {
@@ -169,7 +172,9 @@ class Pagination extends Object
 	 */
 	public function createUrl($page)
 	{
-		$params = $this->params === null ? Yii::$app->request->get() : $this->params;
+		if (($params = $this->params) === null) {
+			$params = (Yii::$app->request instanceof Request) ? Yii::$app->request->get : [];
+		}
 		if ($page > 0 || $page >= 0 && $this->forcePageVar) {
 			$params[$this->pageVar] = $page + 1;
 		} else {
diff --git a/tests/unit/framework/data/ActiveDataProviderTest.php b/tests/unit/framework/data/ActiveDataProviderTest.php
index a5f0d14..4e4ca77 100644
--- a/tests/unit/framework/data/ActiveDataProviderTest.php
+++ b/tests/unit/framework/data/ActiveDataProviderTest.php
@@ -28,9 +28,6 @@ class ActiveDataProviderTest extends DatabaseTestCase
 	{
 		parent::setUp();
 		ActiveRecord::$db = $this->getConnection();
-		$this->mockApplication([
-			'request' => 'yii\\web\\Request',
-		]);
 	}
 
 	public function testActiveQuery()