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

Commit

Permalink
Merge branch 'develop' of git://github.com/zendframework/zf2 into hot…
Browse files Browse the repository at this point in the history 
…fix/cache-empty-namespace
  • Loading branch information
@marc-mabe
marc-mabe committed Dec 13, 2012
118 parents 94b36e8 + 62824a2 + 6378cbe + a10281c + cd0ff39 + 02e8122 + a667dd4 + 02ccc35 + 7d61487 + ab2f663 + a27ca10 + 75af0e5 + 24f498b + d2dd157 + 6c759d8 + 51b0320 + aabe1c0 + e76b67c + 5d85a78 + d285b08 + c5df6b0 + ff58ff4 + 5675884 + a55ead5 + 47eb5a8 + a36e34a + 3e520ad + 7b0d374 + 461c28b + 3890e69 + 316384e + 1431343 + debad5a + 1680741 + 4497a00 + bb6633a + 6b7ed03 + 35fcae3 + 0737e9d + c31bf4c + 918649e + ecbe771 + b4124fc + f4e1da0 + a8c70a8 + 50d3c5d + 79180fa + f6f9386 + 8ed6590 + d79a4a4 + 3958052 + eae6146 + 1cc7a46 + 1d9542f + a22d6e2 + 3496b67 + 9398e77 + 687d980 + 900dc7d + 21f6363 + 0eeb6ff + 8c442a3 + adf1f8e + c2ceb18 + 9b17a1c + d5dab4a + 346a62a + 9808633 + bdeec54 + 1a2506a + f5f3d02 + b623064 + 4338bf4 + bdababf + 4054000 + 4449c16 + d3d8b33 + 8427cf8 + 8d162ec + a988e9a + 3e9d597 + ee93c08 + 9d3ce53 + f04a59c + 0c3f2de + a654383 + 502d937 + 93350ca + 23a0ccc + 15dc071 + 6ca79e9 + 7645850 + 7b0843e + b9f38cc + 53d4205 + 0ba91ba + 7ad75c4 + 35376fd + e6713be + b15c871 + 4121ed2 + 905626d + 529973a + e28e80a + b64275a + 2f43075 + 05dea5f + b0f56ea + 2f2787b + d5a4f17 + 229c668 + c164e00 + e5c1ff6 + 5023ed3 + 3c689b8 + 65deb5a + 789b92c + a0ae2ac commit ae927c2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/Page/AbstractPage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ public function set($property, $value)
);
}

$method = 'set' . self::normalizePropertyName($property);
$method = 'set' . static::normalizePropertyName($property);

if ($method != 'setOptions' && method_exists($this, $method)
) {
Expand Down Expand Up @@ -907,7 +907,7 @@ public function get($property)
);
}

$method = 'get' . self::normalizePropertyName($property);
$method = 'get' . static::normalizePropertyName($property);

if (method_exists($this, $method)) {
return $this->$method();
Expand Down Expand Up @@ -963,7 +963,7 @@ public function __get($name)
*/
public function __isset($name)
{
$method = 'get' . self::normalizePropertyName($name);
$method = 'get' . static::normalizePropertyName($name);
if (method_exists($this, $method)) {
return true;
}
Expand All @@ -982,7 +982,7 @@ public function __isset($name)
*/
public function __unset($name)
{
$method = 'set' . self::normalizePropertyName($name);
$method = 'set' . static::normalizePropertyName($name);
if (method_exists($this, $method)) {
throw new Exception\InvalidArgumentException(
sprintf(
Expand Down
8 changes: 5 additions & 3 deletions src/Page/Mvc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public function getHref()

$router = $this->router;
if (null === $router) {
$router = self::$defaultRouter;
$router = static::$defaultRouter;
}

if (!$router instanceof RouteStackInterface) {
Expand Down Expand Up @@ -411,7 +411,7 @@ public function setRouter(RouteStackInterface $router)
*/
public static function setDefaultRouter($router)
{
self::$defaultRouter = $router;
static::$defaultRouter = $router;
}

/**
Expand All @@ -421,7 +421,7 @@ public static function setDefaultRouter($router)
*/
public static function getDefaultRouter()
{
return self::$defaultRouter;
return static::$defaultRouter;
}

// Public methods:
Expand All @@ -440,6 +440,8 @@ public function toArray()
'controller' => $this->getController(),
'params' => $this->getParams(),
'route' => $this->getRoute(),
'router' => $this->getRouter(),
'route_match' => $this->getRouteMatch(),
)
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/View/HelperConfig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class HelperConfig implements ConfigInterface
*/
public function configureServiceManager(ServiceManager $serviceManager)
{
$serviceManager->setFactory('navigation', function(HelperPluginManager $pm) {
$serviceManager->setFactory('navigation', function (HelperPluginManager $pm) {
$helper = new \Zend\View\Helper\Navigation;
$helper->setServiceLocator($pm->getServiceLocator());
return $helper;
Expand Down
4 changes: 3 additions & 1 deletion test/Page/MvcTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ public function testToArrayMethod()
'active' => true,
'visible' => false,
'foo' => 'bar',
'meaning' => 42
'meaning' => 42,
'router' => $this->router,
'route_match' => $this->routeMatch,
);

$page = new Page\Mvc($options);
Expand Down
4 changes: 2 additions & 2 deletions test/ServiceFactoryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected function setUp()
'extra_config' => array(
'service_manager' => array(
'factories' => array(
'Config' => function() {
'Config' => function () {
return array(
'navigation' => array(
'file' => __DIR__ . '/_files/navigation.xml',
Expand Down Expand Up @@ -119,7 +119,7 @@ public function testMvcPagesGetInjectedWithComponents()
$this->serviceManager->setFactory('Navigation', 'Zend\Navigation\Service\DefaultNavigationFactory');
$container = $this->serviceManager->get('Navigation');

$recursive = function($that, $pages) use (&$recursive) {
$recursive = function ($that, $pages) use (&$recursive) {
foreach ($pages as $page) {
if ($page instanceof MvcPage) {
$that->assertInstanceOf('Zend\Mvc\Router\RouteStackInterface', $page->getRouter());
Expand Down

0 comments on commit ae927c2

Please sign in to comment.