From 48da66a0ce09f2a047b6b3bc26c972a9fb0be0a9 Mon Sep 17 00:00:00 2001
From: dereuromark <mark.scherer@spryker.com>
Date: Wed, 27 Dec 2017 21:28:14 +0100
Subject: [PATCH] Add missing ResultSetInterface to pagination collections

---
 .gitignore                                              | 1 +
 src/Template/Bake/Controller/controller.twig            | 2 +-
 tests/comparisons/Controller/testBakeActions.php        | 2 +-
 tests/comparisons/Controller/testBakeActionsContent.php | 2 +-
 tests/comparisons/Controller/testBakeWithPlugin.php     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index bc959c533..2aa220658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /composer.lock
 /phpunit.xml
 /vendor
+/.idea/
diff --git a/src/Template/Bake/Controller/controller.twig b/src/Template/Bake/Controller/controller.twig
index 1b877f747..9558878aa 100644
--- a/src/Template/Bake/Controller/controller.twig
+++ b/src/Template/Bake/Controller/controller.twig
@@ -36,7 +36,7 @@ use {{ namespace }}\Controller\AppController;
 
 {%- if 'index' in actions %}
  *
- * @method \{{ namespace }}\Model\Entity\{{ entityClassName }}[] paginate($object = null, array $settings = [])
+ * @method \{{ namespace }}\Model\Entity\{{ entityClassName }}[]|\Cake\Datasource\ResultSetInterface paginate($object = null, array $settings = [])
 {% endif %}
  */
 class {{ name }}Controller extends AppController
diff --git a/tests/comparisons/Controller/testBakeActions.php b/tests/comparisons/Controller/testBakeActions.php
index e78e0b80f..3b6cad894 100644
--- a/tests/comparisons/Controller/testBakeActions.php
+++ b/tests/comparisons/Controller/testBakeActions.php
@@ -9,7 +9,7 @@
  * @property \Cake\Controller\Component\CsrfComponent $Csrf
  * @property \Cake\Controller\Component\AuthComponent $Auth
  *
- * @method \App\Model\Entity\BakeArticle[] paginate($object = null, array $settings = [])
+ * @method \App\Model\Entity\BakeArticle[]|\Cake\Datasource\ResultSetInterface paginate($object = null, array $settings = [])
  */
 class BakeArticlesController extends AppController
 {
diff --git a/tests/comparisons/Controller/testBakeActionsContent.php b/tests/comparisons/Controller/testBakeActionsContent.php
index 14ec8e9e9..0ab5cbe3e 100644
--- a/tests/comparisons/Controller/testBakeActionsContent.php
+++ b/tests/comparisons/Controller/testBakeActionsContent.php
@@ -7,7 +7,7 @@
  * BakeArticles Controller
  *
  *
- * @method \App\Model\Entity\BakeArticle[] paginate($object = null, array $settings = [])
+ * @method \App\Model\Entity\BakeArticle[]|\Cake\Datasource\ResultSetInterface paginate($object = null, array $settings = [])
  */
 class BakeArticlesController extends AppController
 {
diff --git a/tests/comparisons/Controller/testBakeWithPlugin.php b/tests/comparisons/Controller/testBakeWithPlugin.php
index 71043f39b..f0fef5b42 100644
--- a/tests/comparisons/Controller/testBakeWithPlugin.php
+++ b/tests/comparisons/Controller/testBakeWithPlugin.php
@@ -8,7 +8,7 @@
  *
  * @property \BakeTest\Model\Table\BakeArticlesTable $BakeArticles
  *
- * @method \BakeTest\Model\Entity\BakeArticle[] paginate($object = null, array $settings = [])
+ * @method \BakeTest\Model\Entity\BakeArticle[]|\Cake\Datasource\ResultSetInterface paginate($object = null, array $settings = [])
  */
 class BakeArticlesController extends AppController
 {