From 00112d7693cafb72a8e7a535fc34c3fa56afb07f Mon Sep 17 00:00:00 2001
From: Filippo Tessarotto <zoeslam@gmail.com>
Date: Fri, 7 Jun 2019 11:30:20 +0200
Subject: [PATCH 1/2] Updated AbstractActionController::indexAction return type
to reflect real usage
---
src/Controller/AbstractActionController.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Controller/AbstractActionController.php b/src/Controller/AbstractActionController.php
index 54277ab31..e805899da 100644
--- a/src/Controller/AbstractActionController.php
+++ b/src/Controller/AbstractActionController.php
@@ -9,6 +9,7 @@
use Zend\Mvc\Exception;
use Zend\Mvc\MvcEvent;
+use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Model\ViewModel;
/**
@@ -24,7 +25,7 @@ abstract class AbstractActionController extends AbstractController
/**
* Default action if none provided
*
- * @return ViewModel
+ * @return null|array|ViewModel|Response
*/
public function indexAction()
{
From 9bfe2bf71aee0cbe2132efc956f770d7245ccc2a Mon Sep 17 00:00:00 2001
From: Filippo Tessarotto <zoeslam@gmail.com>
Date: Tue, 11 Jun 2019 10:30:45 +0200
Subject: [PATCH 2/2] DefaultRenderingStrategy handles
Zend\View\Model\ModelInterface
---
src/Controller/AbstractActionController.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Controller/AbstractActionController.php b/src/Controller/AbstractActionController.php
index e805899da..054deddd5 100644
--- a/src/Controller/AbstractActionController.php
+++ b/src/Controller/AbstractActionController.php
@@ -9,7 +9,8 @@
use Zend\Mvc\Exception;
use Zend\Mvc\MvcEvent;
-use Zend\Stdlib\ResponseInterface as Response;
+use Zend\Stdlib\ResponseInterface;
+use Zend\View\Model\ModelInterface as ViewModelInterface;
use Zend\View\Model\ViewModel;
/**
@@ -25,7 +26,7 @@ abstract class AbstractActionController extends AbstractController
/**
* Default action if none provided
*
- * @return null|array|ViewModel|Response
+ * @return null|array|ViewModelInterface|ResponseInterface
*/
public function indexAction()
{