Merge branch 'develop' of git://github.com/zendframework/zf2 into dev…

…elop

src/Page/AbstractPage.php

@@ -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)
         ) {
@@ -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();
@@ -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;
         }
@@ -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(

src/Page/Mvc.php

@@ -178,7 +178,7 @@ public function getHref()
 
         $router = $this->router;
         if (null === $router) {
-            $router = self::$defaultRouter;
+            $router = static::$defaultRouter;
         }
 
         if (!$router instanceof RouteStackInterface) {
@@ -411,7 +411,7 @@ public function setRouter(RouteStackInterface $router)
      */
     public static function setDefaultRouter($router)
     {
-        self::$defaultRouter = $router;
+        static::$defaultRouter = $router;
     }
 
     /**
@@ -421,7 +421,7 @@ public static function setDefaultRouter($router)
      */
     public static function getDefaultRouter()
     {
-        return self::$defaultRouter;
+        return static::$defaultRouter;
     }
 
     // Public methods: