Merge branch 'PHP-5.5' into PHP-5.6.18

* PHP-5.5:
  fix tests
  fix NEWS
  update NEWS

ext/standard/tests/file/stream_rfc2397_002.phpt

@@ -34,6 +34,8 @@ foreach($streams as $stream)
 <?php exit(0); ?>
 --EXPECTF--
 array(7) {
+  ["base64"]=>
+  bool(false)
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
@@ -46,8 +48,6 @@ array(7) {
   bool(true)
   ["uri"]=>
   string(8) "data://,"
-  ["base64"]=>
-  bool(false)
 }
 NULL
 
@@ -55,6 +55,8 @@ Warning: fopen(data://): failed to open stream: rfc2397: no comma in URL in %sst
 NULL
 NULL
 array(7) {
+  ["base64"]=>
+  bool(true)
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
@@ -67,8 +69,6 @@ array(7) {
   bool(true)
   ["uri"]=>
   string(15) "data://;base64,"
-  ["base64"]=>
-  bool(true)
 }
 NULL
 
@@ -84,6 +84,10 @@ Warning: fopen(data://foo=bar,): failed to open stream: rfc2397: illegal media t
 NULL
 NULL
 array(8) {
+  ["mediatype"]=>
+  string(10) "text/plain"
+  ["base64"]=>
+  bool(false)
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
@@ -96,10 +100,6 @@ array(8) {
   bool(true)
   ["uri"]=>
   string(18) "data://text/plain,"
-  ["mediatype"]=>
-  string(10) "text/plain"
-  ["base64"]=>
-  bool(false)
 }
 NULL
 
@@ -107,6 +107,12 @@ Warning: fopen(data://text/plain;foo,): failed to open stream: rfc2397: illegal
 NULL
 NULL
 array(9) {
+  ["mediatype"]=>
+  string(10) "text/plain"
+  ["foo"]=>
+  string(3) "bar"
+  ["base64"]=>
+  bool(false)
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
@@ -119,12 +125,6 @@ array(9) {
   bool(true)
   ["uri"]=>
   string(26) "data://text/plain;foo=bar,"
-  ["mediatype"]=>
-  string(10) "text/plain"
-  ["foo"]=>
-  string(3) "bar"
-  ["base64"]=>
-  bool(false)
 }
 string(3) "bar"
 
@@ -132,6 +132,12 @@ Warning: fopen(data://text/plain;foo=bar;bla,): failed to open stream: rfc2397:
 NULL
 NULL
 array(9) {
+  ["mediatype"]=>
+  string(10) "text/plain"
+  ["foo"]=>
+  string(3) "bar"
+  ["base64"]=>
+  bool(true)
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
@@ -144,12 +150,6 @@ array(9) {
   bool(true)
   ["uri"]=>
   string(33) "data://text/plain;foo=bar;base64,"
-  ["mediatype"]=>
-  string(10) "text/plain"
-  ["foo"]=>
-  string(3) "bar"
-  ["base64"]=>
-  bool(true)
 }
 string(3) "bar"
 
@@ -157,6 +157,14 @@ Warning: fopen(data://text/plain;foo=bar;bar=baz): failed to open stream: rfc239
 NULL
 NULL
 array(10) {
+  ["mediatype"]=>
+  string(10) "text/plain"
+  ["foo"]=>
+  string(3) "bar"
+  ["bar"]=>
+  string(3) "baz"
+  ["base64"]=>
+  bool(false)
   ["wrapper_type"]=>
   string(7) "RFC2397"
   ["stream_type"]=>
@@ -169,14 +177,6 @@ array(10) {
   bool(true)
   ["uri"]=>
   string(34) "data://text/plain;foo=bar;bar=baz,"
-  ["mediatype"]=>
-  string(10) "text/plain"
-  ["foo"]=>
-  string(3) "bar"
-  ["bar"]=>
-  string(3) "baz"
-  ["base64"]=>
-  bool(false)
 }
 string(3) "bar"
 ===DONE===

ext/standard/tests/network/socket_get_status_basic.phpt

@@ -18,6 +18,12 @@ fclose($server);
 ?>
 --EXPECTF--
 array(7) {
+  ["timed_out"]=>
+  bool(false)
+  ["blocked"]=>
+  bool(true)
+  ["eof"]=>
+  bool(false)
   ["stream_type"]=>
   string(%d) "tcp_socket%S"
   ["mode"]=>
@@ -26,10 +32,4 @@ array(7) {
   int(0)
   ["seekable"]=>
   bool(false)
-  ["timed_out"]=>
-  bool(false)
-  ["blocked"]=>
-  bool(true)
-  ["eof"]=>
-  bool(false)
 }

ext/zip/tests/stream_meta_data.phpt

@@ -35,6 +35,12 @@ fclose($fp);
 ?>
 --EXPECTF--
 array(8) {
+  ["timed_out"]=>
+  bool(false)
+  ["blocked"]=>
+  bool(true)
+  ["eof"]=>
+  bool(false)
   ["stream_type"]=>
   string(3) "zip"
   ["mode"]=>
@@ -45,14 +51,14 @@ array(8) {
   bool(false)
   ["uri"]=>
   string(3) "foo"
+}
+array(9) {
   ["timed_out"]=>
   bool(false)
   ["blocked"]=>
   bool(true)
   ["eof"]=>
   bool(false)
-}
-array(9) {
   ["wrapper_type"]=>
   string(11) "zip wrapper"
   ["stream_type"]=>
@@ -65,10 +71,4 @@ array(9) {
   bool(false)
   ["uri"]=>
   string(%d) "zip://%stest_with_comment.zip#foo"
-  ["timed_out"]=>
-  bool(false)
-  ["blocked"]=>
-  bool(true)
-  ["eof"]=>
-  bool(false)
 }

ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt

@@ -25,6 +25,12 @@ gzclose($h);
 --EXPECTF--
 no wrapper
 array(7) {
+  ["timed_out"]=>
+  bool(false)
+  ["blocked"]=>
+  bool(true)
+  ["eof"]=>
+  bool(false)
   ["stream_type"]=>
   string(4) "ZLIB"
   ["mode"]=>
@@ -33,16 +39,16 @@ array(7) {
   int(0)
   ["seekable"]=>
   bool(true)
+}
+
+with wrapper
+array(9) {
   ["timed_out"]=>
   bool(false)
   ["blocked"]=>
   bool(true)
   ["eof"]=>
   bool(false)
-}
-
-with wrapper
-array(9) {
   ["wrapper_type"]=>
   string(4) "ZLIB"
   ["stream_type"]=>
@@ -55,11 +61,5 @@ array(9) {
   bool(true)
   ["uri"]=>
   string(%d) "compress.zlib://%s/004.txt.gz"
-  ["timed_out"]=>
-  bool(false)
-  ["blocked"]=>
-  bool(true)
-  ["eof"]=>
-  bool(false)
 }
 ===DONE===