Skip to content

Commit

Permalink
Trim trailing whitespace in source code files
Browse files Browse the repository at this point in the history
  • Loading branch information
petk committed Oct 13, 2018
1 parent edefd16 commit 3362620
Show file tree
Hide file tree
Showing 137 changed files with 2,749 additions and 2,751 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cache:
- c:\build-cache

environment:
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
PHP_BUILD_OBJ_DIR: c:\obj
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1
Expand Down
20 changes: 10 additions & 10 deletions .gdbinit
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ end
document set_ts
set the ts resource, it is impossible for gdb to
call ts_resource_ex while no process is running,
but we could get the resource from the argument
but we could get the resource from the argument
of frame info.
end

Expand Down Expand Up @@ -153,7 +153,7 @@ end

define printzv
set $ind = 1
____printzv $arg0 0
____printzv $arg0 0
end

document printzv
Expand Down Expand Up @@ -190,7 +190,7 @@ define ____printzv_contents
if $type == 6
printf "string: %s", $zvalue->value.str->val
end
if $type == 7
if $type == 7
printf "array: "
if ! $arg1
set $ind = $ind + 1
Expand Down Expand Up @@ -287,7 +287,7 @@ define ____printzv
if $arg1
____printzv_contents $zcontents $arg1
else
____printzv_contents $zcontents 0
____printzv_contents $zcontents 0
end
end

Expand Down Expand Up @@ -340,7 +340,7 @@ define ____print_ht
set $n = $n - 1
end
printf "[%d] ", $i
if $p->key
if $p->key
printf "%s => ", $p->key->val
else
printf "%d => ", $p->h
Expand Down Expand Up @@ -389,7 +389,7 @@ document print_htptr
end

define print_htstr
set $ind = 0
set $ind = 0
____print_ht $arg0 2
end

Expand Down Expand Up @@ -543,10 +543,10 @@ define printzn
if $znode->op_type == 1
set $optype = "IS_CONST"
end
if $znode->op_type == 2
if $znode->op_type == 2
set $optype = "IS_TMP_VAR"
end
if $znode->op_type == 4
if $znode->op_type == 4
set $optype = "IS_VAR"
end
if $znode->op_type == 8
Expand Down Expand Up @@ -576,11 +576,11 @@ end

document printzn
print type and content of znode.
usage: printzn &opline->op1
usage: printzn &opline->op1
end

define printzops
printf "op1 => "
printf "op1 => "
printzn &execute_data->opline.op1
printf "op2 => "
printzn &execute_data->opline.op2
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ addons:
- libzip-dev

notifications:
email:
email:
on_failure: change
irc:
template:
Expand Down Expand Up @@ -62,7 +62,7 @@ before_script:
- . ./travis/ext/pgsql/setup.sh
- . ./travis/ext/pdo_pgsql/setup.sh

# Run PHPs run-tests.php
# Run PHPs run-tests.php
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120

Expand Down
2 changes: 1 addition & 1 deletion CODING_STANDARDS
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ User Functions/Methods Naming Conventions
of ``parent_*``::

A family of 'foo' functions, for example:

Good:
'foo_select_bar'
'foo_insert_baz'
Expand Down
26 changes: 13 additions & 13 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
--------------------------------------------------------------------
--------------------------------------------------------------------
The PHP License, version 3.01
Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
--------------------------------------------------------------------
--------------------------------------------------------------------

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

3. The name "PHP" must not be used to endorse or promote products
derived from this software without prior written permission. For
written permission, please contact [email protected].

4. Products derived from this software may not be called "PHP", nor
may "PHP" appear in their name, without prior written permission
from [email protected]. You may indicate that your software works in
conjunction with PHP by saying "Foo for PHP" instead of calling
it "PHP Foo" or "phpfoo"

5. The PHP Group may publish revised and/or new versions of the
license from time to time. Each version will be given a
distinguishing version number.
Expand All @@ -41,27 +41,27 @@ are met:
"This product includes PHP software, freely available from
<http://www.php.net/software/>".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
--------------------------------------------------------------------

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at [email protected].

For more information on the PHP Group and the PHP project,
For more information on the PHP Group and the PHP project,
please see <http://www.php.net>.

PHP includes the Zend Engine, freely available at
Expand Down
2 changes: 1 addition & 1 deletion Makefile.gcov
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ php_lcov.info: lcov-test
rm -rf lcov_data/$$dir ; \
fi; \
done
@echo
@echo
@echo "Generating $@"
@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@

Expand Down
28 changes: 14 additions & 14 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ PHP NEWS
(Andrew Nester, Laruence, Anatol)

- iconv:
. Fixed bug #68180 (iconv_mime_decode can return extra characters in a
. Fixed bug #68180 (iconv_mime_decode can return extra characters in a
header). (cmb)
. Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers).
(cmb)
Expand Down Expand Up @@ -267,7 +267,7 @@ PHP NEWS
(cmb)

- Filter:
. Added the 'add_slashes' sanitization mode (FILTER_SANITIZE_ADD_SLASHES).
. Added the 'add_slashes' sanitization mode (FILTER_SANITIZE_ADD_SLASHES).
(Kalle)
. Fixed bug #76366 (References in sub-array for filtering breaks the filter).
(ZiHang Gao)
Expand All @@ -277,7 +277,7 @@ PHP NEWS
. Added fpm_get_status function. (Till Backhaus)
. Fixed bug #69031 (Long messages into stdout/stderr are truncated
incorrectly) - added new log related FPM configuration options:
log_limit, log_buffering and decorate_workers_output. (Jakub Zelenka)
log_limit, log_buffering and decorate_workers_output. (Jakub Zelenka)

