Merge branch 'hotfix/220' into develop

Xerkus · Xerkus · commit 6d3b58655631 · 2017-03-03T03:07:15.000+10:00
Forward port #220
diff --git a/src/Controller/AbstractActionController.php b/src/Controller/AbstractActionController.php
@@ -26,7 +26,7 @@ abstract class AbstractActionController extends AbstractController
     /**
      * Default action if none provided
      *
-     * @return array
+     * @return ViewModel
      */
     public function indexAction()
     {
@@ -38,7 +38,7 @@ public function indexAction()
     /**
      * Action called if matched action does not exist
      *
-     * @return array
+     * @return ViewModel
      */
     public function notFoundAction()
     {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ abstract class AbstractActionController extends AbstractController`
`26`	`26`	`/**`
`27`	`27`	`* Default action if none provided`
`28`	`28`	`*`
`29`		`- * @return array`
	`29`	`+ * @return ViewModel`
`30`	`30`	`*/`
`31`	`31`	`public function indexAction()`
`32`	`32`	`{`
`@@ -38,7 +38,7 @@ public function indexAction()`
`38`	`38`	`/**`
`39`	`39`	`* Action called if matched action does not exist`
`40`	`40`	`*`
`41`		`- * @return array`
	`41`	`+ * @return ViewModel`
`42`	`42`	`*/`
`43`	`43`	`public function notFoundAction()`
`44`	`44`	`{`