Merge branch 'hotfix/2878'

Close zendframework/zendframework#2878

src/Helper/Navigation/AbstractHelper.php

@@ -335,8 +335,8 @@ public function setAcl(Acl\Acl $acl = null)
      */
     public function getAcl()
     {
-        if ($this->acl === null && self::$defaultAcl !== null) {
-            return self::$defaultAcl;
+        if ($this->acl === null && static::$defaultAcl !== null) {
+            return static::$defaultAcl;
         }
 
         return $this->acl;
@@ -380,8 +380,8 @@ public function setRole($role = null)
      */
     public function getRole()
     {
-        if ($this->role === null && self::$defaultRole !== null) {
-            return self::$defaultRole;
+        if ($this->role === null && static::$defaultRole !== null) {
+            return static::$defaultRole;
         }
 
         return $this->role;
@@ -850,7 +850,7 @@ protected function normalizeId($value)
      */
     public static function setDefaultAcl(Acl\Acl $acl = null)
     {
-        self::$defaultAcl = $acl;
+        static::$defaultAcl = $acl;
     }
 
     /**
@@ -869,7 +869,7 @@ public static function setDefaultRole($role = null)
             || is_string($role)
             || $role instanceof Acl\Role\RoleInterface
         ) {
-            self::$defaultRole = $role;
+            static::$defaultRole = $role;
         } else {
             throw new Exception\InvalidArgumentException(sprintf(
                 '$role must be null|string|Zend\Permissions\Role\RoleInterface; received "%s"',

src/Helper/Navigation/Links.php

@@ -218,14 +218,14 @@ public function findAllRelations(AbstractPage $page, $flag = null)
         }
 
         $result = array('rel' => array(), 'rev' => array());
-        $native = array_values(self::$RELATIONS);
+        $native = array_values(static::$RELATIONS);
 
         foreach (array_keys($result) as $rel) {
             $meth = 'getDefined' . ucfirst($rel);
             $types = array_merge($native, array_diff($page->$meth(), $native));
 
             foreach ($types as $type) {
-                if (!$relFlag = array_search($type, self::$RELATIONS)) {
+                if (!$relFlag = array_search($type, static::$RELATIONS)) {
                     $relFlag = self::RENDER_CUSTOM;
                 }
                 if (!($flag & $relFlag)) {

src/Helper/PaginationControl.php

@@ -41,7 +41,7 @@ class PaginationControl extends AbstractHelper
      */
     public static function setDefaultViewPartial($partial)
     {
-        self::$defaultViewPartial = $partial;
+        static::$defaultViewPartial = $partial;
     }
 
     /**
@@ -51,7 +51,7 @@ public static function setDefaultViewPartial($partial)
      */
     public static function getDefaultViewPartial()
     {
-        return self::$defaultViewPartial;
+        return static::$defaultViewPartial;
     }
 
      /**
@@ -61,7 +61,7 @@ public static function getDefaultViewPartial()
      */
     public static function getDefaultScrollingStyle()
     {
-        return self::$defaultScrollingStyle;
+        return static::$defaultScrollingStyle;
     }
 
     /**
@@ -71,7 +71,7 @@ public static function getDefaultScrollingStyle()
      */
     public static function setDefaultScrollingStyle($style)
     {
-        self::$defaultScrollingStyle = $style;
+        static::$defaultScrollingStyle = $style;
     }
 
     /**
@@ -98,15 +98,15 @@ public function __invoke(Paginator\Paginator $paginator = null, $scrollingStyle
         }
 
         if ($partial === null) {
-            if (self::$defaultViewPartial === null) {
+            if (static::$defaultViewPartial === null) {
                 throw new Exception\RuntimeException('No view partial provided and no default set');
             }
 
-            $partial = self::$defaultViewPartial;
+            $partial = static::$defaultViewPartial;
         }
 
         if ($scrollingStyle === null) {
-            $scrollingStyle = self::$defaultScrollingStyle;
+            $scrollingStyle = static::$defaultScrollingStyle;
         }
 
         $pages = get_object_vars($paginator->getPages($scrollingStyle));