Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Ensure proper PHPDoc #234

Merged
merged 4 commits into from
May 1, 2017
Merged

Ensure proper PHPDoc #234

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f5fef1
Fixed PHPDoc `return` for `AbstractActionController::notFoundAction`
boesing Apr 27, 2017
94cc178
Removed already flagged deprecated methods from `AbstractActionContro…
boesing Apr 27, 2017
07445a6
Fixed `PHPDoc` in `AbstractActionController`
boesing Apr 27, 2017
15d766f
Revert "Removed already flagged deprecated methods from `AbstractActi…
boesing Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Controller/AbstractActionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -27,7 +28,7 @@ abstract class AbstractActionController extends AbstractController
/**
* Default action if none provided
*
* @return array
* @return ViewModel
*/
public function indexAction()
{
Expand All @@ -39,7 +40,7 @@ public function indexAction()
/**
* Action called if matched action does not exist
*
* @return array
* @return ViewModel|ConsoleModel
*/
public function notFoundAction()
{
Expand All @@ -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)
{
Expand Down