Skip to content

Commit 3362620

Browse files
committed
Trim trailing whitespace in source code files
1 parent edefd16 commit 3362620

File tree

137 files changed

+2749
-2751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2749
-2751
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cache:
1414
- c:\build-cache
1515

1616
environment:
17-
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
17+
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
1818
PHP_BUILD_OBJ_DIR: c:\obj
1919
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
2020
PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1

.gdbinit

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ end
55
document set_ts
66
set the ts resource, it is impossible for gdb to
77
call ts_resource_ex while no process is running,
8-
but we could get the resource from the argument
8+
but we could get the resource from the argument
99
of frame info.
1010
end
1111

@@ -153,7 +153,7 @@ end
153153

154154
define printzv
155155
set $ind = 1
156-
____printzv $arg0 0
156+
____printzv $arg0 0
157157
end
158158

159159
document printzv
@@ -190,7 +190,7 @@ define ____printzv_contents
190190
if $type == 6
191191
printf "string: %s", $zvalue->value.str->val
192192
end
193-
if $type == 7
193+
if $type == 7
194194
printf "array: "
195195
if ! $arg1
196196
set $ind = $ind + 1
@@ -287,7 +287,7 @@ define ____printzv
287287
if $arg1
288288
____printzv_contents $zcontents $arg1
289289
else
290-
____printzv_contents $zcontents 0
290+
____printzv_contents $zcontents 0
291291
end
292292
end
293293

@@ -340,7 +340,7 @@ define ____print_ht
340340
set $n = $n - 1
341341
end
342342
printf "[%d] ", $i
343-
if $p->key
343+
if $p->key
344344
printf "%s => ", $p->key->val
345345
else
346346
printf "%d => ", $p->h
@@ -389,7 +389,7 @@ document print_htptr
389389
end
390390

391391
define print_htstr
392-
set $ind = 0
392+
set $ind = 0
393393
____print_ht $arg0 2
394394
end
395395

@@ -543,10 +543,10 @@ define printzn
543543
if $znode->op_type == 1
544544
set $optype = "IS_CONST"
545545
end
546-
if $znode->op_type == 2
546+
if $znode->op_type == 2
547547
set $optype = "IS_TMP_VAR"
548548
end
549-
if $znode->op_type == 4
549+
if $znode->op_type == 4
550550
set $optype = "IS_VAR"
551551
end
552552
if $znode->op_type == 8
@@ -576,11 +576,11 @@ end
576576

577577
document printzn
578578
print type and content of znode.
579-
usage: printzn &opline->op1
579+
usage: printzn &opline->op1
580580
end
581581

582582
define printzops
583-
printf "op1 => "
583+
printf "op1 => "
584584
printzn &execute_data->opline.op1
585585
printf "op2 => "
586586
printzn &execute_data->opline.op2

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ addons:
2020
- libzip-dev
2121

2222
notifications:
23-
email:
23+
email:
2424
on_failure: change
2525
irc:
2626
template:
@@ -62,7 +62,7 @@ before_script:
6262
- . ./travis/ext/pgsql/setup.sh
6363
- . ./travis/ext/pdo_pgsql/setup.sh
6464

65-
# Run PHPs run-tests.php
65+
# Run PHPs run-tests.php
6666
script:
6767
- ./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
6868

CODING_STANDARDS

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ User Functions/Methods Naming Conventions
112112
of ``parent_*``::
113113

114114
A family of 'foo' functions, for example:
115-
115+
116116
Good:
117117
'foo_select_bar'
118118
'foo_insert_baz'

LICENSE

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
--------------------------------------------------------------------
1+
--------------------------------------------------------------------
22
The PHP License, version 3.01
33
Copyright (c) 1999 - 2018 The PHP Group. All rights reserved.
4-
--------------------------------------------------------------------
4+
--------------------------------------------------------------------
55

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

