Do not try to serialize() anonymous functions.

sebastianbergmann · Aug 24, 2011 · 01aa347 · 01aa347
1 parent c6ab0fc
commit 01aa347
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/ChangeLog.markdown b/ChangeLog.markdown
@@ -3,6 +3,11 @@ PHPUnit 3.5
 
 This is the list of changes for the PHPUnit 3.5 release series.
 
+PHPUnit 3.5.16
+--------------
+
+* `PHPUnit_Util_GlobalState` no longer tries to `serialize()` anonymous functions.
+
 PHPUnit 3.5.15
 --------------
 

diff --git a/PHPUnit/Util/GlobalState.php b/PHPUnit/Util/GlobalState.php
@@ -106,7 +106,8 @@ public static function backupGlobals(array $blacklist)
         foreach (array_keys($GLOBALS) as $key) {
             if ($key != 'GLOBALS' &&
                 !in_array($key, $superGlobalArrays) &&
-                !in_array($key, $blacklist)) {
+                !in_array($key, $blacklist) &&
+                !is_callable($GLOBALS[$key])) {
                 self::$globals['GLOBALS'][$key] = serialize($GLOBALS[$key]);
             }
         }
@@ -226,6 +227,10 @@ public static function getGlobalsAsString()
             if (isset($GLOBALS[$superGlobalArray]) &&
                 is_array($GLOBALS[$superGlobalArray])) {
                 foreach (array_keys($GLOBALS[$superGlobalArray]) as $key) {
+                    if (is_callable($GLOBALS[$superGlobalArray][$key])) {
+                        continue;
+                    }
+
                     $result .= sprintf(
                       '$GLOBALS[\'%s\'][\'%s\'] = %s;' . "\n",
                       $superGlobalArray,
@@ -241,7 +246,7 @@ public static function getGlobalsAsString()
         $blacklist[] = '_PEAR_Config_instance';
 
         foreach (array_keys($GLOBALS) as $key) {
-            if (!in_array($key, $blacklist)) {
+            if (!in_array($key, $blacklist) && !is_callable($GLOBALS[$key])) {
                 $result .= sprintf(
                   '$GLOBALS[\'%s\'] = %s;' . "\n",
                   $key,
@@ -294,7 +299,11 @@ public static function backupStaticAttributes(array $blacklist)
                         if (!isset($blacklist[$declaredClasses[$i]]) ||
                            !in_array($name, $blacklist[$declaredClasses[$i]])) {
                             $attribute->setAccessible(TRUE);
-                            $backup[$name] = serialize($attribute->getValue());
+                            $value = $attribute->getValue();
+
+                            if (!is_callable($value)) {
+                                $backup[$name] = serialize($value);
+                            }
                         }
                     }
                 }