Merge pull request zendframework/zendframework#5155 in master

zendframework · Oct 2, 2013 · 3de43d9 · 3de43d9
commit 3de43d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/test/Pattern/CallbackCacheTest.php b/test/Pattern/CallbackCacheTest.php
@@ -24,11 +24,11 @@ class TestCallbackCache
 
     public static function bar()
     {
-        ++self::$fooCounter;
+        ++static::$fooCounter;
         $args = func_get_args();
 
-        echo   'foobar_output('.implode(', ', $args) . ') : ' . self::$fooCounter;
-        return 'foobar_return('.implode(', ', $args) . ') : ' . self::$fooCounter;
+        echo   'foobar_output('.implode(', ', $args) . ') : ' . static::$fooCounter;
+        return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
     public static function emptyMethod() {}

diff --git a/test/Pattern/ClassCacheTest.php b/test/Pattern/ClassCacheTest.php
@@ -24,11 +24,11 @@ class TestClassCache
 
     public static function bar()
     {
-        ++self::$fooCounter;
+        ++static::$fooCounter;
         $args = func_get_args();
 
-        echo 'foobar_output('.implode(', ', $args) . ') : ' . self::$fooCounter;
-        return 'foobar_return('.implode(', ', $args) . ') : ' . self::$fooCounter;
+        echo 'foobar_output('.implode(', ', $args) . ') : ' . static::$fooCounter;
+        return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
     public static function emptyMethod() {}

diff --git a/test/Pattern/ObjectCacheTest.php b/test/Pattern/ObjectCacheTest.php
@@ -26,11 +26,11 @@ class TestObjectCache
 
     public function bar()
     {
-        ++self::$fooCounter;
+        ++static::$fooCounter;
         $args = func_get_args();
 
-        echo 'foobar_output('.implode(', ', $args) . ') : ' . self::$fooCounter;
-        return 'foobar_return('.implode(', ', $args) . ') : ' . self::$fooCounter;
+        echo 'foobar_output('.implode(', ', $args) . ') : ' . static::$fooCounter;
+        return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
     public function __invoke()