Skip to content

Commit

Permalink
Merge pull request zendframework#5574 in master
Browse files Browse the repository at this point in the history
  • Loading branch information
Maks3w committed Dec 16, 2013
2 parents bd6229d + 170e4f9 commit 9ff4573
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function isTranslatorEnabled()
*
* @see TranslatorAwareInterface::setTranslatorTextDomain()
* @param string $textDomain
* @return mixed
* @return self
*/
public function setTranslatorTextDomain($textDomain = 'default')
{
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Mvc/Router/SimpleRouteStack.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public function setDefaultParam($name, $value)
* Create a route from array specifications.
*
* @param array|Traversable $specs
* @return SimpleRouteStack
* @return RouteInterface
* @throws Exception\InvalidArgumentException
*/
protected function routeFromArray($specs)
Expand Down

0 comments on commit 9ff4573

Please sign in to comment.