Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
  update NEWS

Author: smalyshev

sapi/cli/tests/005.phpt

@@ -4,7 +4,7 @@ show information about class
 <?php 
 include "skipif.inc"; 
 if (!extension_loaded("reflection")) {
-	die("skip reflection extension required");
+    die("skip reflection extension required");
 }
 ?>
 --FILE--
@@ -18,7 +18,7 @@ var_dump(`"$php" -n --rc exception`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF-- 
 string(40) "Exception: Class unknown does not exist
 "
 string(183) "Class [ <internal:Core> class stdClass ] {
@@ -40,7 +40,7 @@ string(183) "Class [ <internal:Core> class stdClass ] {
 }
 
 "
-string(1355) "Class [ <internal:Core> class Exception ] {
+string(1424) "Class [ <internal:Core> class Exception ] {
 
   - Constants [0] {
   }
@@ -61,7 +61,7 @@ string(1355) "Class [ <internal:Core> class Exception ] {
     Property [ <default> private $previous ]
   }
 
-  - Methods [10] {
+  - Methods [11] {
     Method [ <internal:Core> final private method __clone ] {
     }
 
@@ -74,6 +74,9 @@ string(1355) "Class [ <internal:Core> class Exception ] {
       }
     }
 
+    Method [ <internal:Core> final public method __wakeup ] {
+    }
+
     Method [ <internal:Core> final public method getMessage ] {
     }