mirror of
https://github.com/php/php-src.git
synced 2024-09-21 01:47:25 +00:00
Remove redundant middle newlines in "Autotools" related files
This syncs few minor left-overs in "Autotools" related files: - redundant middle newlines removed (in man pages the duplicate newlines are also ignored and are not visible in the man page anyway) - Minor mixed indentation synced [skip ci]
This commit is contained in:
Peter Kokot
parent
634708a14f
commit
9fcc1bca8a
@ -132,7 +132,7 @@ distclean: clean
|
||||
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
|
||||
rm -f ext/phar/phar.phar ext/phar/phar.php
|
||||
if test "$(srcdir)" != "$(builddir)"; then \
|
||||
rm -f ext/phar/phar/phar.inc; \
|
||||
rm -f ext/phar/phar/phar.inc; \
|
||||
fi
|
||||
|
||||
prof-gen:
|
||||
|
||||
@ -29,7 +29,6 @@ $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
|
||||
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
|
||||
-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
|
||||
|
||||
|
||||
TEST_PHP_EXECUTABLE = $(shell $(PHP_EXECUTABLE) -v 2>&1)
|
||||
TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec format error')
|
||||
|
||||
|
||||
@ -116,7 +116,6 @@ Regular expression for input files to exclude.
|
||||
.B ...
|
||||
Directory to extract to (defaults to '.').
|
||||
|
||||
|
||||
.SH help command
|
||||
This help or help for a selected command.
|
||||
.P
|
||||
@ -165,7 +164,6 @@ Specifies a regular expression for input files.
|
||||
.B -x \fIregex\fP
|
||||
Regular expression for input files to exclude.
|
||||
|
||||
|
||||
.SH meta-del command
|
||||
Delete meta information of a PHAR entry or a PHAR package.
|
||||
.P
|
||||
@ -397,7 +395,6 @@ present.
|
||||
.B \-s \fIstub\fP
|
||||
Select the \fIstub\fP file.
|
||||
|
||||
|
||||
.SH tree command
|
||||
Get a directory tree for a PHAR archive.
|
||||
.P
|
||||
@ -420,7 +417,6 @@ Regular expression for input files to exclude.
|
||||
.SH version command
|
||||
Get information about the PHAR environment and the tool version.
|
||||
|
||||
|
||||
.SH COMPRESSION
|
||||
Algorithms:
|
||||
.TP 15
|
||||
|
||||
@ -17,10 +17,8 @@ php_fpm_BIN=@sbindir@/php-fpm
|
||||
php_fpm_CONF=@sysconfdir@/php-fpm.conf
|
||||
php_fpm_PID=@localstatedir@/run/php-fpm.pid
|
||||
|
||||
|
||||
php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID"
|
||||
|
||||
|
||||
wait_for_pid () {
|
||||
try=0
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
<a href="http://validator.w3.org/check?uri=referer">
|
||||
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAMAAABUFvrSAAADAFBMVEUBAAAIBgMMCQQLCwsSDgYXEgkaFQoUFBQcHBwlHQ4rIhEwJhM2KxU7Lxc9MBgjIyMoKCg0MzI7OztBNBpOPh5OSz9TQiFeSyVkUChqVCpuWCx1Rzl0XC5+ZDFOTk5ST0tWUk1VVVVcXFxqXUplZWVra2twcHB7e3sAWpwIX58JYJ8OY6ERZaIVaKQaa6Yebaghb6klcqopdawxea82fbE4frI+grRFhrZMi7pVkb1alL9dlsBkm8NoncRtocZ0pcl8qsyWBAOZAACcCASIIBmdNiegDge3PB6mPiqBZzODaDSKbjaOcTiUdjuXeDyaez26QiG/TCaAeWihclPATifBUCjIXy/QbzfWej3Yfj+KgWWjgkGui0WxjUa0gVi3kkm6lEq+mEyjkmuzn2e7pnLFnU7eikXOpFHRp1PVqlXarlfesVjjlUrmm03poFDtqVTitFrmuFzqu13ywWD7xWL+y2WDg4OXl5eYmJippZ61rZisrKy0tLS/v7+Crs6FsNCLtNKQt9SWu9aYvNebvtifwdqjw9uox92ryd6yzeG20OPCwsLMzMzU1NTA1ufG2ujN3+zT4+7d6fL/7Mbn5+fs7Ozl7vXp8fbu9Pj09PTy9/r1+Pv+/v7MzMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADn4rtgAAAAnnRSTlP/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AD6H4/gAAAABYktHRP+lB/LFAAAACXBIWXMAAABIAAAASABGyWs+AAADSUlEQVRIx+2WaU8TURSGzyCLQEUxiFYtCEo8Da3sYglQbDUaluISV6pYFdsyop1Or8ElSgg2RSjgArSZ63/13JkOXRBZgn7yTXpmyzwz857lFhb3XW9/CsEi317f2c71/OnZ/+C9gSdDKmNySI2GorQNxiaDpFA4FgrS+WgoxFhwck/gMTjBwmCJ+WCYMQso5SBUoQCcZKwGgClg2QSOt7jp7pnWGQFJ2e0tpFYX5+k3TUn+QTOsqAV/hRRmJngiYAVrYILAkipT+C34GzqJ+AW7BDiBhga4VgdwIFmdNMBKMcAQI3Ctz1cOCmPD4hEKVBX5TpdYfg/m7bhC0YHrFHvQtbY2h840fw9Hzh8tO7CaSZ6V3k2AdWXBNdaKosGtwG78SLED4xSd+I1rbWK37ii5cO58pirCUglYBXhIjVlywWGQoluBl7CT83VE8nUZ28lu3ZUycUlLZ8CVUrgGnpgeR7JgZrUxHVzh9/tjAuzxbFRFM7nwGbGZ8wF083UHLlPqDuZWxSAZrBSXqmbyGBuBEQNM0sFCUQJf8QiyAXbRp7uwA5fI7iXei9ifotzlgiMy3R+NqKpMRiv6gUwVzfTAlAiLyUJkxVWPUAYcR5fWfCGB7jV00GOciJ0an95T5133GDLAKXTMY1/K3j6HPeJ42YEJvrAX8M0M1+y8LvJhnnejURmc92HvH2aFGtuWa4I/Ido1qgbElH48j235YNkiwbhxc6QKpJN56NiN18bOnQ2uCV5BvCRaEC8aqAS2rBp76bSRPFutCT4No8chkMu95vG+ynIve3KHUAvO6i04w2d7dCu6Fwxy00LGCpsJrixlQbAVfL/35Qb3VN5068M1vQW/UrG5U3EHxrXGH4IrJTfAxluqUMWicCjLva/zvC8Mf72388fmfIeIS61UIU60o2jFxbKGxsMwzQvfuKScyTREcxz2ZOV9XDCPtY/6ZoB+X/udzl6Rw2RDWfV7ngceonFxXIqMgj83eXey3Fe7HfRh0bAlondZQJKgXM2rsrsmd2rXK4j6ZHx8PMAmhM/y2CO1oH7vmdx9X0wfZLj7v0q/8Orcv7D8T039s/8VH7bVu2c718NbJrhuBzq2leo3nTlTX62DfwGZkKiGotSUXQAAAABJRU5ErkJggg==" alt="Valid XHTML 1.0 Transitional" height="31" width="88" />
|
||||
</a>
|
||||
</p>
|
||||
</p>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
var xhr_object = null;
|
||||
@ -394,7 +394,6 @@
|
||||
r += ':';
|
||||
r += (t.getSeconds() < 10 ? '0' : '') + t.getSeconds();
|
||||
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
@ -20,14 +20,11 @@ define('REPORT_LEVEL', 1); // 0 reports less false-positives. up to level 5.
|
||||
define('VERSION', '7.0'); // minimum is 7.0
|
||||
define('PHPDIR', realpath(dirname(__FILE__) . '/../..'));
|
||||
|
||||
|
||||
// be sure you have enough memory and stack for PHP. pcre will push the limits!
|
||||
ini_set('pcre.backtrack_limit', 10000000);
|
||||
|
||||
|
||||
// ------------------------ end of config ----------------------------
|
||||
|
||||
|
||||
$API_params = array(
|
||||
'a' => array('zval**'), // array
|
||||
'A' => array('zval**'), // array or object
|
||||
@ -64,7 +61,6 @@ function error($str, $level = 0)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** this updates the global var $line (for error reporting) */
|
||||
function update_lineno($offset)
|
||||
{
|
||||
@ -99,7 +95,6 @@ function update_lineno($offset)
|
||||
} while (true);
|
||||
}
|
||||
|
||||
|
||||
/** parses the sources and fetches its vars name, type and if they are initialized or not */
|
||||
function get_vars($txt)
|
||||
{
|
||||
@ -124,7 +119,6 @@ function get_vars($txt)
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
/** run diagnostic checks against one var. */
|
||||
function check_param($db, $idx, $exp, $optional, $allow_uninit = false)
|
||||
{
|
||||
@ -184,7 +178,6 @@ function get_params($vars, $str)
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
/** run tests on a function. the code is passed in $txt */
|
||||
function check_function($name, $txt, $offset)
|
||||
{
|
||||
@ -291,7 +284,6 @@ function check_function($name, $txt, $offset)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** the main recursion function. splits files in functions and calls the other functions */
|
||||
function recurse($path)
|
||||
{
|
||||
@ -319,7 +311,6 @@ function recurse($path)
|
||||
if (count($split) < 2) continue; // no functions defined on this file
|
||||
array_shift($split); // the first part isn't relevant
|
||||
|
||||
|
||||
// generate the line offsets array
|
||||
$j = 0;
|
||||
$lines = preg_split("/(\r\n?|\n)/S", $txt, -1, PREG_SPLIT_DELIM_CAPTURE);
|
||||
@ -333,7 +324,6 @@ function recurse($path)
|
||||
$GLOBALS['lines_offset'] = $lines_offset;
|
||||
$GLOBALS['current_file'] = $file;
|
||||
|
||||
|
||||
for ($i = 0; $i < count($split); $i+=2) {
|
||||
// if the /* }}} */ comment is found use it to reduce false positives
|
||||
// TODO: check the other indexes
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
|
||||
|
||||
$usage = <<<USAGE
|
||||
|
||||
Usage: php find_tested.php [path_to_test_files] ([extension])
|
||||
@ -16,7 +15,6 @@ A test status of "verify" for a method means that there is at least one other me
|
||||
|
||||
USAGE;
|
||||
|
||||
|
||||
/* method record fields */
|
||||
define("CLASS_NAME", "CLASS_NAME");
|
||||
define("METHOD_NAME", "METHOD_NAME");
|
||||
@ -25,7 +23,6 @@ define("IS_DUPLICATE", "IS_DUPLICATE");
|
||||
define("IS_TESTED", "IS_TESTED");
|
||||
define("TESTS", "TESTS");
|
||||
|
||||
|
||||
// process command line args
|
||||
$num_params = $argc;
|
||||
if ($num_params < 2 || $num_params > 3) {
|
||||
@ -50,7 +47,6 @@ if ($num_params == 3) {
|
||||
$extension_name = false;
|
||||
}
|
||||
|
||||
|
||||
$method_info = populate_method_info();
|
||||
|
||||
if ($extension_name != false) {
|
||||
@ -224,5 +220,4 @@ function map_token_value($x) {
|
||||
return $x[1];
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user