Merge branch 'hotfix/234' into release-2.7

Close #234

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.7.13 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#234](https://github.com/zendframework/zend-mvc/pull/234) fixes docblock
+  annotations in `AbstractActionController::indexAction` and `notFoundAction` to
+  indicate they return a `ViewModel|ConsoleModel` and not `array`.
+
 ## 2.7.12 - 2017-04-27
 
 ### Added

src/Controller/AbstractActionController.php

@@ -12,6 +12,7 @@
 use Zend\Http\Response as HttpResponse;
 use Zend\Mvc\Exception;
 use Zend\Mvc\MvcEvent;
+use Zend\View\Model\ConsoleModel;
 use Zend\View\Model\ViewModel;
 
 /**
@@ -27,7 +28,7 @@ abstract class AbstractActionController extends AbstractController
     /**
      * Default action if none provided
      *
-     * @return array
+     * @return ViewModel
      */
     public function indexAction()
     {
@@ -39,7 +40,7 @@ public function indexAction()
     /**
      * Action called if matched action does not exist
      *
-     * @return array
+     * @return ViewModel|ConsoleModel
      */
     public function notFoundAction()
     {
@@ -59,7 +60,8 @@ public function notFoundAction()
      *
      * @param  MvcEvent $e
      * @return mixed
-     * @throws Exception\DomainException
+     *
+     * @throws Exception\DomainException If no RouteMatch was found within MvcEvent.
      */
     public function onDispatch(MvcEvent $e)
     {