Merge branch 'hotfix/2878' into develop

Conflicts: library/Zend/File/Transfer/Adapter/AbstractAdapter.php library/Zend/File/Transfer/Adapter/Http.php tests/ZendTest/Log/Writer/AbstractTest.php tests/ZendTest/Log/Writer/DbTest.php
zendframework · Nov 16, 2012 · a6bf7c0 · a6bf7c0
commit a6bf7c0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Debug.php b/src/Debug.php
@@ -38,10 +38,10 @@ class Debug
      */
     public static function getSapi()
     {
-        if (self::$sapi === null) {
-            self::$sapi = PHP_SAPI;
+        if (static::$sapi === null) {
+            static::$sapi = PHP_SAPI;
         }
-        return self::$sapi;
+        return static::$sapi;
     }
 
     /**
@@ -53,7 +53,7 @@ public static function getSapi()
      */
     public static function setSapi($sapi)
     {
-        self::$sapi = $sapi;
+        static::$sapi = $sapi;
     }
 
     /**
@@ -103,7 +103,7 @@ public static function dump($var, $label=null, $echo=true)
 
         // neaten the newlines and indents
         $output = preg_replace("/\]\=\>\n(\s+)/m", "] => ", $output);
-        if (self::getSapi() == 'cli') {
+        if (static::getSapi() == 'cli') {
             $output = PHP_EOL . $label
                     . PHP_EOL . $output
                     . PHP_EOL;