Merge branch 'hotfix/2878'

Close zendframework/zendframework#2878
zendframework · Nov 16, 2012 · 893db4e · 893db4e
2 parents 441f51a + 386dac1
commit 893db4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Container.php b/src/Container.php
@@ -88,7 +88,7 @@ public function __construct($name = 'Default', Manager $manager = null)
      */
     public static function setDefaultManager(Manager $manager = null)
     {
-        self::$defaultManager = $manager;
+        static::$defaultManager = $manager;
     }
 
     /**
@@ -101,16 +101,16 @@ public static function setDefaultManager(Manager $manager = null)
      */
     public static function getDefaultManager()
     {
-        if (null === self::$defaultManager) {
-            $manager = new self::$managerDefaultClass();
+        if (null === static::$defaultManager) {
+            $manager = new static::$managerDefaultClass();
             if (!$manager instanceof Manager) {
                 throw new Exception\InvalidArgumentException(
                     'Invalid default manager type provided; must implement ManagerInterface'
                 );
             }
-            self::$defaultManager = $manager;
+            static::$defaultManager = $manager;
         }
-        return self::$defaultManager;
+        return static::$defaultManager;
     }
 
     /**
@@ -133,7 +133,7 @@ public function getName()
     protected function setManager(Manager $manager = null)
     {
         if (null === $manager) {
-            $manager = self::getDefaultManager();
+            $manager = static::getDefaultManager();
             if (!$manager instanceof Manager) {
                 throw new Exception\InvalidArgumentException(
                     'Manager provided is invalid; must implement ManagerInterface'

diff --git a/src/Validator/RemoteAddr.php b/src/Validator/RemoteAddr.php
@@ -72,7 +72,7 @@ public function isValid()
      */
     public static function setUseProxy($useProxy = true)
     {
-        self::$useProxy = $useProxy;
+        static::$useProxy = $useProxy;
     }
 
     /**
@@ -82,7 +82,7 @@ public static function setUseProxy($useProxy = true)
      */
     public static function getUseProxy()
     {
-        return self::$useProxy;
+        return static::$useProxy;
     }
 
     /**
@@ -92,7 +92,7 @@ public static function getUseProxy()
      */
     protected function getIpAddress()
     {
-        if (self::$useProxy) {
+        if (static::$useProxy) {
             // proxy IP address
             if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP']) {
                 $ips = explode(',', $_SERVER['HTTP_CLIENT_IP']);