Merge branch 'PHP-5.4' into PHP-5.5

smalyshev · smalyshev · commit 2425f88afd48 · 2015-08-04T16:45:32.000-07:00
* PHP-5.4:
  fix test
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
@@ -40,7 +40,7 @@ string(183) "Class [ <internal:Core> class stdClass ] {
 }
 
 "
-string(1424) "Class [ <internal:Core> class Exception ] {
+string(1418) "Class [ <internal:Core> class Exception ] {
 
   - Constants [0] {
   }
@@ -74,7 +74,7 @@ string(1424) "Class [ <internal:Core> class Exception ] {
       }
     }
 
-    Method [ <internal:Core> final public method __wakeup ] {
+    Method [ <internal:Core> public method __wakeup ] {
     }
 
     Method [ <internal:Core> final public method getMessage ] {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ string(183) "Class [ <internal:Core> class stdClass ] {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`"`
`43`		`-string(1424) "Class [ <internal:Core> class Exception ] {`
	`43`	`+string(1418) "Class [ <internal:Core> class Exception ] {`
`44`	`44`
`45`	`45`	`- Constants [0] {`
`46`	`46`	`}`
`@@ -74,7 +74,7 @@ string(1424) "Class [ <internal:Core> class Exception ] {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- Method [ <internal:Core> final public method __wakeup ] {`
	`77`	`+ Method [ <internal:Core> public method __wakeup ] {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`Method [ <internal:Core> final public method getMessage ] {`