Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed phpdoc and some Exceptions in Zend\Mvc

  • Loading branch information...
commit 7c381bf17b30927d8307db6adcee48c4f909aab6 1 parent 96750fd
@prolic prolic authored
View
7 library/Zend/Mvc/Application.php
@@ -110,11 +110,8 @@ class Application implements
/**
* Constructor
*
- *
- *
- * @param mixed $configuration
+ * @param mixed $configuration
* @param ServiceManager $serviceManager
- * @return void
*/
public function __construct($configuration, ServiceManager $serviceManager)
{
@@ -212,7 +209,7 @@ public function getMvcEvent()
/**
* Set the event manager instance
*
- * @param EventCollection $eventManager
+ * @param EventManagerInterface $eventManager
* @return Application
*/
public function setEventManager(EventManagerInterface $eventManager)
View
6 library/Zend/Mvc/Controller/ActionController.php
@@ -132,6 +132,7 @@ public function dispatch(Request $request, Response $response = null)
*
* @param MvcEvent $e
* @return mixed
+ * @throws Exception\DomainException
*/
public function execute(MvcEvent $e)
{
@@ -141,7 +142,7 @@ public function execute(MvcEvent $e)
* @todo Determine requirements for when route match is missing.
* Potentially allow pulling directly from request metadata?
*/
- throw new \DomainException('Missing route matches; unsure how to retrieve action');
+ throw new Exception\DomainException('Missing route matches; unsure how to retrieve action');
}
$action = $routeMatch->getParam('action', 'not-found');
@@ -287,6 +288,7 @@ public function getBroker()
*
* @param string|Broker $broker Plugin broker to load plugins
* @return Zend\Loader\Pluggable
+ * @throws Exception\InvalidArgumentException
*/
public function setBroker($broker)
{
@@ -303,7 +305,7 @@ public function setBroker($broker)
/**
* Get plugin instance
*
- * @param string $plugin Name of plugin to return
+ * @param string $name Name of plugin to return
* @param null|array $options Options to pass to plugin constructor (if not already instantiated)
* @return mixed
*/
View
2  library/Zend/Mvc/Controller/Plugin/Layout.php
@@ -60,7 +60,7 @@ public function setTemplate($template)
* Otherwise, attempts to set the template for that view model.
*
* @param null|string $template
- * @return void
+ * @return Model|Layout
*/
public function __invoke($template = null)
{
View
6 library/Zend/Mvc/Controller/RestfulController.php
@@ -148,11 +148,12 @@ public function notFoundAction()
* @param Request $request
* @param null|Response $response
* @return mixed|Response
+ * @throws Exception\InvalidArgumentException
*/
public function dispatch(Request $request, Response $response = null)
{
if (!$request instanceof HttpRequest) {
- throw new \InvalidArgumentException('Expected an HTTP request');
+ throw new Exception\InvalidArgumentException('Expected an HTTP request');
}
$this->request = $request;
if (!$response) {
@@ -374,6 +375,7 @@ public function getBroker()
*
* @param string|Broker $broker Plugin broker to load plugins
* @return Zend\Loader\Pluggable
+ * @throws Exception\InvalidArgumentException
*/
public function setBroker($broker)
{
@@ -390,7 +392,7 @@ public function setBroker($broker)
/**
* Get plugin instance
*
- * @param string $plugin Name of plugin to return
+ * @param string $name Name of plugin to return
* @param null|array $options Options to pass to plugin constructor (if not already instantiated)
* @return mixed
*/
View
1  library/Zend/Mvc/DispatchListener.php
@@ -97,7 +97,6 @@ public function onDispatch(MvcEvent $e)
$events = $application->events();
$controllerLoader = $application->getServiceManager()->get('ControllerLoader');
- $wasLoaded = false;
$exception = false;
try {
$controller = $controllerLoader->get($controllerName);
View
1  library/Zend/Mvc/Router/Http/Hostname.php
@@ -153,6 +153,7 @@ public function match(Request $request)
* @param array $params
* @param array $options
* @return mixed
+ * @throws Exception\InvalidArgumentException
*/
public function assemble(array $params = array(), array $options = array())
{
View
2  library/Zend/Mvc/Router/Http/Part.php
@@ -67,6 +67,7 @@ class Part extends TreeRouteStack implements RouteInterface
* @param boolean $mayTerminate
* @param RouteBroker $routeBroker
* @param array|null $childRoutes
+ * @throws Exception\InvalidArgumentException
*/
public function __construct($route, $mayTerminate, RouteBroker $routeBroker, array $childRoutes = null)
{
@@ -174,6 +175,7 @@ public function match(Request $request, $pathOffset = null)
* @param array $params
* @param array $options
* @return mixed
+ * @throws Exception\RuntimeException
*/
public function assemble(array $params = array(), array $options = array())
{
View
2  library/Zend/Mvc/Router/Http/Regex.php
@@ -87,7 +87,7 @@ public function __construct($regex, $spec, array $defaults = array())
* @see Route::factory()
* @param array|\Traversable $options
* @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
- * @return void
+ * @return Regex
*/
public static function factory($options = array())
{
View
1  library/Zend/Mvc/Router/Http/Segment.php
@@ -312,6 +312,7 @@ protected function buildPath(array $parts, array $mergedParams, $isOptional, $ha
*
* @see Route::match()
* @param Request $request
+ * @param string|null $pathOffset
* @return RouteMatch
*/
public function match(Request $request, $pathOffset = null)
View
2  library/Zend/Mvc/Router/RouteBroker.php
@@ -142,6 +142,7 @@ public function setOptions($options)
* @param string $route
* @param array $options
* @return RouteInterface
+ * @throws Exception\RuntimeException
*/
public function load($route, array $options = array())
{
@@ -220,6 +221,7 @@ public function unregister($name)
* @see Broker::setClassLoader()
* @param ShortNameLocator $loader
* @return RouteBroker
+ * @throws Exception\InvalidArgumentException
*/
public function setClassLoader(ShortNameLocator $loader)
{
View
2  library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -73,6 +73,7 @@ public function __construct()
* @see Route::factory()
* @param array|\Traversable $options
* @return SimpleRouteStack
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($options = array())
{
@@ -136,6 +137,7 @@ public function routeBroker()
* @see RouteStack::addRoutes()
* @param array|\Traversable $routes
* @return SimpleRouteStack
+ * @throws Exception\InvalidArgumentException
*/
public function addRoutes($routes)
{
View
1  library/Zend/Mvc/Service/ServiceManagerConfiguration.php
@@ -107,7 +107,6 @@ class ServiceManagerConfiguration implements ConfigurationInterface
* Merges internal arrays with those passed via configuration
*
* @param array $configuration
- * @return void
*/
public function __construct(array $configuration = array())
{
View
2  library/Zend/Mvc/View/ExceptionStrategy.php
@@ -84,7 +84,7 @@ public function detach(EventManagerInterface $events)
/**
* Flag: display exceptions in error pages?
*
- * @param bool $flag
+ * @param bool $displayExceptions
* @return ExceptionStrategy
*/
public function setDisplayExceptions($displayExceptions)
View
2  library/Zend/Mvc/View/ViewManager.php
@@ -126,7 +126,7 @@ public function detach(EventManagerInterface $events)
/**
* Prepares the view layer
*
- * @param ApplicationInterface $application
+ * @param $event
* @return void
*/
public function onBootstrap($event)
Please sign in to comment.
Something went wrong with that request. Please try again.