1010
1. Redistributions of source code must retain the above copyright
1111
notice, this list of conditions and the following disclaimer.
12-
12+
1313
2. Redistributions in binary form must reproduce the above copyright
1414
notice, this list of conditions and the following disclaimer in
1515
the documentation and/or other materials provided with the
1616
distribution.
17-
17+
1818
3. The name "PHP" must not be used to endorse or promote products
1919
derived from this software without prior written permission. For
2020
written permission, please contact [email protected].
21-
21+
2222
4. Products derived from this software may not be called "PHP", nor
2323
may "PHP" appear in their name, without prior written permission
2424
from [email protected]. You may indicate that your software works in
2525
conjunction with PHP by saying "Foo for PHP" instead of calling
2626
it "PHP Foo" or "phpfoo"
27-
27+
2828
5. The PHP Group may publish revised and/or new versions of the
2929
license from time to time. Each version will be given a
3030
distinguishing version number.
@@ -41,27 +41,27 @@ are met:
4141
"This product includes PHP software, freely available from
4242
<http://www.php.net/software/>".
4343

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

57-
--------------------------------------------------------------------
57+
--------------------------------------------------------------------
5858

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

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

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

6767
PHP includes the Zend Engine, freely available at

Makefile.gcov

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ php_lcov.info: lcov-test
6262
rm -rf lcov_data/$$dir ; \
6363
fi; \
6464
done
65-
@echo
65+
@echo
6666
@echo "Generating $@"
6767
@$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
6868

NEWS

+14-14
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ PHP NEWS
148148
(Andrew Nester, Laruence, Anatol)
149149

150150
- iconv:
151-
. Fixed bug #68180 (iconv_mime_decode can return extra characters in a
151+
. Fixed bug #68180 (iconv_mime_decode can return extra characters in a
152152
header). (cmb)
153153
. Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers).
154154
(cmb)
@@ -267,7 +267,7 @@ PHP NEWS
267267
(cmb)
268268

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

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

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

489489
- intl:
490-
. Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead
490+
. Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead
491491
of destination). (andrewnester)
492492

493493
- JSON:
494494
. Added JSON_THROW_ON_ERROR flag. (Andrea)
495495

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

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

@@ -568,7 +568,7 @@ PHP NEWS
568568
to readline_info() if linked against libreadline. (krageon)
569569

570570
- Session:
571-
. Fixed bug #74941 (session fails to start after having headers sent).
571+
. Fixed bug #74941 (session fails to start after having headers sent).
572572
(morozov)
573573

574574
- SimpleXML:
@@ -580,7 +580,7 @@ PHP NEWS
580580
used). (Anton Artamonov)
581581

582582
- SPL:
583-
. Fixed bug #74977 (Appending AppendIterator leads to segfault).
583+
. Fixed bug #74977 (Appending AppendIterator leads to segfault).
584584
(Andrew Nester)
585585
. Fixed bug #75173 (incorrect behavior of AppendIterator::append in foreach
586586
loop). (jhdxr)
@@ -589,19 +589,19 @@ PHP NEWS
589589
. Fixed bug #75878 (RecursiveTreeIterator::setPostfix has wrong signature).
590590
(cmb)
591591
. Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)
592-
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
592+
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
593593
(carusogabriel)
594594

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

598598
- Standard:
599599
. Added is_countable() function. (Gabriel Caruso)
600-
. Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
600+
. Fixed bug #75916 (DNS_CAA record results contain garbage). (Mike,
601601
Philip Sharp)
602602
. Fixed unserialize(), to disable creation of unsupported data structures
603603
through manually crafted strings. (Dmitry)
604-
. Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator
604+
. Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator
605605
that getrandom() is missing). (sarciszewski)
606606
. Fixed bug #74719 (fopen() should accept NULL as context). (Alexander Holman)
607607
. Fixed bug #69948 (path/domain are not sanitized in setcookie). (cmb)

README.EXT_SKEL

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ HOW TO USE IT
1111

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

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

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

2525
SOURCE AND HEADER FILE NAME
2626

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

3030
extension functions (User functions) must be named

README.NEW-OUTPUT-API

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
API adjustment to the old output control code:
22

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

66
Checking output control layers status:
@@ -131,7 +131,7 @@ Output handler hooks
131131
Open questions
132132

133133
Should the userland API be adjusted and unified?
134-
134+
135135
Many bits of the manual (and very first implementation) do not comply
136136
with the behaviour of the current (to be obsoleted) code, thus should
137137
the manual or the behaviour be adjusted?

0 commit comments

Comments
 (0)