Make 3.3 compatible.

dereuromark · Aug 17, 2016 · 8038fb2 · 8038fb2
1 parent 07a579c
commit 8038fb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -17,14 +17,16 @@ class Controller extends ShimController {
 	 *
 	 * @param \Cake\ORM\Table|string|\Cake\ORM\Query|null $object Table to paginate
 	 *   (e.g: Table instance, 'TableName' or a Query object)
+	 * @param array $settings Settings
+	 *
 	 * @return \Cake\ORM\ResultSet Query results
 	 */
-	public function paginate($object = null) {
+	public function paginate($object = null, array $settings = []) {
 		$defaultSettings = (array)Configure::read('Paginator');
 		if ($defaultSettings) {
 			$this->paginate += $defaultSettings;
 		}
-		return parent::paginate($object);
+		return parent::paginate($object, $settings);
 	}
 
 }
diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -17,7 +17,7 @@ class ControllerTest extends TestCase {
 	public $fixtures = ['plugin.Tools.ToolsUsers'];
 
 	/**
-	 * @var Cake\Controller\Controller
+	 * @var \Cake\Controller\Controller
 	 */
 	public $Controller;