- mbstring:
. Fixed bug #76574 (use of undeclared identifiers INT_MAX and LONG_MAX). (cmb)
Expand Down Expand Up @@ -411,7 +411,7 @@ PHP NEWS

- Core:
. Improved PHP GC. (Dmitry, Nikita)
. Redesigned the old ext_skel program written in PHP, run:
. Redesigned the old ext_skel program written in PHP, run:
'php ext_skel.php' for all options. This means there are no dependencies,
thus making it work on Windows out of the box. (Kalle)
. Removed support for BeOS. (Kalle)
Expand All @@ -428,13 +428,13 @@ PHP NEWS
. Fixed bug #75031 (support append mode in temp/memory streams). (adsr)
. Fixed bug #74860 (Uncaught exceptions not being formatted properly when
error_log set to "syslog"). (Philip Prindeville)
. Fixed bug #75220 (Segfault when calling is_callable on parent).
. Fixed bug #75220 (Segfault when calling is_callable on parent).
(andrewnester)
. Fixed bug #69954 (broken links and unused config items in distributed ini
files). (petk)
. Fixed bug #74922 (Composed class has fatal error with duplicate, equal const
properties). (pmmaga)
. Fixed bug #63911 (identical trait methods raise errors during composition).
. Fixed bug #63911 (identical trait methods raise errors during composition).
(pmmaga)
. Fixed bug #75677 (Clang ignores fastcall calling convention on variadic
function). (Li-Wen Hsu)
Expand Down Expand Up @@ -487,14 +487,14 @@ PHP NEWS
. Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa)

- intl:
. Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead
. Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead
of destination). (andrewnester)

- JSON:
. Added JSON_THROW_ON_ERROR flag. (Andrea)

- LDAP:
. Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay.
. Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay.
(Come)
. Added full support for sending and parsing ldap controls (Come)
. Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
Expand All @@ -503,7 +503,7 @@ PHP NEWS
. Fixed bug #75871 (use pkg-config where available). (pmmaga)

- litespeed:
. Fixed bug #75248 (Binary directory doesn't get created when building
. Fixed bug #75248 (Binary directory doesn't get created when building
only litespeed SAPI). (petk)
. Fixed bug #75251 (Missing program prefix and suffix). (petk)

Expand Down Expand Up @@ -568,7 +568,7 @@ PHP NEWS
to readline_info() if linked against libreadline. (krageon)

- Session:
. Fixed bug #74941 (session fails to start after having headers sent).
. Fixed bug #74941 (session fails to start after having headers sent).
(morozov)

- SimpleXML:
Expand All @@ -580,7 +580,7 @@ PHP NEWS
used). (Anton Artamonov)

- SPL:
. Fixed bug #74977 (Appending AppendIterator leads to segfault).
. Fixed bug #74977 (Appending AppendIterator leads to segfault).
(Andrew Nester)
. Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach
loop). (jhdxr)
Expand All @@ -589,19 +589,19 @@ PHP NEWS
. Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature).
(cmb)
. Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
(carusogabriel)

- SQLite3:
. Updated bundled libsqlite to 3.24.0. (cmb)

- Standard:
. Added is_countable() function. (Gabriel Caruso)
. Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
. Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
Philip Sharp)
. Fixed unserialize(), to disable creation of unsupported data structures
through manually crafted strings. (Dmitry)
. Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator
. Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator
that getrandom() is missing). (sarciszewski)
. Fixed bug #74719 (fopen() should accept NULL as context). (Alexander Holman)
. Fixed bug #69948 (path/domain are not sanitized in setcookie). (cmb)
Expand Down
6 changes: 3 additions & 3 deletions README.EXT_SKEL
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ HOW TO USE IT

and everything you need will be placed in directory ext/extension_name.

If you don't need to test the existence of any external header files,
libraries or functions in them, the extension is ready to be compiled in
If you don't need to test the existence of any external header files,
libraries or functions in them, the extension is ready to be compiled in
PHP. To compile the extension, run the following:

./buildconf; ./configure --enable-extension_name; make
Expand All @@ -24,7 +24,7 @@ HOW TO USE IT

SOURCE AND HEADER FILE NAME

The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h'
The ext_skel.php script generates 'extension_name.c' and 'php_extension_name.h'
as the main source and header files. Keep these names.

extension functions (User functions) must be named
Expand Down
4 changes: 2 additions & 2 deletions README.NEW-OUTPUT-API
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
API adjustment to the old output control code:

Everything now resides beneath the php_output namespace,
Everything now resides beneath the php_output namespace,
and there's an API call for every output handler op.

Checking output control layers status:
Expand Down Expand Up @@ -131,7 +131,7 @@ Output handler hooks
Open questions

Should the userland API be adjusted and unified?

Many bits of the manual (and very first implementation) do not comply
with the behaviour of the current (to be obsoleted) code, thus should
the manual or the behaviour be adjusted?
Expand Down
Loading

0 comments on commit 3362620

Please sign in to comment.