Skip to content

Commit

Permalink
Merge branch 'hotfix/3765' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework#3765
  • Loading branch information
@weierophinney
weierophinney committed Feb 19, 2013
2 parents 97213e9 + 79e50a0 commit 132e127
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 51 deletions.
6 changes: 3 additions & 3 deletions library/Zend/Mvc/Router/Console/Catchall.php
View file
Expand Up @@ -90,7 +90,7 @@ public function __construct(array $defaults = array())
/**
* factory(): defined by Route interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @return Simple
*/
Expand Down Expand Up @@ -118,7 +118,7 @@ public function match(Request $request)
/**
* assemble(): Defined by Route interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -131,7 +131,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by Route interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Mvc/Router/Console/Simple.php
View file
Expand Up @@ -136,7 +136,7 @@ public function __construct(
/**
* factory(): defined by Route interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Simple
Expand Down Expand Up @@ -788,7 +788,7 @@ public function match(Request $request, $pathOffset = null)
/**
* assemble(): Defined by Route interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -801,7 +801,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by Route interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Mvc/Router/Console/SimpleRouteStack.php
View file
Expand Up @@ -22,7 +22,7 @@ class SimpleRouteStack extends BaseSimpleRouteStack
/**
* init(): defined by SimpleRouteStack.
*
* @see SimpleRouteStack::init()
* @see BaseSimpleRouteStack::init()
*/
protected function init()
{
Expand All @@ -39,7 +39,7 @@ protected function init()
/**
* addRoute(): defined by RouteStackInterface interface.
*
* @see RouteStack::addRoute()
* @see RouteStackInterface::addRoute()
* @param string $name
* @param mixed $route
* @param integer $priority
Expand All @@ -57,7 +57,7 @@ public function addRoute($name, $route, $priority = null)
/**
* routeFromArray(): defined by SimpleRouteStack.
*
* @see SimpleRouteStack::routeFromArray()
* @see BaseSimpleRouteStack::routeFromArray()
* @param array|Traversable $specs
* @return RouteInterface
* @throws Exception\InvalidArgumentException
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Hostname.php
View file
Expand Up @@ -66,7 +66,7 @@ public function __construct($route, array $constraints = array(), array $default
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Hostname
Expand Down Expand Up @@ -97,7 +97,7 @@ public static function factory($options = array())
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @return RouteMatch
*/
Expand Down Expand Up @@ -133,7 +133,7 @@ public function match(Request $request)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand Down Expand Up @@ -171,7 +171,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Literal.php
View file
Expand Up @@ -50,7 +50,7 @@ public function __construct($route, array $defaults = array())
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws Exception\InvalidArgumentException
* @return Literal
Expand All @@ -77,7 +77,7 @@ public static function factory($options = array())
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @param int|null $pathOffset
* @return RouteMatch|null
Expand Down Expand Up @@ -111,7 +111,7 @@ public function match(Request $request, $pathOffset = null)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -124,7 +124,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Method.php
View file
Expand Up @@ -48,7 +48,7 @@ public function __construct($verb, array $defaults = array())
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws Exception\InvalidArgumentException
* @return Method
Expand All @@ -75,7 +75,7 @@ public static function factory($options = array())
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @return RouteMatch|null
*/
Expand All @@ -99,7 +99,7 @@ public function match(Request $request)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -113,7 +113,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Part.php
View file
Expand Up @@ -74,7 +74,7 @@ public function __construct($route, $mayTerminate, RoutePluginManager $routePlug
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param mixed $options
* @throws Exception\InvalidArgumentException
* @return Part
Expand Down Expand Up @@ -112,7 +112,7 @@ public static function factory($options = array())
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @param int|null $pathOffset
* @return RouteMatch|null
Expand Down Expand Up @@ -158,7 +158,7 @@ public function match(Request $request, $pathOffset = null)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand Down Expand Up @@ -194,7 +194,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Query.php
View file
Expand Up @@ -51,7 +51,7 @@ public function __construct(array $defaults = array())
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws Exception\InvalidArgumentException
* @return Query
Expand All @@ -75,7 +75,7 @@ public static function factory($options = array())
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @param int|null $pathOffset
* @return RouteMatch
Expand Down Expand Up @@ -112,7 +112,7 @@ protected function recursiveUrldecode(array $array)

/**
* assemble(): Defined by RouteInterface interface.
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
*
* @param array $params
* @param array $options
Expand All @@ -138,7 +138,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Mvc/Router/Http/Regex.php
View file
Expand Up @@ -68,7 +68,7 @@ public function __construct($regex, $spec, array $defaults = array())
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Regex
Expand Down Expand Up @@ -138,7 +138,7 @@ public function match(Request $request, $pathOffset = null)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -165,7 +165,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Scheme.php
View file
Expand Up @@ -50,7 +50,7 @@ public function __construct($scheme, array $defaults = array())
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @return Scheme
* @throws Exception\InvalidArgumentException
Expand All @@ -77,7 +77,7 @@ public static function factory($options = array())
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @return RouteMatch
*/
Expand All @@ -100,7 +100,7 @@ public function match(Request $request)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -118,7 +118,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Mvc/Router/Http/Segment.php
View file
Expand Up @@ -110,7 +110,7 @@ public function __construct($route, array $constraints = array(), array $default
/**
* factory(): defined by RouteInterface interface.
*
* @see Route::factory()
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
* @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
* @return Segment
Expand Down Expand Up @@ -335,7 +335,7 @@ protected function buildPath(array $parts, array $mergedParams, $isOptional, $ha
/**
* match(): defined by RouteInterface interface.
*
* @see Route::match()
* @see \Zend\Mvc\Router\RouteInterface::match()
* @param Request $request
* @param string|null $pathOffset
* @return RouteMatch
Expand Down Expand Up @@ -374,7 +374,7 @@ public function match(Request $request, $pathOffset = null)
/**
* assemble(): Defined by RouteInterface interface.
*
* @see Route::assemble()
* @see \Zend\Mvc\Router\RouteInterface::assemble()
* @param array $params
* @param array $options
* @return mixed
Expand All @@ -394,7 +394,7 @@ public function assemble(array $params = array(), array $options = array())
/**
* getAssembledParams(): defined by RouteInterface interface.
*
* @see Route::getAssembledParams
* @see RouteInterface::getAssembledParams
* @return array
*/
public function getAssembledParams()
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Mvc/Router/Http/TreeRouteStack.php
View file
Expand Up @@ -62,7 +62,7 @@ protected function init()
/**
* addRoute(): defined by RouteStackInterface interface.
*
* @see RouteStack::addRoute()
* @see RouteStackInterface::addRoute()
* @param string $name
* @param mixed $route
* @param integer $priority
Expand Down

0 comments on commit 132e127

Please sign in to comment.