Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix phar phpinfo test after markup changes

Author: rlerdorf

ext/phar/tests/phpinfo_004.phpt

@@ -23,9 +23,9 @@ phpinfo(INFO_MODULES);
 ?>
 ===DONE===
 --EXPECTF--
-%a<br />
+%a
 <h2><a name="module_Phar">Phar</a></h2>
-<table border="0" cellpadding="3" width="600">
+<table>
 <tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr>
 <tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr>
 <tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr>
@@ -36,20 +36,20 @@ phpinfo(INFO_MODULES);
 <tr><td class="e">gzip compression </td><td class="v">enabled </td></tr>
 <tr><td class="e">bzip2 compression </td><td class="v">enabled </td></tr>
 <tr><td class="e">OpenSSL support </td><td class="v">disabled (install ext/openssl) </td></tr>
-</table><br />
-<table border="0" cellpadding="3" width="600">
+</table>
+<table>
 <tr class="v"><td>
 Phar based on pear/PHP_Archive, original concept by Davey Shafik.<br />Phar fully realized by Gregory Beaver and Marcus Boerger.<br />Portions of tar implementation Copyright (c) %d-%d Tim Kientzle.</td></tr>
-</table><br />
-<table border="0" cellpadding="3" width="600">
+</table>
+<table>
 <tr class="h"><th>Directive</th><th>Local Value</th><th>Master Value</th></tr>
 <tr><td class="e">phar.cache_list</td><td class="v"><i>no value</i></td><td class="v"><i>no value</i></td></tr>
 <tr><td class="e">phar.readonly</td><td class="v">Off</td><td class="v">Off</td></tr>
 <tr><td class="e">phar.require_hash</td><td class="v">Off</td><td class="v">Off</td></tr>
-</table><br />
-%a<br />
+</table>
+%a
 <h2><a name="module_Phar">Phar</a></h2>
-<table border="0" cellpadding="3" width="600">
+<table>
 <tr class="h"><th>Phar: PHP Archive support</th><th>enabled</th></tr>
 <tr><td class="e">Phar EXT version </td><td class="v">%s </td></tr>
 <tr><td class="e">Phar API version </td><td class="v">1.1.1 </td></tr>
@@ -60,16 +60,16 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik.<br />Phar full
 <tr><td class="e">gzip compression </td><td class="v">enabled </td></tr>
 <tr><td class="e">bzip2 compression </td><td class="v">enabled </td></tr>
 <tr><td class="e">OpenSSL support </td><td class="v">disabled (install ext/openssl) </td></tr>
-</table><br />
-<table border="0" cellpadding="3" width="600">
+</table>
+<table>
 <tr class="v"><td>
 Phar based on pear/PHP_Archive, original concept by Davey Shafik.<br />Phar fully realized by Gregory Beaver and Marcus Boerger.<br />Portions of tar implementation Copyright (c) %d-%d Tim Kientzle.</td></tr>
-</table><br />
-<table border="0" cellpadding="3" width="600">
+</table>
+<table>
 <tr class="h"><th>Directive</th><th>Local Value</th><th>Master Value</th></tr>
 <tr><td class="e">phar.cache_list</td><td class="v"><i>no value</i></td><td class="v"><i>no value</i></td></tr>
 <tr><td class="e">phar.readonly</td><td class="v">On</td><td class="v">Off</td></tr>
 <tr><td class="e">phar.require_hash</td><td class="v">On</td><td class="v">Off</td></tr>
-</table><br />
-%a<br />
+</table>
+%a
 </div></body></html>===DONE===