Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove local variables

16 files changed, 13 insertions, 16 deletions

diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt
index e342a17348..82cafd735d 100644
--- a/ext/standard/tests/file/bug27508.phpt
+++ b/ext/standard/tests/file/bug27508.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #27508 (userspace wrappers have bogus eof indicator)
 --FILE--
-<?php # vim:ft=php
+<?php
 class FileStream {
     public $fp;
 
diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt
index 79922e31e1..a332d378ca 100644
--- a/ext/standard/tests/file/fopencookie.phpt
+++ b/ext/standard/tests/file/fopencookie.phpt
@@ -2,7 +2,6 @@
 fopencookie detected and working (or cast mechanism works)
 --FILE--
 <?php
-# vim600:syn=php:
 
 /* This test verifies that the casting mechanism is working correctly.
  * On systems with fopencookie, a FILE* is created around the user
diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt
index 73f87de613..40d1298fc4 100644
--- a/ext/standard/tests/file/userfilters.phpt
+++ b/ext/standard/tests/file/userfilters.phpt
@@ -2,7 +2,7 @@
 stream userfilter test
 --FILE--
 <?php
-# vim600:syn=php:
+
 class testfilter extends php_user_filter {
   function filter($in, $out, &$consumed, $closing) {
     while ($bucket = stream_bucket_make_writeable($in)) {
diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt
index 419ecc5122..790b74a0c3 100644
--- a/ext/standard/tests/file/userstreams.phpt
+++ b/ext/standard/tests/file/userstreams.phpt
@@ -2,7 +2,6 @@
 User-space streams
 --FILE--
 <?php
-# vim600:syn=php:
 
 /* This is a fairly aggressive test that looks at
  * user streams and also gives the seek/gets/buffer
diff --git a/ext/standard/tests/file/userwrapper.phpt b/ext/standard/tests/file/userwrapper.phpt
index 3b512a6f36..dd4f0d3dd1 100644
--- a/ext/standard/tests/file/userwrapper.phpt
+++ b/ext/standard/tests/file/userwrapper.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Userstream unlink, rename, mkdir, rmdir, and url_stat.
 --FILE--
-<?php # vim:ft=php:
+<?php
 class test {
     function unlink($file) {
         print "Unlinking file: $file\n";
diff --git a/ext/standard/tests/filters/basic.phpt b/ext/standard/tests/filters/basic.phpt
index 13a79e2cd1..c9162e5bef 100644
--- a/ext/standard/tests/filters/basic.phpt
+++ b/ext/standard/tests/filters/basic.phpt
@@ -2,7 +2,6 @@
 basic stream filter tests
 --FILE--
 <?php
-# vim600:syn=php:
 
 $text = "Hello There!";
 $filters = array("string.rot13", "string.toupper", "string.tolower");
diff --git a/ext/standard/tests/general_functions/proc_open-mb0.phpt b/ext/standard/tests/general_functions/proc_open-mb0.phpt
index f19a9fb576..3b832f6ea4 100644
--- a/ext/standard/tests/general_functions/proc_open-mb0.phpt
+++ b/ext/standard/tests/general_functions/proc_open-mb0.phpt
@@ -1,7 +1,7 @@
 --TEST--
 proc_open with bypass_shell subprocess parameter passing
 --SKIPIF--
-<?php # vim:syn=php
+<?php
 if (!function_exists("proc_open")) echo "skip proc_open() is not available";
 ?>
 --FILE--
diff --git a/ext/standard/tests/general_functions/proc_open-mb1.phpt b/ext/standard/tests/general_functions/proc_open-mb1.phpt
index 666779deb5..b91b44a739 100644
--- a/ext/standard/tests/general_functions/proc_open-mb1.phpt
+++ b/ext/standard/tests/general_functions/proc_open-mb1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 proc_open without bypass_shell subprocess parameter passing
 --SKIPIF--
-<?php # vim:syn=php
+<?php
 if (!function_exists("proc_open")) echo "skip proc_open() is not available";
 ?>
 --FILE--
diff --git a/ext/standard/tests/general_functions/proc_open.phpt b/ext/standard/tests/general_functions/proc_open.phpt
index ecf8d8ad79..4d0a21d165 100644
--- a/ext/standard/tests/general_functions/proc_open.phpt
+++ b/ext/standard/tests/general_functions/proc_open.phpt
@@ -1,7 +1,7 @@
 --TEST--
 proc_open
 --SKIPIF--
-<?php # vim:syn=php
+<?php
 if (!is_executable("/bin/cat")) echo "skip";
 if (!function_exists("proc_open")) echo "skip proc_open() is not available";
 ?>
diff --git a/ext/standard/tests/math/bug21523.phpt b/ext/standard/tests/math/bug21523.phpt
index 7589c401e3..20616b10b3 100644
--- a/ext/standard/tests/math/bug21523.phpt
+++ b/ext/standard/tests/math/bug21523.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #21523 (number_format tries to allocate negative amount of memory)
 --FILE--
-<?php // vim600:syn=php
+<?php
 set_time_limit(5);
 
 var_dump(number_format(-2000, 2768));
diff --git a/ext/standard/tests/math/bug24142.phpt b/ext/standard/tests/math/bug24142.phpt
index 169932b49b..3696b6e790 100644
--- a/ext/standard/tests/math/bug24142.phpt
+++ b/ext/standard/tests/math/bug24142.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #24142 (round() problems)
 --FILE--
-<?php // vim600:syn=php
+<?php
 $v = 0.005;
 for ($i = 1; $i < 10; $i++) {
 	echo "round({$v}, 2) -> ".round($v, 2)."\n";
diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt
index e311f892f7..8d97f5f6e8 100644
--- a/ext/standard/tests/network/bug20134.phpt
+++ b/ext/standard/tests/network/bug20134.phpt
@@ -2,7 +2,7 @@
 Bug #20134 (UDP reads from invalid ports)
 --FILE--
 <?php
-# vim600:syn=php:
+
 $fp = fsockopen("udp://localhost", 65534, $errno, $errstr);
 if (!$fp) {
 	/* UDP will never cause a connection error, as it is
diff --git a/ext/standard/tests/network/tcp4loop.phpt b/ext/standard/tests/network/tcp4loop.phpt
index a163cd9b35..a18fa3ba57 100644
--- a/ext/standard/tests/network/tcp4loop.phpt
+++ b/ext/standard/tests/network/tcp4loop.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Streams Based IPv4 TCP Loopback test
 --FILE--
-<?php # vim:ft=php:
+<?php
 
   for ($i=0; $i<100; $i++) {
     $port = rand(10000, 65000);
diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt
index 61f8f25135..47ecaf042e 100644
--- a/ext/standard/tests/network/udgloop.phpt
+++ b/ext/standard/tests/network/udgloop.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Streams Based Unix Domain Datagram Loopback test
 --SKIPIF--
-<?php # vim:ft=php:
+<?php
 	if (array_search("udg",stream_get_transports()) === false)
 		die('SKIP No support for UNIX domain sockets.');
 ?>
diff --git a/ext/standard/tests/network/udp6loop.phpt b/ext/standard/tests/network/udp6loop.phpt
index 8241d80bac..3b70f43119 100644
--- a/ext/standard/tests/network/udp6loop.phpt
+++ b/ext/standard/tests/network/udp6loop.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Streams Based IPv6 UDP Loopback test
 --SKIPIF--
-<?php # vim:ft=php:
+<?php
 	/* If IPv6 is supported on the platform this will error out with code 111 -
 	 * Connection refused.  If IPv6 is NOT supported, $errno will be set to
 	 * something else (indicating parse/getaddrinfo error)
diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt
index 83bfbb0667..2e95beb9f5 100644
--- a/ext/standard/tests/network/unixloop.phpt
+++ b/ext/standard/tests/network/unixloop.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Streams Based Unix Domain Loopback test
 --SKIPIF--
-<?php # vim:ft=php:
+<?php
 	if (array_search("unix",stream_get_transports()) === false)
 		die('SKIP No support for UNIX domain sockets.');
 ?>