Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed test

Author: felipensp

ext/standard/tests/array/array_walk_closure.phpt

@@ -219,7 +219,7 @@ array(2) {
   [1]=>
   array(4) {
     ["file"]=>
-    string(69) "%s"
+    string(%d) "%s"
     ["line"]=>
     int(%d)
     ["function"]=>
@@ -248,4 +248,4 @@ array(2) {
     }
   }
 }
-Done
+Done