diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:54:08 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:54:08 +0200 |
| commit | 60a69daec60f1886e166e8060556777819c66f98 (patch) | |
| tree | 728557dc23dcef2e95983fd272042912f5c1f712 | |
| parent | 6f343d29a5561c846b1c9d95af56ecb2d659166c (diff) | |
| download | php-git-60a69daec60f1886e166e8060556777819c66f98.tar.gz | |
Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
578 files changed, 195 insertions, 746 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 3e0efe8b67..295eb983e3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,3 @@ - version: "{branch}.build.{build}" image: Visual Studio 2017 @@ -48,4 +47,3 @@ build_script: test_script: - appveyor\test.bat - diff --git a/.gitignore b/.gitignore index 2e45e0a44f..8fea9202f6 100644 --- a/.gitignore +++ b/.gitignore @@ -232,4 +232,3 @@ win32/wsyslog.h # special cases to invert previous ignore rules !ext/fileinfo/libmagic.patch !ext/mbstring/oniguruma.patch - diff --git a/Makefile.frag b/Makefile.frag index cbea640966..7c65cfab3c 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,4 +1,3 @@ - # # Zend # diff --git a/Makefile.gcov b/Makefile.gcov index b290d777d8..671fedab40 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -1,4 +1,3 @@ - # # LCOV # @@ -2429,4 +2429,3 @@ PHP NEWS php_stream_zip_opener). (Stas) . ZipArchive::addGlob() will throw an instance of Error instead of resulting in a fatal error if glob support is not available. (Aaron Piotrowski) - diff --git a/README.EXT_SKEL b/README.EXT_SKEL index 7ec3f8e194..b4ba71323d 100644 --- a/README.EXT_SKEL +++ b/README.EXT_SKEL @@ -185,4 +185,3 @@ PHP_FUNCTION(module_name_drawtext) php_error(E_WARNING, "module_name_drawtext: not yet implemented"); } /* }}} */ - diff --git a/README.REDIST.BINS b/README.REDIST.BINS index b2536d05bc..0f0bc5d0b6 100644 --- a/README.REDIST.BINS +++ b/README.REDIST.BINS @@ -414,4 +414,3 @@ 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. - diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index df6a9f514e..4a1a023012 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -346,4 +346,3 @@ New Release Manager Checklist 5. Request moderation access to announce@php.net and primary-qa-tester@lists.php.net lists, to be able to moderate your release announcements. All the announcements should be sent from the @php.net alias. - diff --git a/README.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS index 0baf808604..a94fed0c25 100644 --- a/README.SELF-CONTAINED-EXTENSIONS +++ b/README.SELF-CONTAINED-EXTENSIONS @@ -167,4 +167,3 @@ PECL SITE CONFORMITY This macros has to be used within your foo_module_entry to indicate the extension version. - diff --git a/README.TESTING2 b/README.TESTING2 index 88a6e4c985..c263b87150 100644 --- a/README.TESTING2 +++ b/README.TESTING2 @@ -132,6 +132,3 @@ regular expect sections. For example: --EXPECTHEADERS-- Status: 404 - - - diff --git a/README.WIN32-BUILD-SYSTEM b/README.WIN32-BUILD-SYSTEM index bc113a0340..e46d0e4210 100644 --- a/README.WIN32-BUILD-SYSTEM +++ b/README.WIN32-BUILD-SYSTEM @@ -3,4 +3,3 @@ The Win32 Build System. See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 vim:tw=78:sw=1:ts=1:et - @@ -37,4 +37,3 @@ Guidelines for contributors - [README.GIT-RULES](/README.GIT-RULES) - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES) - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS) - diff --git a/TSRM/acinclude.m4 b/TSRM/acinclude.m4 index fcf97fd352..f886570c77 100644 --- a/TSRM/acinclude.m4 +++ b/TSRM/acinclude.m4 @@ -1,5 +1,3 @@ - AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[ LIBTOOL='$(SHELL) $(top_builddir)/libtool $1' ]) - diff --git a/TSRM/config.w32 b/TSRM/config.w32 index e7d3f3b976..cfbd169127 100644 --- a/TSRM/config.w32 +++ b/TSRM/config.w32 @@ -3,4 +3,3 @@ ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c"); ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - diff --git a/TSRM/m4/gethostbyname.m4 b/TSRM/m4/gethostbyname.m4 index ac3eb06018..3f598849bd 100644 --- a/TSRM/m4/gethostbyname.m4 +++ b/TSRM/m4/gethostbyname.m4 @@ -194,4 +194,3 @@ esac AC_LANG_POP ]) dnl end AC_DEFUN - diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 2d613f7d61..d50e9e5746 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -80,4 +80,3 @@ PHP 7.2 INTERNALS UPGRADE NOTES - OpenSSL: . Windows builds ship with OpenSSL 1.1 by default, lower versions are still supported with custom deps. - diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 5f7f25df67..fcf3495e30 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -53,4 +53,3 @@ depend: zend_execute.lo: $(srcdir)/zend_execute.c $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c - diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM index bf5f57cffc..da29b49b17 100644 --- a/Zend/README.ZEND_VM +++ b/Zend/README.ZEND_VM @@ -105,4 +105,3 @@ Zend Engine II currently includes two executors during the build process, one is the specialized version and the other is the old one non-specialized with function handlers. By default Zend Engine II uses the specialized one but you can switch to the old executor at runtime by calling zend_vm_use_old_executor(). - diff --git a/Zend/buildconf b/Zend/buildconf index fe8dee6f76..b2e0a2958c 100755 --- a/Zend/buildconf +++ b/Zend/buildconf @@ -30,4 +30,3 @@ if cmp configure.old configure > /dev/null 2>&1; then else echo "buildconf: created or modified ${1}configure" fi - diff --git a/Zend/tests/bug40236.inc b/Zend/tests/bug40236.inc index fc03349f7e..a8b97e691e 100644 --- a/Zend/tests/bug40236.inc +++ b/Zend/tests/bug40236.inc @@ -7,4 +7,4 @@ function func5() { } function func6() { } function func7() { } print ("ok\n"); -?>
\ No newline at end of file +?> diff --git a/Zend/tests/methods-on-non-objects-nested.inc b/Zend/tests/methods-on-non-objects-nested.inc index 8511414b82..63d1c0d0da 100755 --- a/Zend/tests/methods-on-non-objects-nested.inc +++ b/Zend/tests/methods-on-non-objects-nested.inc @@ -1,4 +1,4 @@ <?php function nested() { throw new LogicException('Should not be called'); -}
\ No newline at end of file +} diff --git a/Zend/tests/nowdoc.inc b/Zend/tests/nowdoc.inc index 98f9fbaacf..c903740e24 100644 --- a/Zend/tests/nowdoc.inc +++ b/Zend/tests/nowdoc.inc @@ -8,4 +8,3 @@ class d { public function __construct() { $this->d = 4; } }; $d = new d; ?> - diff --git a/Zend/tests/return_types/classes.php.inc b/Zend/tests/return_types/classes.php.inc index e4b691e353..34abd8490a 100644 --- a/Zend/tests/return_types/classes.php.inc +++ b/Zend/tests/return_types/classes.php.inc @@ -2,4 +2,3 @@ class A {} class B extends A {} - diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index 49fe8e49a0..e1eed23a4c 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -242,4 +242,3 @@ ZEND_API void zend_strip(void) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index 8eda5a48b0..2bbfc1fa92 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -114,4 +114,3 @@ ZEND_API int zend_vm_kind(void) { return ZEND_VM_KIND; } - diff --git a/appveyor/build.bat b/appveyor/build.bat index 36e8fbdd4e..0beee511ee 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -42,4 +42,3 @@ cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index ede3fd2eb4..e39de73d62 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -68,4 +68,3 @@ nmake /NOLOGO if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/test.bat b/appveyor/test.bat index eb61bece66..6d4c5fa408 100644 --- a/appveyor/test.bat +++ b/appveyor/test.bat @@ -10,4 +10,3 @@ cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index 60eb6dc164..8d0d8ebf1f 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -86,4 +86,3 @@ cd "%APPVEYOR_BUILD_FOLDER%" nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp" exit /b %errorlevel% - diff --git a/build/build2.mk b/build/build2.mk index 8396d73e8c..1742bdf01d 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -52,4 +52,3 @@ configure: aclocal.m4 configure.ac $(config_m4_files) @echo rebuilding $@ @rm -f $@ $(PHP_AUTOCONF) -f $(SUPPRESS_WARNINGS) - diff --git a/build/genif.sh b/build/genif.sh index e2bc6ac89d..4a9c0faee7 100644 --- a/build/genif.sh +++ b/build/genif.sh @@ -38,5 +38,3 @@ cat $infile | \ -e "s'@EXT_MODULE_PTRS@'$module_ptrs'" \ -e 's/@NEWLINE@/\ /g' - - diff --git a/buildconf.bat b/buildconf.bat index 27a4bcb2d1..698d80a823 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -4,4 +4,4 @@ SET PHP_BUILDCONF_PATH=%~dp0 copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul SET PHP_SDK_SCRIPT_PATH= -IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script, configure script was not copied) ELSE (echo Now run 'configure --help')
\ No newline at end of file +IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script, configure script was not copied) ELSE (echo Now run 'configure --help') diff --git a/ext/bcmath/libbcmath/AUTHORS b/ext/bcmath/libbcmath/AUTHORS index 982db9dc40..f2d831cf65 100644 --- a/ext/bcmath/libbcmath/AUTHORS +++ b/ext/bcmath/libbcmath/AUTHORS @@ -1,3 +1 @@ Phil Nelson <philnelson@acm.org> wrote bcmath library. - - diff --git a/ext/bcmath/libbcmath/COPYING.LIB b/ext/bcmath/libbcmath/COPYING.LIB index c4792dd27a..aa4f4aca85 100644 --- a/ext/bcmath/libbcmath/COPYING.LIB +++ b/ext/bcmath/libbcmath/COPYING.LIB @@ -1,4 +1,3 @@ - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 @@ -511,5 +510,3 @@ Random Hacker. Ty Coon, President of Vice That's all there is to it! - - diff --git a/ext/bcmath/libbcmath/ChangeLog b/ext/bcmath/libbcmath/ChangeLog index b8d459a2bb..eea6b016e2 100644 --- a/ext/bcmath/libbcmath/ChangeLog +++ b/ext/bcmath/libbcmath/ChangeLog @@ -7,4 +7,3 @@ Wed Jun 7 09:39:02 2000 Phil Nelson <phil@cs.wwu.edu> 2000-05-21 Phil Nelson <phil@cs.wwu.edu> * Initial setup of bcmath library., calling it version 0.1. - diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 1b06b301ba..423600ac76 100644 --- a/ext/bcmath/libbcmath/FAQ +++ b/ext/bcmath/libbcmath/FAQ @@ -18,4 +18,3 @@ calculate an exact number of digits after the decimal point regardless of the number of digits in the integer part. GMP floats have a "fixed, but arbitrary" mantissa and so multiplying two floats will end up dropping digits BC must calculate. - diff --git a/ext/bcmath/libbcmath/Makefile.am b/ext/bcmath/libbcmath/Makefile.am index e5be8201b3..066be6df50 100644 --- a/ext/bcmath/libbcmath/Makefile.am +++ b/ext/bcmath/libbcmath/Makefile.am @@ -9,4 +9,3 @@ dist-hook: cp $(srcdir)/doc/bcmath.1 $(distdir)/doc cp $(srcdir)/src/private.h $(distdir)/src cp $(srcdir)/FAQ $(distdir) - diff --git a/ext/bcmath/libbcmath/acconfig.h b/ext/bcmath/libbcmath/acconfig.h index 4d301dcacf..74ee5ddaa8 100644 --- a/ext/bcmath/libbcmath/acconfig.h +++ b/ext/bcmath/libbcmath/acconfig.h @@ -6,4 +6,3 @@ /* Define to `size_t' if <sys/types.h> and <stddef.h> don't define. */ #undef ptrdiff_t - diff --git a/ext/bcmath/libbcmath/aclocal.m4 b/ext/bcmath/libbcmath/aclocal.m4 index e60c9eb55c..71ebc0fa84 100644 --- a/ext/bcmath/libbcmath/aclocal.m4 +++ b/ext/bcmath/libbcmath/aclocal.m4 @@ -124,4 +124,3 @@ for am_file in <<$1>>; do am_indx=`expr "<<$>>am_indx" + 1` done<<>>dnl>>) changequote([,]))]) - diff --git a/ext/bcmath/libbcmath/config.h.in b/ext/bcmath/libbcmath/config.h.in index 21cfb9255f..d9572c474d 100644 --- a/ext/bcmath/libbcmath/config.h.in +++ b/ext/bcmath/libbcmath/config.h.in @@ -38,4 +38,3 @@ /* Version number of package */ #undef VERSION - diff --git a/ext/bcmath/libbcmath/configure b/ext/bcmath/libbcmath/configure index 0b74129785..7b766e09e8 100644 --- a/ext/bcmath/libbcmath/configure +++ b/ext/bcmath/libbcmath/configure @@ -1855,5 +1855,3 @@ EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - - diff --git a/ext/bcmath/libbcmath/configure.ac b/ext/bcmath/libbcmath/configure.ac index 3da89e949f..2e5333136e 100644 --- a/ext/bcmath/libbcmath/configure.ac +++ b/ext/bcmath/libbcmath/configure.ac @@ -15,4 +15,3 @@ AC_TYPE_SIZE_T AC_CHECK_TYPE(ptrdiff_t, size_t) AC_OUTPUT(Makefile src/Makefile doc/Makefile) - diff --git a/ext/bcmath/libbcmath/src/add.c b/ext/bcmath/libbcmath/src/add.c index ade5b5969a..150f27c53c 100644 --- a/ext/bcmath/libbcmath/src/add.c +++ b/ext/bcmath/libbcmath/src/add.c @@ -85,4 +85,3 @@ bc_add (n1, n2, result, scale_min) bc_free_num (result); *result = sum; } - diff --git a/ext/bcmath/libbcmath/src/compare.c b/ext/bcmath/libbcmath/src/compare.c index 6217ef1af3..cb7d04e071 100644 --- a/ext/bcmath/libbcmath/src/compare.c +++ b/ext/bcmath/libbcmath/src/compare.c @@ -158,4 +158,3 @@ bc_compare (n1, n2) { return _bc_do_compare (n1, n2, TRUE, FALSE); } - diff --git a/ext/bcmath/libbcmath/src/div.c b/ext/bcmath/libbcmath/src/div.c index df5de29919..b326ea1250 100644 --- a/ext/bcmath/libbcmath/src/div.c +++ b/ext/bcmath/libbcmath/src/div.c @@ -268,4 +268,3 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale) return 0; /* Everything is OK. */ } - diff --git a/ext/bcmath/libbcmath/src/divmod.c b/ext/bcmath/libbcmath/src/divmod.c index 08c2f8a2a2..848a4cc850 100644 --- a/ext/bcmath/libbcmath/src/divmod.c +++ b/ext/bcmath/libbcmath/src/divmod.c @@ -84,4 +84,3 @@ bc_modulo (bc_num num1, bc_num num2, bc_num *result, int scale) { return bc_divmod (num1, num2, NULL, result, scale); } - diff --git a/ext/bcmath/libbcmath/src/doaddsub.c b/ext/bcmath/libbcmath/src/doaddsub.c index cef0fdbf1b..991c294e99 100644 --- a/ext/bcmath/libbcmath/src/doaddsub.c +++ b/ext/bcmath/libbcmath/src/doaddsub.c @@ -229,4 +229,3 @@ _bc_do_sub (n1, n2, scale_min) _bc_rm_leading_zeros (diff); return diff; } - diff --git a/ext/bcmath/libbcmath/src/int2num.c b/ext/bcmath/libbcmath/src/int2num.c index a8965f6040..79a6e19075 100644 --- a/ext/bcmath/libbcmath/src/int2num.c +++ b/ext/bcmath/libbcmath/src/int2num.c @@ -81,4 +81,3 @@ bc_int2num (num, val) while (ix-- > 0) *vptr++ = *--bptr; } - diff --git a/ext/bcmath/libbcmath/src/nearzero.c b/ext/bcmath/libbcmath/src/nearzero.c index 1f2f0708cc..933e501108 100644 --- a/ext/bcmath/libbcmath/src/nearzero.c +++ b/ext/bcmath/libbcmath/src/nearzero.c @@ -66,4 +66,3 @@ bc_is_near_zero (num, scale) else return TRUE; } - diff --git a/ext/bcmath/libbcmath/src/neg.c b/ext/bcmath/libbcmath/src/neg.c index 619a59bb05..65081dbef6 100644 --- a/ext/bcmath/libbcmath/src/neg.c +++ b/ext/bcmath/libbcmath/src/neg.c @@ -46,4 +46,3 @@ bc_is_neg (num) { return num->n_sign == MINUS; } - diff --git a/ext/bcmath/libbcmath/src/num2long.c b/ext/bcmath/libbcmath/src/num2long.c index be84986d23..81e82a6fac 100644 --- a/ext/bcmath/libbcmath/src/num2long.c +++ b/ext/bcmath/libbcmath/src/num2long.c @@ -67,4 +67,3 @@ bc_num2long (num) else return (-val); } - diff --git a/ext/bcmath/libbcmath/src/raise.c b/ext/bcmath/libbcmath/src/raise.c index c625d4e526..bf61814a33 100644 --- a/ext/bcmath/libbcmath/src/raise.c +++ b/ext/bcmath/libbcmath/src/raise.c @@ -121,4 +121,3 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale) } bc_free_num (&power); } - diff --git a/ext/bcmath/libbcmath/src/rmzero.c b/ext/bcmath/libbcmath/src/rmzero.c index 1b81601b20..93cc26d12d 100644 --- a/ext/bcmath/libbcmath/src/rmzero.c +++ b/ext/bcmath/libbcmath/src/rmzero.c @@ -52,4 +52,3 @@ _bc_rm_leading_zeros (num) num->n_len--; } } - diff --git a/ext/bcmath/libbcmath/src/sqrt.c b/ext/bcmath/libbcmath/src/sqrt.c index 265d75b5fb..a7c4d732a6 100644 --- a/ext/bcmath/libbcmath/src/sqrt.c +++ b/ext/bcmath/libbcmath/src/sqrt.c @@ -126,4 +126,3 @@ bc_sqrt (bc_num *num, int scale) bc_free_num (&diff); return 1; } - diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c index 62544de80e..f38d341570 100644 --- a/ext/bcmath/libbcmath/src/str2num.c +++ b/ext/bcmath/libbcmath/src/str2num.c @@ -109,4 +109,3 @@ bc_str2num (bc_num *num, char *str, int scale) if (bc_is_zero (*num)) (*num)->n_sign = PLUS; } - diff --git a/ext/bcmath/libbcmath/src/sub.c b/ext/bcmath/libbcmath/src/sub.c index b63f1bc90a..2278b0f14f 100644 --- a/ext/bcmath/libbcmath/src/sub.c +++ b/ext/bcmath/libbcmath/src/sub.c @@ -87,4 +87,3 @@ bc_sub (n1, n2, result, scale_min) bc_free_num (result); *result = diff; } - diff --git a/ext/bcmath/libbcmath/src/zero.c b/ext/bcmath/libbcmath/src/zero.c index ffb5497546..d732dddfcd 100644 --- a/ext/bcmath/libbcmath/src/zero.c +++ b/ext/bcmath/libbcmath/src/zero.c @@ -61,4 +61,3 @@ bc_is_zero (bc_num num) else return TRUE; } - diff --git a/ext/calendar/dow.c b/ext/calendar/dow.c index 44f0490ed1..0e055183a4 100644 --- a/ext/calendar/dow.c +++ b/ext/calendar/dow.c @@ -1,4 +1,3 @@ - /* $selId: dow.c,v 2.0 1995/10/24 01:13:06 lees Exp $ * Copyright 1993-1995, Scott E. Lee, all rights reserved. * Permission granted to use, copy, modify, distribute and sell so long as diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index 03db8fd45d..fda6cf3384 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -243,4 +243,3 @@ fail: } return NULL; } - diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 4fff134178..29ae28efc2 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -563,4 +563,3 @@ zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *objec return &I->iter; } - diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c index 7302871bcf..a0fa3c0749 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -604,5 +604,3 @@ int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int pri return ret; } - - diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index a746d61837..a3af63120f 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -1124,4 +1124,3 @@ PHP_FUNCTION(variant_cast) VariantClear(&vres); } /* }}} */ - diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index 347a495831..f21af9b503 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -645,5 +645,3 @@ PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val) return (IDispatch*)disp; } - - diff --git a/ext/ctype/ctype.xml b/ext/ctype/ctype.xml index 312c195e05..ac5934d784 100644 --- a/ext/ctype/ctype.xml +++ b/ext/ctype/ctype.xml @@ -242,4 +242,3 @@ sgml-local-catalogs:nil sgml-local-ecat-files:nil End: --> - diff --git a/ext/curl/tests/server.inc b/ext/curl/tests/server.inc index 124e0f898c..b7c1570195 100644 --- a/ext/curl/tests/server.inc +++ b/ext/curl/tests/server.inc @@ -83,4 +83,3 @@ function curl_cli_server_start() { return PHP_CURL_SERVER_ADDRESS; } - diff --git a/ext/dba/CREDITS b/ext/dba/CREDITS index 370b3ea271..e7748197ea 100644 --- a/ext/dba/CREDITS +++ b/ext/dba/CREDITS @@ -1,2 +1,2 @@ DBA -Sascha Schumann, Marcus Boerger
\ No newline at end of file +Sascha Schumann, Marcus Boerger diff --git a/ext/dba/README b/ext/dba/README index 3d23fb914c..ec0610b71f 100755 --- a/ext/dba/README +++ b/ext/dba/README @@ -51,4 +51,4 @@ This shows whether your combination of handlers works. Most problematic are dbm and ndbm which conflict with many installations. The reason for this is that on several systems these libraries are part of more than one other library. The configuration test only prevents you from configuring -malfaunctioning single handlers but not combinations.
\ No newline at end of file +malfaunctioning single handlers but not combinations. diff --git a/ext/dba/tests/dba_handler.inc b/ext/dba/tests/dba_handler.inc index 9792f00829..51f27050ca 100644 --- a/ext/dba/tests/dba_handler.inc +++ b/ext/dba/tests/dba_handler.inc @@ -95,4 +95,4 @@ do { } } while(1); -?>
\ No newline at end of file +?> diff --git a/ext/dom/examples/relaxNG.php b/ext/dom/examples/relaxNG.php index d265fd988e..219cf8aa72 100644 --- a/ext/dom/examples/relaxNG.php +++ b/ext/dom/examples/relaxNG.php @@ -8,4 +8,4 @@ if (!$dom->relaxNGValidate('relaxNG.rng')) { print "Document is valid"; } -?>
\ No newline at end of file +?> diff --git a/ext/dom/examples/relaxNG.xml b/ext/dom/examples/relaxNG.xml index 6b0cac1225..5d9f31fee0 100644 --- a/ext/dom/examples/relaxNG.xml +++ b/ext/dom/examples/relaxNG.xml @@ -1 +1 @@ -<TEI.2>hello</TEI.2>
\ No newline at end of file +<TEI.2>hello</TEI.2> diff --git a/ext/dom/examples/shipping.php b/ext/dom/examples/shipping.php index 5205fd2014..cc7a1b896e 100644 --- a/ext/dom/examples/shipping.php +++ b/ext/dom/examples/shipping.php @@ -8,4 +8,4 @@ if (!$dom->schemaValidate('shipping.xsd')) { print "Document is valid"; } -?>
\ No newline at end of file +?> diff --git a/ext/dom/examples/shipping.xml b/ext/dom/examples/shipping.xml index dc8a09e301..1faeaf9f4e 100644 --- a/ext/dom/examples/shipping.xml +++ b/ext/dom/examples/shipping.xml @@ -18,4 +18,4 @@ <price>9.90</price> </item> </items> -</shipOrder>
\ No newline at end of file +</shipOrder> diff --git a/ext/dom/tests/bug67081_0.xml b/ext/dom/tests/bug67081_0.xml index 604eea57b1..160e9d31c3 100644 --- a/ext/dom/tests/bug67081_0.xml +++ b/ext/dom/tests/bug67081_0.xml @@ -3,4 +3,3 @@ <!ELEMENT a EMPTY> ]> <a></a> - diff --git a/ext/dom/tests/bug67081_1.xml b/ext/dom/tests/bug67081_1.xml index 7ae542e977..f699805f64 100644 --- a/ext/dom/tests/bug67081_1.xml +++ b/ext/dom/tests/bug67081_1.xml @@ -4,4 +4,3 @@ <!ELEMENT b EMPTY> ]> <a></a> - diff --git a/ext/dom/tests/bug67081_2.xml b/ext/dom/tests/bug67081_2.xml index c10af0966c..baa9870212 100644 --- a/ext/dom/tests/bug67081_2.xml +++ b/ext/dom/tests/bug67081_2.xml @@ -2,4 +2,3 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <a></a> - diff --git a/ext/dom/tests/dom.xml b/ext/dom/tests/dom.xml index 09ac674e55..c7bbc55413 100644 --- a/ext/dom/tests/dom.xml +++ b/ext/dom/tests/dom.xml @@ -5,4 +5,4 @@ ]> <root> <foo bar="" /> -</root>
\ No newline at end of file +</root> diff --git a/ext/dom/tests/nsdoc.xml b/ext/dom/tests/nsdoc.xml index 9503fd8c5b..9153729d1a 100644 --- a/ext/dom/tests/nsdoc.xml +++ b/ext/dom/tests/nsdoc.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <root xmlns="http://ns" xmlns:ns2="http://ns2"> <ns2:child /> -</root>
\ No newline at end of file +</root> diff --git a/ext/dom/tests/skipif.inc b/ext/dom/tests/skipif.inc index 08fd695d97..16ab73febb 100644 --- a/ext/dom/tests/skipif.inc +++ b/ext/dom/tests/skipif.inc @@ -1 +1 @@ -<?php if (!extension_loaded('dom')) die('skip dom extension not available');?>
\ No newline at end of file +<?php if (!extension_loaded('dom')) die('skip dom extension not available');?> diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h index 00fc8ea4a6..20fd8ea26a 100644 --- a/ext/enchant/php_enchant.h +++ b/ext/enchant/php_enchant.h @@ -79,4 +79,3 @@ PHP_FUNCTION(enchant_dict_quick_check); * indent-tabs-mode: t * End: */ - diff --git a/ext/exif/config.w32 b/ext/exif/config.w32 index ad000c4251..3777028b85 100644 --- a/ext/exif/config.w32 +++ b/ext/exif/config.w32 @@ -11,4 +11,4 @@ if(PHP_EXIF != 'no') EXTENSION('exif', 'exif.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); } -}
\ No newline at end of file +} diff --git a/ext/exif/example.php b/ext/exif/example.php index e34dc05f6d..678500f67c 100644 --- a/ext/exif/example.php +++ b/ext/exif/example.php @@ -20,4 +20,4 @@ foreach($exif as $key=>$section) { } ?> </body> -</html>
\ No newline at end of file +</html> diff --git a/ext/exif/test.php b/ext/exif/test.php index 907b9ea080..3523470664 100644 --- a/ext/exif/test.php +++ b/ext/exif/test.php @@ -1,3 +1,3 @@ <?php include 'test.txt'; -?>
\ No newline at end of file +?> diff --git a/ext/exif/test.txt b/ext/exif/test.txt index 1c12b509e6..9fd705636b 100644 --- a/ext/exif/test.txt +++ b/ext/exif/test.txt @@ -362,4 +362,4 @@ if (function_exists('exif_read_data')) { } ?> </body> -</html>
\ No newline at end of file +</html> diff --git a/ext/ext_skel_win32.php b/ext/ext_skel_win32.php index ba44ae6089..64be05c1f5 100644 --- a/ext/ext_skel_win32.php +++ b/ext/ext_skel_win32.php @@ -49,4 +49,3 @@ if ($fp) { } ?> - diff --git a/ext/fileinfo/Makefile.frag b/ext/fileinfo/Makefile.frag index 5af690a9b4..ba84e9a9f5 100644 --- a/ext/fileinfo/Makefile.frag +++ b/ext/fileinfo/Makefile.frag @@ -1,2 +1 @@ - $(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c diff --git a/ext/filter/docs/filter.txt b/ext/filter/docs/filter.txt index a5d4bce41f..a641b76ec6 100644 --- a/ext/filter/docs/filter.txt +++ b/ext/filter/docs/filter.txt @@ -328,4 +328,3 @@ boolean callback(&$value, $characterset); Version: $Id$ .. vim: et syn=rst tw=78 - diff --git a/ext/filter/docs/input_get_args.php b/ext/filter/docs/input_get_args.php index b580524489..de8daacab7 100644 --- a/ext/filter/docs/input_get_args.php +++ b/ext/filter/docs/input_get_args.php @@ -38,4 +38,3 @@ $myinputs = input_get_args($args, INPUT_POST); $myinputs = input_get_args($args, INPUT_DATA, $data); var_dump($myinputs); - diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c index 51020a3c71..86ac23cc2c 100644 --- a/ext/gd/gd_compat.c +++ b/ext/gd/gd_compat.c @@ -63,4 +63,3 @@ int overflow2(int a, int b) } return 0; } - diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index fa76f4c159..834d639552 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -389,4 +389,3 @@ PHP_NAMED_FUNCTION(zif_bind_textdomain_codeset) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 index e56b66fa2d..aa37c121a6 100644 --- a/ext/hash/config.w32 +++ b/ext/hash/config.w32 @@ -32,4 +32,3 @@ if (PHP_HASH != "no") { WARNING("hash not enabled; libraries and headers not found"); } } - diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 1214688fea..f22fa56403 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1501,4 +1501,3 @@ ZEND_GET_MODULE(hash) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index 3fd91038b0..d34b47feae 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -25,4 +25,3 @@ if (PHP_ICONV != "no") { PHP_ICONV = "no"; } } - diff --git a/ext/iconv/tests/test.inc b/ext/iconv/tests/test.inc index 78f180462f..68d2a3e10c 100644 --- a/ext/iconv/tests/test.inc +++ b/ext/iconv/tests/test.inc @@ -4,4 +4,4 @@ // $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so"; // @dl("iconv$dlext"); //} -?>
\ No newline at end of file +?> diff --git a/ext/imap/IMAP_Win32_HOWTO.txt b/ext/imap/IMAP_Win32_HOWTO.txt index 88c4669486..901f2b8e18 100644 --- a/ext/imap/IMAP_Win32_HOWTO.txt +++ b/ext/imap/IMAP_Win32_HOWTO.txt @@ -27,5 +27,3 @@ client library ready (cclient.lib). Start Visual Studio, load php_modules.dsw, select the IMAP projects, and build it. - - diff --git a/ext/imap/tests/README b/ext/imap/tests/README index 0e554e94c0..99424b3995 100644 --- a/ext/imap/tests/README +++ b/ext/imap/tests/README @@ -1,4 +1,3 @@ - Many of the tests in this directory require a mail server to be running, if there is no mail server the test will skip and warn, see skipif.inc for details. To make the tests run parameters in the skipif.inc and imap_include.inc file will need to be changed to match the local mailserver configuration. @@ -39,7 +38,3 @@ auth default { user = root } - - - - diff --git a/ext/imap/tests/clean.inc b/ext/imap/tests/clean.inc index 2557489ba1..4f381bf893 100644 --- a/ext/imap/tests/clean.inc +++ b/ext/imap/tests/clean.inc @@ -22,4 +22,4 @@ foreach($mailboxes as $value) { } imap_close($imap_stream, CL_EXPUNGE); -?>
\ No newline at end of file +?> diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp index bd2baee776..4da00b0221 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -241,4 +241,3 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func) return rv; } - diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h index d6b7c20719..6d15145516 100644 --- a/ext/intl/common/common_date.h +++ b/ext/intl/common/common_date.h @@ -37,4 +37,3 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz, U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func); #endif /* COMMON_DATE_H */ - diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp index 858cbf5d4d..fec8eb1a67 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.cpp +++ b/ext/intl/dateformat/dateformat_attrcpp.cpp @@ -245,4 +245,3 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) RETURN_TRUE; } /* }}} */ - diff --git a/ext/intl/dateformat/dateformat_attrcpp.h b/ext/intl/dateformat/dateformat_attrcpp.h index c8e4e5b702..ab69914540 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.h +++ b/ext/intl/dateformat/dateformat_attrcpp.h @@ -30,4 +30,3 @@ PHP_FUNCTION(datefmt_set_calendar); PHP_FUNCTION(datefmt_get_calendar_object); #endif /* DATEFORMAT_ATTRCPP_H */ - diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c index 2d1e78b512..5e51796cad 100644 --- a/ext/intl/dateformat/dateformat_format.c +++ b/ext/intl/dateformat/dateformat_format.c @@ -188,4 +188,3 @@ PHP_FUNCTION(datefmt_format) } /* }}} */ - diff --git a/ext/intl/dateformat/dateformat_helpers.h b/ext/intl/dateformat/dateformat_helpers.h index eb90c99169..a2a146b7d7 100644 --- a/ext/intl/dateformat/dateformat_helpers.h +++ b/ext/intl/dateformat/dateformat_helpers.h @@ -36,4 +36,3 @@ int datefmt_process_calendar_arg(zval* calendar_zv, bool& calendar_owned); #endif /* DATEFORMAT_HELPERS_H */ - diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c index bdf9a1e32c..a9d9ec9954 100644 --- a/ext/intl/dateformat/dateformat_parse.c +++ b/ext/intl/dateformat/dateformat_parse.c @@ -208,4 +208,3 @@ PHP_FUNCTION(datefmt_localtime) } } /* }}} */ - diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt index 316d81357c..b4feb2ae15 100644 --- a/ext/intl/doc/Tutorial.txt +++ b/ext/intl/doc/Tutorial.txt @@ -236,4 +236,3 @@ length and string comparison string comparison performance. NUMERIC_COLLATION - When turned on, this attribute generates a collation key for the numeric value of substrings of digits. This is a way to get '100' to sort AFTER '2'. - diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php index 91f4869166..75ad7a04b5 100644 --- a/ext/intl/doc/grapheme_api.php +++ b/ext/intl/doc/grapheme_api.php @@ -128,5 +128,3 @@ function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0, &$next) {} ?> - - diff --git a/ext/intl/doc/normalizer_api.php b/ext/intl/doc/normalizer_api.php index a9bb566e67..21b02a9109 100644 --- a/ext/intl/doc/normalizer_api.php +++ b/ext/intl/doc/normalizer_api.php @@ -88,5 +88,3 @@ class Normalizer { ?> - - diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index fd03279390..028c7907c1 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -907,4 +907,3 @@ PHP_FUNCTION(grapheme_extract) * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index d81060b5a1..3765ffe424 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -407,4 +407,3 @@ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *stat * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/intl/tests/resourcebundle.build b/ext/intl/tests/resourcebundle.build index 560dc8fb45..273e4407b7 100644 --- a/ext/intl/tests/resourcebundle.build +++ b/ext/intl/tests/resourcebundle.build @@ -30,4 +30,4 @@ file_put_contents("$here/_files/res_index.txt", $res_index); passthru( ICU_DIR."genrb -s $here/_files/ -d $here/_files/resourcebundle res_index.txt"); -// passthru(ICU_DIR."icupkg -tl -a $here/rb.txt -s $here/_files -d $here/_files new $here/_files/resourcebundle.dat");
\ No newline at end of file +// passthru(ICU_DIR."icupkg -tl -a $here/rb.txt -s $here/_files -d $here/_files new $here/_files/resourcebundle.dat"); diff --git a/ext/intl/tests/resourcebundle.inc b/ext/intl/tests/resourcebundle.inc index 2ec138bb7d..a7727a3ec8 100644 --- a/ext/intl/tests/resourcebundle.inc +++ b/ext/intl/tests/resourcebundle.inc @@ -10,4 +10,3 @@ function debug( $res ) { } return $ret . sprintf( "%5d: %s\n", intl_get_error_code(), intl_get_error_message() ); } - diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index 1add74b2b5..d9f257dd68 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -778,4 +778,3 @@ int php_uchar_minit(INIT_FUNC_ARGS) { return SUCCESS; } - diff --git a/ext/json/Makefile.frag.w32 b/ext/json/Makefile.frag.w32 index eaf47e22be..ee71c7a997 100644 --- a/ext/json/Makefile.frag.w32 +++ b/ext/json/Makefile.frag.w32 @@ -1,4 +1,3 @@ - ext\json\json_scanner.c: ext\json\json_scanner.re $(RE2C) -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re diff --git a/ext/json/config.w32 b/ext/json/config.w32 index d16e0686d3..58c2c5b672 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -21,4 +21,3 @@ if (PHP_JSON != "no") { PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h"); } - diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re index 3fda1df5ad..cf45b90ea0 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -393,4 +393,3 @@ std: */ } - diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h index 5378e50104..d8af613878 100644 --- a/ext/json/php_json_parser.h +++ b/ext/json/php_json_parser.h @@ -84,4 +84,3 @@ PHP_JSON_API int php_json_parse(php_json_parser *parser); int php_json_yyparse(php_json_parser *parser); #endif /* PHP_JSON_PARSER_H */ - diff --git a/ext/json/php_json_scanner.h b/ext/json/php_json_scanner.h index b707e230eb..4fd5f217fd 100644 --- a/ext/json/php_json_scanner.h +++ b/ext/json/php_json_scanner.h @@ -46,4 +46,3 @@ void php_json_scanner_init(php_json_scanner *scanner, char *str, size_t str_len, int php_json_scan(php_json_scanner *s); #endif /* PHP_JSON_SCANNER_H */ - diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index 7713bdc42b..24795121cd 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -31,4 +31,3 @@ if (PHP_LDAP != "no") { WARNING("ldap not enabled; libraries and headers not found"); } } - diff --git a/ext/mbstring/README b/ext/mbstring/README index 338aa79fcd..c2db83436b 100644 --- a/ext/mbstring/README +++ b/ext/mbstring/README @@ -13,5 +13,3 @@ You are warned in php-dev and php-cvs lists many times already. If you are curious, search archive for details. Thank you. - - diff --git a/ext/mbstring/README.libmbfl b/ext/mbstring/README.libmbfl index de72aab440..8f9ac620af 100644 --- a/ext/mbstring/README.libmbfl +++ b/ext/mbstring/README.libmbfl @@ -1,4 +1,3 @@ - libmbfl is a streamable multibyte character code filter and converter library. libmbfl is distributed under LGPL 2.1 and bundled with PHP. @@ -13,4 +12,3 @@ If you have question about libmbfl, please ask to hirokawa@php.net, moriyoshi@php.net. See libmbfl/DISCLAIMER for licensing information of libmbfl. - diff --git a/ext/mbstring/README_PHP3-i18n-ja b/ext/mbstring/README_PHP3-i18n-ja index ddb688d1c5..151d5ca52c 100644 --- a/ext/mbstring/README_PHP3-i18n-ja +++ b/ext/mbstring/README_PHP3-i18n-ja @@ -771,4 +771,3 @@ have i18n_http_output("pass") before calling ImageGif, ImagePng, ImageJpeg! o 2000-12-09, Rui Hirokawa <hirokawa@php.net> Fixed mail() which was causing segmentation fault when header was null. - diff --git a/ext/mbstring/libmbfl/DISCLAIMER b/ext/mbstring/libmbfl/DISCLAIMER index 97fe77c33c..21b7a91d55 100644 --- a/ext/mbstring/libmbfl/DISCLAIMER +++ b/ext/mbstring/libmbfl/DISCLAIMER @@ -66,4 +66,3 @@ 1999/4/26 sgk 入力フィルタを実装。漢å—コードを推定ã—ãªãŒã‚‰ãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã€‚ 1999/6/?? Unicodeサãƒãƒ¼ãƒˆã€‚ 1999/6/22 sgk ライセンスをLGPLã«å¤‰æ›´ã€‚ - diff --git a/ext/mbstring/libmbfl/INSTALL b/ext/mbstring/libmbfl/INSTALL index 4a6bf169db..3b691b8844 100644 --- a/ext/mbstring/libmbfl/INSTALL +++ b/ext/mbstring/libmbfl/INSTALL @@ -1,4 +1,3 @@ - For UNIX compatible system, ./buildconf @@ -9,4 +8,3 @@ make install For Windows, Visual C++ 6.0 and Borland C++ 5.0 is suppoted. - diff --git a/ext/mbstring/libmbfl/NEWS b/ext/mbstring/libmbfl/NEWS index 82a763b695..75ea1c5117 100644 --- a/ext/mbstring/libmbfl/NEWS +++ b/ext/mbstring/libmbfl/NEWS @@ -1,4 +1,3 @@ - version 1.3.2 August 20, 2011 - added JISX-0213:2004 based encoding : Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004 (rui). diff --git a/ext/mbstring/libmbfl/filters/emoji2uni.h b/ext/mbstring/libmbfl/filters/emoji2uni.h index adce0b75d4..198b2354d3 100644 --- a/ext/mbstring/libmbfl/filters/emoji2uni.h +++ b/ext/mbstring/libmbfl/filters/emoji2uni.h @@ -1224,4 +1224,3 @@ static const unsigned short mb_tbl_uni_sb2code5_val[] = { // 0xfe4c5 - 0xfee7d 0x285F, 0x2860, 0x2861, }; static const unsigned short mb_tbl_uni_sb2code5_len = sizeof(mb_tbl_uni_sb2code5_key)/sizeof(unsigned short); - diff --git a/ext/mbstring/libmbfl/filters/html_entities.h b/ext/mbstring/libmbfl/filters/html_entities.h index 6833fd8105..be2cf90443 100644 --- a/ext/mbstring/libmbfl/filters/html_entities.h +++ b/ext/mbstring/libmbfl/filters/html_entities.h @@ -38,4 +38,3 @@ typedef struct _mbfl_html_entity_entry { extern const mbfl_html_entity_entry mbfl_html_entity_list[]; #endif /* MBFL_HTML_ENTITIES_H */ - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index ab1727146a..43f82fc41c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -78,5 +78,3 @@ int mbfl_filt_conv_any_7bit(int c, mbfl_convert_filter *filter) } return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.h b/ext/mbstring/libmbfl/filters/mbfilter_ascii.h index 99b4815387..3c8aead9ef 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.h @@ -42,5 +42,3 @@ int mbfl_filt_conv_ascii_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_ascii(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_ASCII_H */ - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index adecdee888..9e0dafd154 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -210,5 +210,3 @@ int mbfl_filt_conv_base64dec_flush(mbfl_convert_filter *filter) } return 0; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index 122ff4c778..f5ab8809ce 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -340,5 +340,3 @@ static int mbfl_filt_ident_big5(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index 7452c127fc..6fdcbda7c8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -133,5 +133,3 @@ int mbfl_filt_conv_wchar_byte2le(int c, mbfl_convert_filter *filter) CK((*filter->output_function)((c >> 8) & 0xff, filter->data)); return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 7475e5424c..239568a128 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -155,5 +155,3 @@ int mbfl_filt_conv_wchar_byte4le(int c, mbfl_convert_filter *filter) CK((*filter->output_function)((c >> 24) & 0xff, filter->data)); return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index 2d47ac304a..bc3befea81 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -148,5 +148,3 @@ static int mbfl_filt_ident_cp1251(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h index becae48c19..b76cc9f680 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h @@ -41,4 +41,3 @@ int mbfl_filt_conv_wchar_cp1251(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_cp1251_wchar(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_CP1251_H */ - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index 0c5eba3dd5..ab2f8f11b1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -143,5 +143,3 @@ static int mbfl_filt_ident_cp1252(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index 78e79335e4..6f4711ab79 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -153,5 +153,3 @@ static int mbfl_filt_ident_cp1254(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index 75d249fbe8..655c5583ed 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -1291,6 +1291,3 @@ retry: return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index aae45380c8..58fd9f4d1f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -341,5 +341,3 @@ static int mbfl_filt_ident_cp51932(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 179873eb3a..c5767ec8fc 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -143,5 +143,3 @@ static int mbfl_filt_ident_cp850(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 307f370d03..f87a603a7d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -147,5 +147,3 @@ static int mbfl_filt_ident_cp866(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index 4063a68208..de7de7213c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -346,5 +346,3 @@ static int mbfl_filt_ident_cp932(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index bf3ec25ee7..093f026bdf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -240,5 +240,3 @@ static int mbfl_filt_ident_euccn(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index 3b13850882..b364123902 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -326,6 +326,3 @@ int mbfl_filt_ident_eucjp(int c, mbfl_identify_filter *filter) return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index aeb94c388d..1d7ee1ebf9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -75,4 +75,3 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjp2004 = { mbfl_filt_conv_wchar_jis2004, mbfl_filt_conv_jis2004_flush }; - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index 95aec45f4d..26be59cab0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -430,5 +430,3 @@ static int mbfl_filt_ident_eucjp_win(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c index bc780c99ee..9b28556dee 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c @@ -326,4 +326,3 @@ static int mbfl_filt_ident_euctw(int c, mbfl_identify_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index 721c16292b..8c732d7462 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -469,5 +469,3 @@ static int mbfl_filt_ident_gb18030(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index 501bcb8d19..682d8401f3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -355,5 +355,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index fc6678ecb6..cf084399f8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -164,5 +164,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index 382d0c2294..4688e67905 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -96,5 +96,3 @@ int mbfl_filt_conv_wchar_8859_1(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index f6d1b21b55..dd34b53297 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -134,5 +134,3 @@ int mbfl_filt_conv_wchar_8859_10(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index cbc8f77d87..480f890b2d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -134,5 +134,3 @@ int mbfl_filt_conv_wchar_8859_13(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index 03581ccf45..ef7b7e645d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -134,5 +134,3 @@ int mbfl_filt_conv_wchar_8859_14(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index 50649ddeb6..8e236b667d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -135,5 +135,3 @@ int mbfl_filt_conv_wchar_8859_2(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index e1897069eb..c04cfd87b4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -135,5 +135,3 @@ int mbfl_filt_conv_wchar_8859_3(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index a04910eb78..1c4979362c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -133,5 +133,3 @@ int mbfl_filt_conv_wchar_8859_4(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index 0bd4d5e155..db10cc693f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -135,5 +135,3 @@ int mbfl_filt_conv_wchar_8859_5(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index df89eb75ba..318eaeb3c0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -135,5 +135,3 @@ int mbfl_filt_conv_wchar_8859_6(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index d8d4494a22..406370a3d3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -135,5 +135,3 @@ int mbfl_filt_conv_wchar_8859_7(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index fad0f5c51e..505f7dec8f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -134,4 +134,3 @@ int mbfl_filt_conv_wchar_8859_8(int c, mbfl_convert_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index 97948d0ff6..1550937bbe 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -134,5 +134,3 @@ int mbfl_filt_conv_wchar_8859_9(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index b3fbb4f94b..892e4bda3d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -659,5 +659,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index c141dc4102..1878f4d08f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -239,6 +239,3 @@ int mbfl_filt_conv_qprintdec_flush(mbfl_convert_filter *filter) return 0; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index 782e0dfaf9..ab4b3db983 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -295,4 +295,3 @@ int mbfl_filt_ident_sjis(int c, mbfl_identify_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index 2087786c06..383d623d5d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -697,4 +697,3 @@ mbfl_filt_conv_sjis_mac_flush(mbfl_convert_filter *filter) return 0; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index a856aa3d46..e8056ab99a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -1,4 +1,3 @@ - /* * "streamable kanji code filter and converter" * Copyright (c) 1998-2002 HappySize, Inc. All rights reserved. @@ -924,4 +923,3 @@ mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter) return 0; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index 265c577e5f..c262dde9bf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -346,5 +346,3 @@ static int mbfl_filt_ident_sjis_open(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c index 637e69074c..b99c658e4d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c @@ -299,4 +299,3 @@ const struct mbfl_convert_vtbl vtbl_tl_jisx0201_jisx0208 = { mbfl_filt_tl_jisx0201_jisx0208, mbfl_filt_tl_jisx0201_jisx0208_flush }; - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index 32f174f602..d11cf5a8ae 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -233,6 +233,3 @@ int mbfl_filt_conv_wchar_ucs2le(int c, mbfl_convert_filter *filter) return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 8906b8ff09..c662a0d8aa 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -271,5 +271,3 @@ int mbfl_filt_conv_wchar_ucs4le(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index 2e1c696f8a..b8a0e22778 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -263,5 +263,3 @@ static int mbfl_filt_ident_uhc(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index 3e008e8035..cb46fa51ef 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -311,6 +311,3 @@ int mbfl_filt_conv_wchar_utf16le(int c, mbfl_convert_filter *filter) return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.h b/ext/mbstring/libmbfl/filters/mbfilter_utf32.h index aa0883fff4..14b9fa4823 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.h @@ -47,4 +47,3 @@ int mbfl_filt_conv_utf32le_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_utf32le(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_UTF32_H */ - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index db0979c25d..7606642007 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -461,5 +461,3 @@ static int mbfl_filt_ident_utf7(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c index 72c772b072..ce56433316 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c @@ -368,5 +368,3 @@ int mbfl_filt_conv_wchar_utf7imap_flush(mbfl_convert_filter *filter) } return 0; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index 41e02bf314..410ba64b6f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -338,4 +338,3 @@ int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index b8cdfcaf79..15831011a3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -148,5 +148,3 @@ int mbfl_filt_conv_uudec(int c, mbfl_convert_filter * filter) } return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h index c02d21f878..9d4bd5fd6b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h @@ -36,4 +36,3 @@ extern const struct mbfl_convert_vtbl vtbl_uuencode_8bit; int mbfl_filt_conv_uudec(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_UUENCODE_H */ - diff --git a/ext/mbstring/libmbfl/filters/sjis_mac2uni.h b/ext/mbstring/libmbfl/filters/sjis_mac2uni.h index 7853d96ba4..c50caba29d 100644 --- a/ext/mbstring/libmbfl/filters/sjis_mac2uni.h +++ b/ext/mbstring/libmbfl/filters/sjis_mac2uni.h @@ -1,5 +1,3 @@ - - static const unsigned short sjis_mac2wchar1[] = { // 0x03ac - 0x03c9 0x339c, 0x339f, 0x339d, 0x33a0, 0x33a4, 0xff4d, 0x33a1, 0x33a5, diff --git a/ext/mbstring/libmbfl/filters/unicode_prop.h b/ext/mbstring/libmbfl/filters/unicode_prop.h index bbb92b98e7..6eaefbc2e3 100644 --- a/ext/mbstring/libmbfl/filters/unicode_prop.h +++ b/ext/mbstring/libmbfl/filters/unicode_prop.h @@ -164,4 +164,3 @@ static const unsigned char mbfl_charprop_table[] = { /* ~ 126 */ MBFL_CHP_MMHQENC , /* DEL 127 */ MBFL_CHP_MMHQENC }; - diff --git a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h index 327e2a1278..01afcc1f2d 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h @@ -5064,4 +5064,3 @@ static const unsigned short *uni2jis_tbl[] = { static const int uni2jis_tbl_len = sizeof(uni2jis_tbl_range)/(sizeof(int)*2); #endif /* UNICODE_TABLE_JIS2004_H */ - diff --git a/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h b/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h index 2674e0c9b8..e59c685fe8 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h @@ -163,4 +163,3 @@ static const int koi8u_ucs_table_max = 0x80 + (sizeof (koi8u_ucs_table) / sizeof #endif /* UNNICODE_TABLE_KOI8U_H */ - diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index b19432f76a..2efaae50a2 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -62,4 +62,3 @@ int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter) { return (*filter->output_function)(c, filter->data); } - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index f52c94cf37..96353023ca 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -90,4 +90,3 @@ static void __mbfl__free(void *ptr) { free(ptr); } - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index a73a0c80e5..54e4b3c2a4 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -637,5 +637,3 @@ void mbfl_filt_conv_common_dtor(mbfl_convert_filter *filter) filter->status = 0; filter->cache = 0; } - - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index 9ca2d59183..7ac3920f0d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -168,4 +168,3 @@ mbfl_no_language2name(enum mbfl_no_language no_language) return language->name; } } - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h index 0e8a82f0e8..1f753d197f 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h @@ -70,4 +70,3 @@ MBFLAPI extern void mbfl_wchar_device_clear(mbfl_wchar_device *device); #endif /* MBFL_MEMORY_DEVICE_H */ - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index 69f594350e..c9c670373d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -75,5 +75,3 @@ mbfl_string_clear(mbfl_string *string) string->len = 0; } } - - diff --git a/ext/mbstring/libmbfl/nls/nls_de.c b/ext/mbstring/libmbfl/nls/nls_de.c index b559e2dee3..f84cbe74ed 100644 --- a/ext/mbstring/libmbfl/nls/nls_de.c +++ b/ext/mbstring/libmbfl/nls/nls_de.c @@ -20,4 +20,3 @@ const mbfl_language mbfl_language_german = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_en.c b/ext/mbstring/libmbfl/nls/nls_en.c index 0700e4f2c4..7fa23d4f53 100644 --- a/ext/mbstring/libmbfl/nls/nls_en.c +++ b/ext/mbstring/libmbfl/nls/nls_en.c @@ -18,4 +18,3 @@ const mbfl_language mbfl_language_english = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_kr.c b/ext/mbstring/libmbfl/nls/nls_kr.c index afff43af48..aba4be5b8c 100644 --- a/ext/mbstring/libmbfl/nls/nls_kr.c +++ b/ext/mbstring/libmbfl/nls/nls_kr.c @@ -18,4 +18,3 @@ const mbfl_language mbfl_language_korean = { mbfl_no_encoding_base64, mbfl_no_encoding_7bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_neutral.c b/ext/mbstring/libmbfl/nls/nls_neutral.c index 87a6a194c3..ab74747219 100644 --- a/ext/mbstring/libmbfl/nls/nls_neutral.c +++ b/ext/mbstring/libmbfl/nls/nls_neutral.c @@ -18,4 +18,3 @@ const mbfl_language mbfl_language_neutral = { mbfl_no_encoding_base64, mbfl_no_encoding_base64 }; - diff --git a/ext/mbstring/libmbfl/nls/nls_tr.c b/ext/mbstring/libmbfl/nls/nls_tr.c index c7044ff293..950a610e0d 100644 --- a/ext/mbstring/libmbfl/nls/nls_tr.c +++ b/ext/mbstring/libmbfl/nls/nls_tr.c @@ -18,4 +18,3 @@ const mbfl_language mbfl_language_turkish = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_uni.c b/ext/mbstring/libmbfl/nls/nls_uni.c index 6a0100105b..cf76000cd9 100644 --- a/ext/mbstring/libmbfl/nls/nls_uni.c +++ b/ext/mbstring/libmbfl/nls/nls_uni.c @@ -20,4 +20,3 @@ const mbfl_language mbfl_language_uni = { mbfl_no_encoding_base64, mbfl_no_encoding_base64 }; - diff --git a/ext/mbstring/libmbfl/nls/nls_zh.c b/ext/mbstring/libmbfl/nls/nls_zh.c index d9a49931ea..1434481b34 100644 --- a/ext/mbstring/libmbfl/nls/nls_zh.c +++ b/ext/mbstring/libmbfl/nls/nls_zh.c @@ -28,4 +28,3 @@ const mbfl_language mbfl_language_traditional_chinese = { mbfl_no_encoding_base64, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/tests/conv_encoding.tests/cp51932_cp50220raw.exp b/ext/mbstring/libmbfl/tests/conv_encoding.tests/cp51932_cp50220raw.exp index 0e63ef11b7..740bcfd881 100644 --- a/ext/mbstring/libmbfl/tests/conv_encoding.tests/cp51932_cp50220raw.exp +++ b/ext/mbstring/libmbfl/tests/conv_encoding.tests/cp51932_cp50220raw.exp @@ -30,4 +30,3 @@ send "Î" expect { "%1b%24%42%2d%42%1b%28%42 (8)\r\n" { pass $test } } - diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index 96ee53bb08..c79961027c 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -399,4 +399,3 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler) * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index b180a34255..b325236dee 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -106,4 +106,3 @@ PHP_FUNCTION(mb_regex_set_options); * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h index c242cba1c3..64412ab280 100644 --- a/ext/mbstring/php_unicode.h +++ b/ext/mbstring/php_unicode.h @@ -196,6 +196,3 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s #endif /* PHP_UNICODE_H */ - - - diff --git a/ext/mbstring/ucgendat/OPENLDAP_LICENSE b/ext/mbstring/ucgendat/OPENLDAP_LICENSE index 6295703c0a..05ad7571e4 100644 --- a/ext/mbstring/ucgendat/OPENLDAP_LICENSE +++ b/ext/mbstring/ucgendat/OPENLDAP_LICENSE @@ -44,4 +44,4 @@ OpenLDAP is a registered trademark of the OpenLDAP Foundation. Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved. Permission to copy and -distribute verbatim copies of this document is granted.
\ No newline at end of file +distribute verbatim copies of this document is granted. diff --git a/ext/mbstring/ucgendat/README b/ext/mbstring/ucgendat/README index 7717bf89f9..c100231e4a 100644 --- a/ext/mbstring/ucgendat/README +++ b/ext/mbstring/ucgendat/README @@ -4,6 +4,3 @@ It's only necessary to rebuild unicode_data.h from Unicode ucd files. Example usage: ./ucgendat UnicodeData-6.0.0d7.txt -x CompositionExclusions-6.0.0d2.txt - - - diff --git a/ext/mysqli/mysqli_fe.h b/ext/mysqli/mysqli_fe.h index e56780a4c1..8b4d52f489 100644 --- a/ext/mysqli/mysqli_fe.h +++ b/ext/mysqli/mysqli_fe.h @@ -139,4 +139,3 @@ PHP_FUNCTION(mysqli_driver_construct); PHP_METHOD(mysqli_warning,__construct); #endif /* MYSQLI_FE_H */ - diff --git a/ext/mysqli/mysqli_libmysql.h b/ext/mysqli/mysqli_libmysql.h index 6759d8a1c2..a4ba66e15b 100644 --- a/ext/mysqli/mysqli_libmysql.h +++ b/ext/mysqli/mysqli_libmysql.h @@ -127,4 +127,3 @@ #endif #endif /* MYSQLI_LIBMYSQL_H */ - diff --git a/ext/mysqli/tests/clean_table.inc b/ext/mysqli/tests/clean_table.inc index 716cc84416..86e5fcb379 100644 --- a/ext/mysqli/tests/clean_table.inc +++ b/ext/mysqli/tests/clean_table.inc @@ -11,4 +11,4 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { } mysqli_close($link); -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/reflection_tools.inc b/ext/mysqli/tests/reflection_tools.inc index c8338bfa24..6648526ed0 100644 --- a/ext/mysqli/tests/reflection_tools.inc +++ b/ext/mysqli/tests/reflection_tools.inc @@ -118,4 +118,4 @@ // printf("getDefaultValue: %s\n", ($param->getDefaultValue()) ? 'yes' : 'no'); } -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/skipif.inc b/ext/mysqli/tests/skipif.inc index a7581fb480..5562aab84b 100644 --- a/ext/mysqli/tests/skipif.inc +++ b/ext/mysqli/tests/skipif.inc @@ -2,4 +2,4 @@ if (!extension_loaded('mysqli')){ die('skip mysqli extension not available'); } -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/skipifemb.inc b/ext/mysqli/tests/skipifemb.inc index 254a4ccece..ad143a42a4 100644 --- a/ext/mysqli/tests/skipifemb.inc +++ b/ext/mysqli/tests/skipifemb.inc @@ -2,4 +2,4 @@ $driver = new mysqli_driver(); if ($driver->embedded) die("skip test doesn't run with embedded server"); -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/skipifnotemb.inc b/ext/mysqli/tests/skipifnotemb.inc index d73d185bc4..fa5fb9f0a3 100644 --- a/ext/mysqli/tests/skipifnotemb.inc +++ b/ext/mysqli/tests/skipifnotemb.inc @@ -2,4 +2,4 @@ $driver = new mysqli_driver(); if (!$driver->embedded) die("skip test for with embedded server only"); -?>
\ No newline at end of file +?> diff --git a/ext/odbc/tests/config.inc b/ext/odbc/tests/config.inc index dcc4cbb3bf..d9da63d0b7 100644 --- a/ext/odbc/tests/config.inc +++ b/ext/odbc/tests/config.inc @@ -16,4 +16,3 @@ if (false === $user) { if (false == $pass) { $pass = ''; } - diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32 index cd3391a46d..a05946289b 100644 --- a/ext/opcache/config.w32 +++ b/ext/opcache/config.w32 @@ -29,4 +29,3 @@ if (PHP_OPCACHE != "no") { ADD_FLAG('CFLAGS_OPCACHE', "/I " + configure_module_dirname); } - diff --git a/ext/opcache/tests/php_cli_server.inc b/ext/opcache/tests/php_cli_server.inc index ca781b7cd7..70ef14e585 100644 --- a/ext/opcache/tests/php_cli_server.inc +++ b/ext/opcache/tests/php_cli_server.inc @@ -73,4 +73,3 @@ function php_cli_server_start($ini = "") { } ?> - diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32 index ade17d402a..fd79e0472d 100644 --- a/ext/openssl/config.w32 +++ b/ext/openssl/config.w32 @@ -22,5 +22,3 @@ if (PHP_OPENSSL != "no") { } } } - - diff --git a/ext/pcntl/README b/ext/pcntl/README index 34313b2040..ab1dfa1f2d 100644 --- a/ext/pcntl/README +++ b/ext/pcntl/README @@ -9,8 +9,3 @@ this functionality. Thanks, Jason Greeme < jason@inetgurus.net / jason@php.net > - - - - - diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 index 02256887a1..aeea1c4506 100644 --- a/ext/pcre/config.w32 +++ b/ext/pcre/config.w32 @@ -16,4 +16,3 @@ ARG_WITH("pcre-jit", "Enable PCRE JIT support", "yes"); if (PHP_PCRE_JIT != "no") { AC_DEFINE('HAVE_PCRE_JIT_SUPPORT', 1, 'PCRE library'); } - diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 95298a90b2..721b7f6191 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -111,4 +111,3 @@ PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR fi fi fi - diff --git a/ext/pdo/CREDITS b/ext/pdo/CREDITS index 5971cdb0dd..a9899d230f 100755 --- a/ext/pdo/CREDITS +++ b/ext/pdo/CREDITS @@ -1,3 +1,2 @@ PHP Data Objects Wez Furlong, Marcus Boerger, Sterling Hughes, George Schlossnagle, Ilia Alshanetsky - diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index d2b59744ef..495d03366b 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -33,4 +33,3 @@ install-pdo-headers: # mini hack install: $(all_targets) $(install_targets) install-pdo-headers - diff --git a/ext/pdo/Makefile.frag.w32 b/ext/pdo/Makefile.frag.w32 index 3e21fad7e4..43f8d2c152 100644 --- a/ext/pdo/Makefile.frag.w32 +++ b/ext/pdo/Makefile.frag.w32 @@ -1,5 +1,3 @@ - ext\pdo\pdo_sql_parser.c: ext\pdo\pdo_sql_parser.re cd $(PHP_SRC_DIR) $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re - diff --git a/ext/pdo/README b/ext/pdo/README index da806b0f30..dfba3982a4 100755 --- a/ext/pdo/README +++ b/ext/pdo/README @@ -52,5 +52,3 @@ responsibility to call commit() when you are done making changes and autocommit is turned off. vim:tw=78:et - - diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index 105c7da4d2..5d6a8818a9 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -52,4 +52,3 @@ if test "$PHP_PDO" != "no"; then dnl so we always include the known-good working hack. PHP_ADD_MAKEFILE_FRAGMENT fi - diff --git a/ext/pdo/pdo_sqlstate.c b/ext/pdo/pdo_sqlstate.c index 8f2debc912..a590263548 100644 --- a/ext/pdo/pdo_sqlstate.c +++ b/ext/pdo/pdo_sqlstate.c @@ -333,4 +333,3 @@ const char *pdo_sqlstate_state_to_description(char *state) } return NULL; } - diff --git a/ext/pdo_dblib/config.w32 b/ext/pdo_dblib/config.w32 index 50435bc64b..2f46eaf453 100755 --- a/ext/pdo_dblib/config.w32 +++ b/ext/pdo_dblib/config.w32 @@ -39,4 +39,3 @@ if (PHP_PDO_MSSQL != "no") { WARNING("pdo_mssql not enabled, libraries or headers not found") } } - diff --git a/ext/pdo_mysql/CREDITS b/ext/pdo_mysql/CREDITS index 0423cccd64..eb11169bd9 100755 --- a/ext/pdo_mysql/CREDITS +++ b/ext/pdo_mysql/CREDITS @@ -1,3 +1,2 @@ MySQL driver for PDO George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter - diff --git a/ext/pdo_mysql/tests/table.inc b/ext/pdo_mysql/tests/table.inc index c7bb9cc5ee..54bf14f07d 100644 --- a/ext/pdo_mysql/tests/table.inc +++ b/ext/pdo_mysql/tests/table.inc @@ -6,4 +6,4 @@ if (!$db) { // $db->exec('DROP TABLE IF EXISTS test'); $db->exec('CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine); $db->exec('INSERT INTO test(id, label) VALUES (1, "a"), (2, "b"), (3, "c"), (4, "d"), (5, "e"), (6, "f")'); -?>
\ No newline at end of file +?> diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 12a9e897e0..daa3d018f7 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -235,4 +235,3 @@ if test "$PHP_PDO_OCI" != "no"; then AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ]) fi - diff --git a/ext/pdo_odbc/EXPERIMENTAL b/ext/pdo_odbc/EXPERIMENTAL index 139597f9cb..e69de29bb2 100644 --- a/ext/pdo_odbc/EXPERIMENTAL +++ b/ext/pdo_odbc/EXPERIMENTAL @@ -1,2 +0,0 @@ - - diff --git a/ext/pdo_odbc/config.w32 b/ext/pdo_odbc/config.w32 index cd1017f2e4..e582db203e 100755 --- a/ext/pdo_odbc/config.w32 +++ b/ext/pdo_odbc/config.w32 @@ -16,5 +16,3 @@ if (PHP_PDO_ODBC != "no") { PHP_PDO_ODBC = "no" } } - - diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h index 69f17a7bf0..a1c36cb97b 100644 --- a/ext/pdo_sqlite/php_pdo_sqlite.h +++ b/ext/pdo_sqlite/php_pdo_sqlite.h @@ -55,4 +55,3 @@ ZEND_END_MODULE_GLOBALS(pdo_sqlite) #endif #endif /* PHP_PDO_SQLITE_H */ - diff --git a/ext/pgsql/README b/ext/pgsql/README index 26f7aad02d..11f112dfc0 100644 --- a/ext/pgsql/README +++ b/ext/pgsql/README @@ -232,4 +232,3 @@ bool pg_ping(resource db) Again, experimental functions are subject to be changed without notice. - diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 8201e88dba..684da977d9 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -107,5 +107,3 @@ if test "$PHP_PGSQL" != "no"; then PHP_NEW_EXTENSION(pgsql, pgsql.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) fi - - diff --git a/ext/pgsql/tests/nonblocking.inc b/ext/pgsql/tests/nonblocking.inc index 4cf7c09a51..c121c62413 100644 --- a/ext/pgsql/tests/nonblocking.inc +++ b/ext/pgsql/tests/nonblocking.inc @@ -35,4 +35,3 @@ function nb_consume($db, $db_socket) { } }; - diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index 0e3713fc63..2b7f0ffae6 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -48,4 +48,3 @@ install-pharcmd: pharcmd @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 - diff --git a/ext/phar/Makefile.frag.w32 b/ext/phar/Makefile.frag.w32 index c50b1dbc51..311681bd9b 100644 --- a/ext/phar/Makefile.frag.w32 +++ b/ext/phar/Makefile.frag.w32 @@ -1,5 +1,3 @@ - ext\phar\phar_path_check.c: ext\phar\phar_path_check.re cd $(PHP_SRC_DIR) $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re - diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index c0ec38e13e..ca9e276d80 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -1166,4 +1166,3 @@ void phar_restore_orig_functions(void) /* {{{ */ * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/phar/gdbhelp b/ext/phar/gdbhelp index 14ff89c56b..bd4150e3ef 100644 --- a/ext/phar/gdbhelp +++ b/ext/phar/gdbhelp @@ -119,4 +119,4 @@ document dump_entry dump_entry "pharname"|"pharalias" "filename" [1] display phar_entry_info for a file within a phar. If the optional third param is passed in, displays the php_stream that is the file's fp -end
\ No newline at end of file +end diff --git a/ext/phar/phar/directorygraphiterator.inc b/ext/phar/phar/directorygraphiterator.inc index 5a658ddabc..34579678a7 100644 --- a/ext/phar/phar/directorygraphiterator.inc +++ b/ext/phar/phar/directorygraphiterator.inc @@ -31,4 +31,4 @@ class DirectoryGraphIterator extends DirectoryTreeIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/directorytreeiterator.inc b/ext/phar/phar/directorytreeiterator.inc index 9ed2e1a1bf..2c681632fb 100644 --- a/ext/phar/phar/directorytreeiterator.inc +++ b/ext/phar/phar/directorytreeiterator.inc @@ -51,4 +51,4 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/invertedregexiterator.inc b/ext/phar/phar/invertedregexiterator.inc index aec87e6ab1..8f82f41f2a 100644 --- a/ext/phar/phar/invertedregexiterator.inc +++ b/ext/phar/phar/invertedregexiterator.inc @@ -24,4 +24,4 @@ class InvertedRegexIterator extends RegexIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc index c28de0aa7a..129a0c43bf 100644 --- a/ext/phar/phar/phar.inc +++ b/ext/phar/phar/phar.inc @@ -77,4 +77,4 @@ class Phar extends PHP_Archive implements RecursiveIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/phar.php b/ext/phar/phar/phar.php index f6f26c23f2..13538777a5 100755 --- a/ext/phar/phar/phar.php +++ b/ext/phar/phar/phar.php @@ -53,4 +53,4 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc index 0bfef46853..df74c13880 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc +++ b/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc @@ -11,4 +11,4 @@ $a['oof/hi.php'] = '<?php var_dump("hi");'; $a->setStub('<?php Phar::webPhar(); -__HALT_COMPILER();');
\ No newline at end of file +__HALT_COMPILER();'); diff --git a/ext/phar/tests/cache_list/files/nophar.phar.inc b/ext/phar/tests/cache_list/files/nophar.phar.inc index 36d5628762..35b0ddc5e2 100644 --- a/ext/phar/tests/cache_list/files/nophar.phar.inc +++ b/ext/phar/tests/cache_list/files/nophar.phar.inc @@ -7,4 +7,4 @@ $p['web.php'] = '<?php echo "web\n";'; $p['b/c.php'] = '<?php echo "in b\n";$a = fopen("index.php", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";'; $p['d'] = "in d\n"; $p->setStub($p->createDefaultStub('index.php', 'web.php')); -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/cache_list/files/phar_oo_test.inc b/ext/phar/tests/cache_list/files/phar_oo_test.inc index 9863e8da93..0691e4dc80 100644 --- a/ext/phar/tests/cache_list/files/phar_oo_test.inc +++ b/ext/phar/tests/cache_list/files/phar_oo_test.inc @@ -46,4 +46,4 @@ EOF; $ftime = mktime(12, 0, 0, 3, 1, 2006); include 'phar_test.inc'; -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/cache_list/files/phar_test.inc b/ext/phar/tests/cache_list/files/phar_test.inc index f82471d13b..b1bb6d0e38 100644 --- a/ext/phar/tests/cache_list/files/phar_test.inc +++ b/ext/phar/tests/cache_list/files/phar_test.inc @@ -75,4 +75,4 @@ if (@$bz2) { fclose($fp); } -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/files/frontcontroller13.phar.inc b/ext/phar/tests/files/frontcontroller13.phar.inc index 0bfef46853..df74c13880 100644 --- a/ext/phar/tests/files/frontcontroller13.phar.inc +++ b/ext/phar/tests/files/frontcontroller13.phar.inc @@ -11,4 +11,4 @@ $a['oof/hi.php'] = '<?php var_dump("hi");'; $a->setStub('<?php Phar::webPhar(); -__HALT_COMPILER();');
\ No newline at end of file +__HALT_COMPILER();'); diff --git a/ext/phar/tests/files/nophar.phar.inc b/ext/phar/tests/files/nophar.phar.inc index 36d5628762..35b0ddc5e2 100644 --- a/ext/phar/tests/files/nophar.phar.inc +++ b/ext/phar/tests/files/nophar.phar.inc @@ -7,4 +7,4 @@ $p['web.php'] = '<?php echo "web\n";'; $p['b/c.php'] = '<?php echo "in b\n";$a = fopen("index.php", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";'; $p['d'] = "in d\n"; $p->setStub($p->createDefaultStub('index.php', 'web.php')); -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/files/phar_oo_test.inc b/ext/phar/tests/files/phar_oo_test.inc index 45421568de..3883d494c1 100644 --- a/ext/phar/tests/files/phar_oo_test.inc +++ b/ext/phar/tests/files/phar_oo_test.inc @@ -47,4 +47,4 @@ EOF; $ftime = mktime(12, 0, 0, 3, 1, 2006); include 'phar_test.inc'; -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/files/stuboflength1041.phar.inc b/ext/phar/tests/files/stuboflength1041.phar.inc index 28ce8427f3..9d51a750df 100644 --- a/ext/phar/tests/files/stuboflength1041.phar.inc +++ b/ext/phar/tests/files/stuboflength1041.phar.inc @@ -18,4 +18,4 @@ $phar->setStub('<?php ************************************************************************************************ ************************************************************************************************ *********************************************/ -__HALT_COMPILER();');
\ No newline at end of file +__HALT_COMPILER();'); diff --git a/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc b/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc index b5222f5805..4e30dca174 100644 --- a/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc +++ b/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc @@ -174,4 +174,4 @@ class corrupt_tarmaker fwrite($this->tmp, pack('a1024', '')); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc index 52f5a23507..641dda56f5 100644 --- a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc +++ b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc @@ -167,4 +167,4 @@ class danger_tarmaker fwrite($this->tmp, pack('a1024', '')); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/tar/files/make_invalid_tar.php.inc b/ext/phar/tests/tar/files/make_invalid_tar.php.inc index 413dd7bd1b..895977bf2f 100644 --- a/ext/phar/tests/tar/files/make_invalid_tar.php.inc +++ b/ext/phar/tests/tar/files/make_invalid_tar.php.inc @@ -6,4 +6,4 @@ function close() fwrite($this->tmp, (binary)'oopsie'); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/tar/files/tarmaker.php.inc b/ext/phar/tests/tar/files/tarmaker.php.inc index 0df7ee9933..5860bf84d3 100644 --- a/ext/phar/tests/tar/files/tarmaker.php.inc +++ b/ext/phar/tests/tar/files/tarmaker.php.inc @@ -166,4 +166,4 @@ class tarmaker fwrite($this->tmp, pack('a1024', '')); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc index 9fbfe341c3..c030895f2c 100644 --- a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc +++ b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc @@ -329,4 +329,4 @@ class corrupt_zipmaker file_put_contents($zipfile, $write); } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/zip/files/make_invalid_tar.php.inc b/ext/phar/tests/zip/files/make_invalid_tar.php.inc index cec8ef7793..4f4758bbb6 100644 --- a/ext/phar/tests/zip/files/make_invalid_tar.php.inc +++ b/ext/phar/tests/zip/files/make_invalid_tar.php.inc @@ -9,4 +9,4 @@ function close() fwrite($fp, 'oopsie'); fclose($fp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/zip/files/zipmaker.php.inc b/ext/phar/tests/zip/files/zipmaker.php.inc index ad16fda659..c9eebad7ed 100644 --- a/ext/phar/tests/zip/files/zipmaker.php.inc +++ b/ext/phar/tests/zip/files/zipmaker.php.inc @@ -67,4 +67,4 @@ class zipmaker { $this->zip->close(); } -}
\ No newline at end of file +} diff --git a/ext/pspell/README b/ext/pspell/README index 58806289db..9fc884c65b 100644 --- a/ext/pspell/README +++ b/ext/pspell/README @@ -48,4 +48,4 @@ pspell_add_to_personal() to add words to the wordlist and finally pspell_save_wordlist() to save it. Note that at this moment pspell_save_wordlist() will return TRUE, even if -there was an error. This will be changed once pspell library is fixed.
\ No newline at end of file +there was an error. This will be changed once pspell library is fixed. diff --git a/ext/pspell/config.w32 b/ext/pspell/config.w32 index 741a4bc8f0..413163c032 100644 --- a/ext/pspell/config.w32 +++ b/ext/pspell/config.w32 @@ -13,4 +13,3 @@ if (PHP_PSPELL != "no") { WARNING("pspell not enabled; libraries and headers not found"); } } - diff --git a/ext/readline/config.w32 b/ext/readline/config.w32 index 482c99cc04..9e21e6bb54 100644 --- a/ext/readline/config.w32 +++ b/ext/readline/config.w32 @@ -13,4 +13,3 @@ if (PHP_READLINE != "no") { WARNING("readline not enabled; libraries and headers not found"); } } - diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h index 50c1d21ab4..1d708ccc05 100644 --- a/ext/readline/php_readline.h +++ b/ext/readline/php_readline.h @@ -41,4 +41,3 @@ extern zend_module_entry readline_module_entry; #endif /* HAVE_LIBREADLINE */ #endif /* PHP_READLINE_H */ - diff --git a/ext/readline/readline_cli.h b/ext/readline/readline_cli.h index 26d88068a9..2e6aae072b 100644 --- a/ext/readline/readline_cli.h +++ b/ext/readline/readline_cli.h @@ -39,5 +39,3 @@ extern PHP_MSHUTDOWN_FUNCTION(cli_readline); extern PHP_MINFO_FUNCTION(cli_readline); ZEND_EXTERN_MODULE_GLOBALS(cli_readline) - - diff --git a/ext/reflection/tests/included4.inc b/ext/reflection/tests/included4.inc index 88947251cd..313fc5feca 100644 --- a/ext/reflection/tests/included4.inc +++ b/ext/reflection/tests/included4.inc @@ -6,4 +6,4 @@ function g() { echo __FILE__ . "\n"; echo __LINE__ . "\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/session/tests/save_handler.inc b/ext/session/tests/save_handler.inc index 15ad29029f..56b3505284 100644 --- a/ext/session/tests/save_handler.inc +++ b/ext/session/tests/save_handler.inc @@ -192,4 +192,3 @@ function feature() { } ?> - diff --git a/ext/shmop/README b/ext/shmop/README index 1bb95b220e..60088df08f 100644 --- a/ext/shmop/README +++ b/ext/shmop/README @@ -65,5 +65,3 @@ int shmop_close(int shmid) shmid - shmid which to close returns zero - - diff --git a/ext/simplexml/tests/000.xml b/ext/simplexml/tests/000.xml index b0f2785463..86a22ba0fa 100755 --- a/ext/simplexml/tests/000.xml +++ b/ext/simplexml/tests/000.xml @@ -13,4 +13,4 @@ </elem2>Here is some more</elem1> <elem1 attr1='11' attr2='12'/> <elem11><elem111><elem1111/></elem111></elem11> -</sxe>
\ No newline at end of file +</sxe> diff --git a/ext/simplexml/tests/bug24392.xml b/ext/simplexml/tests/bug24392.xml index d669f1df41..2cb5106eea 100644 --- a/ext/simplexml/tests/bug24392.xml +++ b/ext/simplexml/tests/bug24392.xml @@ -73,4 +73,4 @@ xmlns="http://my.netscape.com/rdf/simple/0.9/"> <link>http://slashdot.org/search.pl</link> </textinput> -</rdf:RDF>
\ No newline at end of file +</rdf:RDF> diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 413be72087..0a730ae809 100755 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe> diff --git a/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml b/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml index 413be72087..0a730ae809 100644 --- a/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml +++ b/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe> diff --git a/ext/skeleton/CREDITS b/ext/skeleton/CREDITS index 58fc71019a..407205f743 100644 --- a/ext/skeleton/CREDITS +++ b/ext/skeleton/CREDITS @@ -1 +1 @@ -extname
\ No newline at end of file +extname diff --git a/ext/snmp/config.w32 b/ext/snmp/config.w32 index 0848d5701e..c24eec0cb3 100644 --- a/ext/snmp/config.w32 +++ b/ext/snmp/config.w32 @@ -17,4 +17,3 @@ if (PHP_SNMP != "no") { WARNING("snmp not enabled; libraries and headers not found"); } } - diff --git a/ext/snmp/tests/skipif.inc b/ext/snmp/tests/skipif.inc index 72423251fd..d8ee31d0c4 100644 --- a/ext/snmp/tests/skipif.inc +++ b/ext/snmp/tests/skipif.inc @@ -10,4 +10,3 @@ require_once (dirname(__FILE__).'/snmp_include.inc'); if (snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout) === false) die('NO SNMPD on this host or community invalid'); - diff --git a/ext/soap/interop/test.utility.php b/ext/soap/interop/test.utility.php index 5b1f699c9b..e581772bbb 100644 --- a/ext/soap/interop/test.utility.php +++ b/ext/soap/interop/test.utility.php @@ -140,4 +140,4 @@ function var_dump_str($var) { return $res; } -?>
\ No newline at end of file +?> diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 8564c654f0..695867d7e2 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -3670,4 +3670,3 @@ static void delete_document(zval *zv) xmlDocPtr doc = Z_PTR_P(zv); xmlFreeDoc(doc); } - diff --git a/ext/soap/tests/interop/Round2/Base/round2_base.inc b/ext/soap/tests/interop/Round2/Base/round2_base.inc index 48eaf40f89..b5d6ced74c 100644 --- a/ext/soap/tests/interop/Round2/Base/round2_base.inc +++ b/ext/soap/tests/interop/Round2/Base/round2_base.inc @@ -78,4 +78,4 @@ ini_set("soap.wsdl_cache_enabled",0); $server = new SoapServer(dirname(__FILE__)."/round2_base.wsdl"); $server->setClass("SOAP_Interop_Base"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc index a9da5653e3..727def1ee6 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc @@ -25,4 +25,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_doclit.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc index b65da2782c..8ecf366824 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc @@ -26,4 +26,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc index ee38a12136..0b97f8bac9 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_emptysa.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc index ecde53e155..8981c0e6ba 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_import1.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc index 5957c374a1..3eea780899 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_import2.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc index 3a3df9791b..c96dcbb643 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc @@ -16,4 +16,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_import3.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc index e88df3312b..8b4804db14 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc @@ -25,4 +25,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc b/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc index 19a769c001..7b918c0afb 100644 --- a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc +++ b/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc @@ -14,4 +14,4 @@ $server = new SoapServer(dirname(__FILE__)."/round3_groupE_list.wsdl"); $server->setClass("SOAP_Interop_GroupE"); $server->handle($HTTP_RAW_POST_DATA); var_dump($d); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc index e90586efdb..d2af69e4be 100644 --- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc +++ b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupF { $server = new SoapServer(dirname(__FILE__)."/round3_groupF_ext.wsdl"); $server->setClass("SOAP_Interop_GroupF"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc index b7e67b0f52..0940d1c399 100644 --- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc +++ b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc @@ -19,4 +19,4 @@ class SOAP_Interop_GroupF { $server = new SoapServer(dirname(__FILE__)."/round3_groupF_ext.wsdl"); $server->setClass("SOAP_Interop_GroupF"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/sockets/config.w32 b/ext/sockets/config.w32 index e6c4cfea68..5e87583c0b 100644 --- a/ext/sockets/config.w32 +++ b/ext/sockets/config.w32 @@ -14,4 +14,3 @@ if (PHP_SOCKETS != "no") { WARNING("sockets not enabled; libraries and headers not found"); } } - diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 7914b97d89..998cd07346 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -122,4 +122,3 @@ php_socket *socket_import_file_descriptor(PHP_SOCKET sock); * c-basic-offset: 4 * End: */ - diff --git a/ext/sodium/README.md b/ext/sodium/README.md index 104570a241..64b575956b 100644 --- a/ext/sodium/README.md +++ b/ext/sodium/README.md @@ -10,4 +10,3 @@ Full documentation here: [Using Libsodium in PHP Projects](https://paragonie.com/book/pecl-libsodium), a guide to using the libsodium PHP extension for modern, secure, and fast cryptography. - diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc index 2ccd0d1be8..0dc423199e 100644 --- a/ext/spl/examples/autoload.inc +++ b/ext/spl/examples/autoload.inc @@ -47,4 +47,4 @@ function __autoload($classname) { fprintf(STDERR, 'Class not found ('.$classname.")\n"); } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/cachingrecursiveiterator.inc b/ext/spl/examples/cachingrecursiveiterator.inc index 4fa6b235c3..f0e060a0a7 100644 --- a/ext/spl/examples/cachingrecursiveiterator.inc +++ b/ext/spl/examples/cachingrecursiveiterator.inc @@ -25,4 +25,4 @@ class CachingRecursiveIterator extends RecursiveCachingIterator { } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/callbackfilteriterator.inc b/ext/spl/examples/callbackfilteriterator.inc index 51757012ec..4d49a52807 100644 --- a/ext/spl/examples/callbackfilteriterator.inc +++ b/ext/spl/examples/callbackfilteriterator.inc @@ -119,4 +119,4 @@ class CallbackFilterIterator extends FilterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/class_tree.php b/ext/spl/examples/class_tree.php index fc021d5c01..a5d2d7b1ca 100755 --- a/ext/spl/examples/class_tree.php +++ b/ext/spl/examples/class_tree.php @@ -110,4 +110,4 @@ foreach($it as $c=>$v) echo "$v\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/dba_array.php b/ext/spl/examples/dba_array.php index f217c34546..7930348f7c 100755 --- a/ext/spl/examples/dba_array.php +++ b/ext/spl/examples/dba_array.php @@ -49,4 +49,4 @@ catch (exception $err) { var_dump($err); exit(1); } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/dba_dump.php b/ext/spl/examples/dba_dump.php index 7ea8e76255..4c080729b2 100755 --- a/ext/spl/examples/dba_dump.php +++ b/ext/spl/examples/dba_dump.php @@ -39,4 +39,4 @@ foreach($db as $key => $val) { echo "'$key' => '$val'\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc index 01de37e990..095c5c29d5 100644 --- a/ext/spl/examples/dbareader.inc +++ b/ext/spl/examples/dbareader.inc @@ -93,4 +93,4 @@ class DbaReader implements Iterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/directorygraphiterator.inc b/ext/spl/examples/directorygraphiterator.inc index 3f0bb263e2..65a4dd7a38 100644 --- a/ext/spl/examples/directorygraphiterator.inc +++ b/ext/spl/examples/directorygraphiterator.inc @@ -31,4 +31,4 @@ class DirectoryGraphIterator extends DirectoryTreeIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/directorytree.inc b/ext/spl/examples/directorytree.inc index 7bd9c2c597..20a15c815f 100644 --- a/ext/spl/examples/directorytree.inc +++ b/ext/spl/examples/directorytree.inc @@ -24,4 +24,4 @@ class DirectoryTree extends RecursiveIteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/directorytree.php b/ext/spl/examples/directorytree.php index dc26d6cc22..38759837f5 100755 --- a/ext/spl/examples/directorytree.php +++ b/ext/spl/examples/directorytree.php @@ -34,4 +34,4 @@ foreach(new LimitIterator(new DirectoryTreeIterator($argv[1]), @$argv[2], $lengt echo $file . "\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/directorytreeiterator.inc b/ext/spl/examples/directorytreeiterator.inc index 8454d9e305..52a4e114ed 100644 --- a/ext/spl/examples/directorytreeiterator.inc +++ b/ext/spl/examples/directorytreeiterator.inc @@ -51,4 +51,4 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/findfile.inc b/ext/spl/examples/findfile.inc index 02ab792433..afafa8124d 100644 --- a/ext/spl/examples/findfile.inc +++ b/ext/spl/examples/findfile.inc @@ -62,4 +62,4 @@ class FindFile extends FilterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/findfile.php b/ext/spl/examples/findfile.php index 60146cbffd..7a850feddb 100755 --- a/ext/spl/examples/findfile.php +++ b/ext/spl/examples/findfile.php @@ -30,4 +30,4 @@ EOF; if (!class_exists("FindFile", false)) require_once("findfile.inc"); foreach(new FindFile($argv[1], $argv[2]) as $file) echo $file->getPathname()."\n"; -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/findregex.php b/ext/spl/examples/findregex.php index 288c0924b1..284f985943 100755 --- a/ext/spl/examples/findregex.php +++ b/ext/spl/examples/findregex.php @@ -33,4 +33,4 @@ foreach(new RegexFindFile($argv[1], $argv[2]) as $file) echo $file->getPathname()."\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/ini_groups.php b/ext/spl/examples/ini_groups.php index 4c6c89bd70..540fc68c9c 100755 --- a/ext/spl/examples/ini_groups.php +++ b/ext/spl/examples/ini_groups.php @@ -38,4 +38,4 @@ foreach($it as $group) { echo "$group\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc index cb2bb04a57..d33f169c4b 100644 --- a/ext/spl/examples/inigroups.inc +++ b/ext/spl/examples/inigroups.inc @@ -51,4 +51,4 @@ class IniGroups extends KeyFilter } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/keyfilter.inc b/ext/spl/examples/keyfilter.inc index abc925ec43..21bb79a2d1 100644 --- a/ext/spl/examples/keyfilter.inc +++ b/ext/spl/examples/keyfilter.inc @@ -61,4 +61,4 @@ class KeyFilter extends FilterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/nocvsdir.php b/ext/spl/examples/nocvsdir.php index 6993268945..d8e4362ab6 100755 --- a/ext/spl/examples/nocvsdir.php +++ b/ext/spl/examples/nocvsdir.php @@ -52,4 +52,4 @@ foreach($it as $pathname => $file) echo $pathname."\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/phar_from_dir.php b/ext/spl/examples/phar_from_dir.php index d75788e840..23fcfc9777 100755 --- a/ext/spl/examples/phar_from_dir.php +++ b/ext/spl/examples/phar_from_dir.php @@ -47,4 +47,4 @@ foreach($dir as $file) $phar->commit(); -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/regexfindfile.inc b/ext/spl/examples/regexfindfile.inc index d5dd722536..395624b8de 100644 --- a/ext/spl/examples/regexfindfile.inc +++ b/ext/spl/examples/regexfindfile.inc @@ -37,4 +37,4 @@ class RegexFindFile extends FindFile } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc index ff4963bc72..451ae08fd2 100644 --- a/ext/spl/examples/searchiterator.inc +++ b/ext/spl/examples/searchiterator.inc @@ -55,4 +55,4 @@ abstract class SearchIterator extends FilterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/examples/tests/examples.inc b/ext/spl/examples/tests/examples.inc index feeba7db24..7502514659 100644 --- a/ext/spl/examples/tests/examples.inc +++ b/ext/spl/examples/tests/examples.inc @@ -20,4 +20,4 @@ foreach (new IncludeFiles(dirname(__FILE__). '/..', $classes) as $file) require_once($file); } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc index ac80e79581..c7a05717a6 100644 --- a/ext/spl/internal/emptyiterator.inc +++ b/ext/spl/internal/emptyiterator.inc @@ -59,4 +59,4 @@ class EmptyIterator implements Iterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/filteriterator.inc b/ext/spl/internal/filteriterator.inc index e11e467a10..27cb9c064f 100644 --- a/ext/spl/internal/filteriterator.inc +++ b/ext/spl/internal/filteriterator.inc @@ -124,4 +124,4 @@ abstract class FilterIterator implements OuterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/infiniteiterator.inc b/ext/spl/internal/infiniteiterator.inc index 04d7827182..ffd728cf09 100644 --- a/ext/spl/internal/infiniteiterator.inc +++ b/ext/spl/internal/infiniteiterator.inc @@ -45,4 +45,4 @@ class InfiniteIterator extends IteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/limititerator.inc b/ext/spl/internal/limititerator.inc index 00c4122872..78c96d1049 100644 --- a/ext/spl/internal/limititerator.inc +++ b/ext/spl/internal/limititerator.inc @@ -131,4 +131,4 @@ class LimitIterator implements OuterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/norewinditerator.inc b/ext/spl/internal/norewinditerator.inc index 8747a6116e..6b61dbba02 100644 --- a/ext/spl/internal/norewinditerator.inc +++ b/ext/spl/internal/norewinditerator.inc @@ -25,4 +25,4 @@ class NoRewindIterator extends IteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/outeriterator.inc b/ext/spl/internal/outeriterator.inc index f26d29da56..c2684ae51c 100644 --- a/ext/spl/internal/outeriterator.inc +++ b/ext/spl/internal/outeriterator.inc @@ -22,4 +22,4 @@ interface OuterIterator extends Iterator function getInnerIterator(); } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc index 69a223444d..e3c5605f83 100644 --- a/ext/spl/internal/parentiterator.inc +++ b/ext/spl/internal/parentiterator.inc @@ -29,4 +29,4 @@ class ParentIterator extends RecursiveFilterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc index 2059b97c1c..418fb0d9e1 100644 --- a/ext/spl/internal/recursivearrayiterator.inc +++ b/ext/spl/internal/recursivearrayiterator.inc @@ -56,4 +56,4 @@ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator private $ref; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc index 3ae127ad94..fcbbda7042 100644 --- a/ext/spl/internal/recursivecachingiterator.inc +++ b/ext/spl/internal/recursivecachingiterator.inc @@ -96,4 +96,4 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc index 87d98da885..2c0d9ef998 100644 --- a/ext/spl/internal/recursivefilteriterator.inc +++ b/ext/spl/internal/recursivefilteriterator.inc @@ -59,4 +59,4 @@ abstract class RecursiveFilterIterator extends FilterIterator implements Recursi private $ref; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc index 6e6c023486..a89fbd8577 100644 --- a/ext/spl/internal/recursiveiterator.inc +++ b/ext/spl/internal/recursiveiterator.inc @@ -27,4 +27,4 @@ interface RecursiveIterator extends Iterator function getChildren(); } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index c22a92bf71..46110c9fb9 100644 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc @@ -234,4 +234,4 @@ class RecursiveIteratorIterator implements OuterIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc index 4223104398..51cf6c415f 100644 --- a/ext/spl/internal/recursiveregexiterator.inc +++ b/ext/spl/internal/recursiveregexiterator.inc @@ -58,4 +58,4 @@ class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator private $ref; } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/recursivetreeiterator.inc b/ext/spl/internal/recursivetreeiterator.inc index dfcdc05995..a2312414ea 100644 --- a/ext/spl/internal/recursivetreeiterator.inc +++ b/ext/spl/internal/recursivetreeiterator.inc @@ -129,4 +129,4 @@ class RecursiveTreeIterator extends RecursiveIteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc index 7728636981..83e5588c74 100644 --- a/ext/spl/internal/seekableiterator.inc +++ b/ext/spl/internal/seekableiterator.inc @@ -45,4 +45,4 @@ interface SeekableIterator extends Iterator function seek($index); } -?>
\ No newline at end of file +?> diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index e7e7ea0bd0..c2e460b95a 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -1255,4 +1255,3 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */ * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/spl/tests/testclass.class.inc b/ext/spl/tests/testclass.class.inc index f5fe7411fa..c5d6034423 100644 --- a/ext/spl/tests/testclass.class.inc +++ b/ext/spl/tests/testclass.class.inc @@ -6,4 +6,4 @@ class TestClass { } -?>
\ No newline at end of file +?> diff --git a/ext/spl/tests/testclass.inc b/ext/spl/tests/testclass.inc index ceb24c877c..0684d2098d 100644 --- a/ext/spl/tests/testclass.inc +++ b/ext/spl/tests/testclass.inc @@ -2,4 +2,4 @@ echo __FILE__ . "\n"; -?>
\ No newline at end of file +?> diff --git a/ext/spl/tests/testclass.php.inc b/ext/spl/tests/testclass.php.inc index ceb24c877c..0684d2098d 100644 --- a/ext/spl/tests/testclass.php.inc +++ b/ext/spl/tests/testclass.php.inc @@ -2,4 +2,4 @@ echo __FILE__ . "\n"; -?>
\ No newline at end of file +?> diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag index 8b6e3e233a..72d5eee4aa 100644 --- a/ext/standard/Makefile.frag +++ b/ext/standard/Makefile.frag @@ -1,4 +1,3 @@ - $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) diff --git a/ext/standard/Makefile.frag.w32 b/ext/standard/Makefile.frag.w32 index 640e4840d3..9b0c57b431 100644 --- a/ext/standard/Makefile.frag.w32 +++ b/ext/standard/Makefile.frag.w32 @@ -1,4 +1,3 @@ - ext\standard\var_unserializer.c: ext\standard\var_unserializer.re cd $(PHP_SRC_DIR) $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re @@ -8,4 +7,3 @@ ext\standard\url_scanner_ex.c: ext\standard\url_scanner_ex.re $(RE2C) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re $(BUILD_DIR)\ext\standard\basic_functions.obj: $(PHP_SRC_DIR)\Zend\zend_language_parser.h - diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 1f8a4eff78..569d602665 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -392,4 +392,3 @@ PHP_FUNCTION(assert_options) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index deb9692863..c6f6e32888 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -42,4 +42,3 @@ if (PHP_MBREGEX != "no") { } ADD_MAKEFILE_FRAGMENT(); PHP_INSTALL_HEADERS("", "ext/standard"); - diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h index 56861f149a..8b9b737d66 100644 --- a/ext/standard/cyr_convert.h +++ b/ext/standard/cyr_convert.h @@ -24,6 +24,3 @@ PHP_FUNCTION(convert_cyr_string); #endif /* CYR_CONVERT_H */ - - - diff --git a/ext/standard/file.h b/ext/standard/file.h index 1252226d1c..54df0936d3 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -146,4 +146,3 @@ extern PHPAPI php_file_globals file_globals; #endif /* FILE_H */ - diff --git a/ext/standard/html_tables/ents_html401.txt b/ext/standard/html_tables/ents_html401.txt index bd3ded9fde..c0533b0134 100644 --- a/ext/standard/html_tables/ents_html401.txt +++ b/ext/standard/html_tables/ents_html401.txt @@ -250,4 +250,4 @@ Dagger 2021 permil 2030 lsaquo 2039 rsaquo 203A -euro 20AC
\ No newline at end of file +euro 20AC diff --git a/ext/standard/html_tables/ents_html5.txt b/ext/standard/html_tables/ents_html5.txt index 005bebbe20..18fcc02f9c 100644 --- a/ext/standard/html_tables/ents_html5.txt +++ b/ext/standard/html_tables/ents_html5.txt @@ -2122,4 +2122,4 @@ zigrarr 021DD zopf 1D56B zscr 1D4CF zwj 0200D -zwnj 0200C
\ No newline at end of file +zwnj 0200C diff --git a/ext/standard/html_tables/ents_xhtml.txt b/ext/standard/html_tables/ents_xhtml.txt index 81800bcd2d..90cebfd274 100644 --- a/ext/standard/html_tables/ents_xhtml.txt +++ b/ext/standard/html_tables/ents_xhtml.txt @@ -250,4 +250,4 @@ loz 25CA spades 2660 clubs 2663 hearts 2665 -diams 2666
\ No newline at end of file +diams 2666 diff --git a/ext/standard/http.c b/ext/standard/http.c index 711a3975d1..f73d4cac7e 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -270,4 +270,3 @@ PHP_FUNCTION(http_build_query) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/info.h b/ext/standard/info.h index 1c0e445dfa..d22521bb9f 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -85,4 +85,3 @@ void register_phpinfo_constants(INIT_FUNC_ARGS); END_EXTERN_C() #endif /* INFO_H */ - diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index 461373d76b..44cb6d2bfc 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -368,4 +368,3 @@ PHP_MINIT_FUNCTION(mt_rand) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index 52dda93348..a3b348ca3d 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -425,4 +425,3 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) #undef MD5_MAGIC #undef MD5_MAGIC_LEN #endif - diff --git a/ext/standard/php_http.h b/ext/standard/php_http.h index 4128863555..445a93d613 100644 --- a/ext/standard/php_http.h +++ b/ext/standard/php_http.h @@ -43,4 +43,3 @@ PHP_FUNCTION(http_build_query); * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/php_mt_rand.h b/ext/standard/php_mt_rand.h index 411f7e3279..fb641c2d32 100644 --- a/ext/standard/php_mt_rand.h +++ b/ext/standard/php_mt_rand.h @@ -41,4 +41,3 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max); PHP_MINIT_FUNCTION(mt_rand); #endif /* PHP_MT_RAND_H */ - diff --git a/ext/standard/php_smart_string.h b/ext/standard/php_smart_string.h index 0d6a135159..63f8d9ec60 100644 --- a/ext/standard/php_smart_string.h +++ b/ext/standard/php_smart_string.h @@ -19,4 +19,3 @@ /* Header moved to Zend. This file is retained for BC. */ #include "zend_smart_string.h" - diff --git a/ext/standard/php_smart_string_public.h b/ext/standard/php_smart_string_public.h index 255fbd94a1..272b948515 100644 --- a/ext/standard/php_smart_string_public.h +++ b/ext/standard/php_smart_string_public.h @@ -19,4 +19,3 @@ /* Header moved to Zend. This file is retained for BC. */ #include "zend_smart_string_public.h" - diff --git a/ext/standard/proc_open.h b/ext/standard/proc_open.h index 857771a0aa..7bc0a83b18 100644 --- a/ext/standard/proc_open.h +++ b/ext/standard/proc_open.h @@ -47,4 +47,3 @@ struct php_process_handle { int is_persistent; php_process_env_t env; }; - diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 86c07c3ac7..2654382906 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1760,4 +1760,3 @@ PHP_FUNCTION(stream_socket_shutdown) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h index b34df344be..ac9b800ec8 100644 --- a/ext/standard/streamsfuncs.h +++ b/ext/standard/streamsfuncs.h @@ -78,4 +78,3 @@ PHP_FUNCTION(stream_socket_pair); * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/standard/tests/array/compare_function.inc b/ext/standard/tests/array/compare_function.inc index e5176802ab..4fa672e767 100644 --- a/ext/standard/tests/array/compare_function.inc +++ b/ext/standard/tests/array/compare_function.inc @@ -10,4 +10,4 @@ function compare_function($var1, $var2) { } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoInterface.inc b/ext/standard/tests/class_object/AutoInterface.inc index f1e5b1f58f..805d7f1f6f 100644 --- a/ext/standard/tests/class_object/AutoInterface.inc +++ b/ext/standard/tests/class_object/AutoInterface.inc @@ -2,4 +2,4 @@ Interface AutoInterface {} -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoLoaded.inc b/ext/standard/tests/class_object/AutoLoaded.inc index 52e6671ddc..2935b801e5 100644 --- a/ext/standard/tests/class_object/AutoLoaded.inc +++ b/ext/standard/tests/class_object/AutoLoaded.inc @@ -2,4 +2,4 @@ class AutoLoaded {} -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoTest.inc b/ext/standard/tests/class_object/AutoTest.inc index a0c8244265..fb487fb071 100644 --- a/ext/standard/tests/class_object/AutoTest.inc +++ b/ext/standard/tests/class_object/AutoTest.inc @@ -10,4 +10,4 @@ class autoTest { } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoTrait.inc b/ext/standard/tests/class_object/AutoTrait.inc index 698e975ef7..c371d59271 100644 --- a/ext/standard/tests/class_object/AutoTrait.inc +++ b/ext/standard/tests/class_object/AutoTrait.inc @@ -2,4 +2,4 @@ trait AutoTrait {} -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/file/fopen_include_path.inc b/ext/standard/tests/file/fopen_include_path.inc index 5bc9b6ce3b..e33dae4915 100644 --- a/ext/standard/tests/file/fopen_include_path.inc +++ b/ext/standard/tests/file/fopen_include_path.inc @@ -89,4 +89,4 @@ function teardown_relative_path() { rmdir($newdir); } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/file/windows_mb_path/util.inc b/ext/standard/tests/file/windows_mb_path/util.inc index 98cec87dc6..de4072a1aa 100644 --- a/ext/standard/tests/file/windows_mb_path/util.inc +++ b/ext/standard/tests/file/windows_mb_path/util.inc @@ -146,4 +146,3 @@ function create_data($id, $item = "", $cp = 65001, $utf8 = true) return $prefix; } - diff --git a/ext/standard/tests/file/windows_mb_path/util_utf8.inc b/ext/standard/tests/file/windows_mb_path/util_utf8.inc index 8d7009f91c..e091564998 100644 --- a/ext/standard/tests/file/windows_mb_path/util_utf8.inc +++ b/ext/standard/tests/file/windows_mb_path/util_utf8.inc @@ -92,4 +92,3 @@ echo \"hello there from the include\n\";"; return $prefix; } - diff --git a/ext/standard/tests/filters/filter_errors.inc b/ext/standard/tests/filters/filter_errors.inc index 6d1a270c82..8636fbe17f 100644 --- a/ext/standard/tests/filters/filter_errors.inc +++ b/ext/standard/tests/filters/filter_errors.inc @@ -34,4 +34,3 @@ function filter_errors_test($filter, $data) { stream_get_contents($stream); } - diff --git a/ext/standard/tests/general_functions/proc_open_pipes.inc b/ext/standard/tests/general_functions/proc_open_pipes.inc index 0d9894683a..576118ffd6 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes.inc +++ b/ext/standard/tests/general_functions/proc_open_pipes.inc @@ -19,4 +19,3 @@ function unlink_sleep_script() unlink($fname); } } - diff --git a/ext/standard/tests/math/allowed_rounding_error.inc b/ext/standard/tests/math/allowed_rounding_error.inc index 71dbf9af4a..9ba754b582 100644 --- a/ext/standard/tests/math/allowed_rounding_error.inc +++ b/ext/standard/tests/math/allowed_rounding_error.inc @@ -15,4 +15,4 @@ function allowed_rounding_error ($number, $expected) { return false; } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/misc/browscap_lite_2016_12_06.ini b/ext/standard/tests/misc/browscap_lite_2016_12_06.ini index 8f91165977..b5a7432e2d 100644 --- a/ext/standard/tests/misc/browscap_lite_2016_12_06.ini +++ b/ext/standard/tests/misc/browscap_lite_2016_12_06.ini @@ -11015,4 +11015,3 @@ Comment="Default Browser" Browser="Default Browser" isMobileDevice="false" isTablet="false" - diff --git a/ext/standard/tests/streams/bug64433_srv.inc b/ext/standard/tests/streams/bug64433_srv.inc index e79a2fd6d6..dcdb1bcbaa 100644 --- a/ext/standard/tests/streams/bug64433_srv.inc +++ b/ext/standard/tests/streams/bug64433_srv.inc @@ -11,4 +11,4 @@ if(!empty($_REQUEST["status"])) { http_response_code($_REQUEST["status"]); } -echo "HELLO!\n";
\ No newline at end of file +echo "HELLO!\n"; diff --git a/ext/sysvshm/config.w32 b/ext/sysvshm/config.w32 index 3a9a0d47df..80fb28ee61 100644 --- a/ext/sysvshm/config.w32 +++ b/ext/sysvshm/config.w32 @@ -5,4 +5,4 @@ ARG_ENABLE('sysvshm', 'SysV Shared Memory support', 'no'); if (PHP_SYSVSHM != 'no') { AC_DEFINE('HAVE_SYSVSHM', 1); EXTENSION('sysvshm', 'sysvshm.c'); -}
\ No newline at end of file +} diff --git a/ext/tidy/README b/ext/tidy/README index 0fb6c0f035..b46a038fad 100644 --- a/ext/tidy/README +++ b/ext/tidy/README @@ -1,4 +1,3 @@ - README FOR ext/tidy by John Coggeshall <john@php.net> diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index 654c1590c9..44b2abeacc 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -25,4 +25,3 @@ if (PHP_TIDY != "no") { WARNING("tidy not enabled; libraries and headers not found"); } } - diff --git a/ext/tidy/examples/dumpit5.php b/ext/tidy/examples/dumpit5.php index 1cae9b7d9a..571e0366fb 100644 --- a/ext/tidy/examples/dumpit5.php +++ b/ext/tidy/examples/dumpit5.php @@ -89,4 +89,4 @@ } -?>
\ No newline at end of file +?> diff --git a/ext/tokenizer/config.w32 b/ext/tokenizer/config.w32 index dd3b89e778..226ca8e234 100644 --- a/ext/tokenizer/config.w32 +++ b/ext/tokenizer/config.w32 @@ -7,5 +7,3 @@ if (PHP_TOKENIZER == "yes") { EXTENSION("tokenizer", "tokenizer.c tokenizer_data.c"); AC_DEFINE("HAVE_TOKENIZER", 1, "Tokenizer support"); } - - diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 6b36ab0e39..c9062ff4ff 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -306,4 +306,3 @@ char *get_token_type_name(int token_type) } return "UNKNOWN"; } - diff --git a/ext/wddx/config.w32 b/ext/wddx/config.w32 index a34c36ec91..48b78d1aec 100644 --- a/ext/wddx/config.w32 +++ b/ext/wddx/config.w32 @@ -22,5 +22,3 @@ if (PHP_WDDX == "yes" && ADD_EXTENSION_DEP('wddx', 'xml') CHECK_HEADER_ADD_INCLUDE("timelib_config.h", "CFLAGS_WDDX", "ext/date/lib"); } - - diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32 index cca068a95c..7fb1f8494b 100644 --- a/ext/xmlreader/config.w32 +++ b/ext/xmlreader/config.w32 @@ -16,4 +16,3 @@ if (PHP_XMLREADER == "yes" && ADD_EXTENSION_DEP('xmlreader', 'libxml'); ADD_EXTENSION_DEP('xmlreader', 'dom'); } - diff --git a/ext/xmlreader/examples/relaxNG.xml b/ext/xmlreader/examples/relaxNG.xml index 6b0cac1225..5d9f31fee0 100644 --- a/ext/xmlreader/examples/relaxNG.xml +++ b/ext/xmlreader/examples/relaxNG.xml @@ -1 +1 @@ -<TEI.2>hello</TEI.2>
\ No newline at end of file +<TEI.2>hello</TEI.2> diff --git a/ext/xmlreader/examples/xmlreader_relaxNG.php b/ext/xmlreader/examples/xmlreader_relaxNG.php index e56739a2fb..09f14be8cd 100644 --- a/ext/xmlreader/examples/xmlreader_relaxNG.php +++ b/ext/xmlreader/examples/xmlreader_relaxNG.php @@ -22,4 +22,4 @@ if (! $reader->isValid()) { print "Document is valid\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/xmlreader/examples/xmlreader_validatedtd.php b/ext/xmlreader/examples/xmlreader_validatedtd.php index 520a61ee30..b5508b6169 100644 --- a/ext/xmlreader/examples/xmlreader_validatedtd.php +++ b/ext/xmlreader/examples/xmlreader_validatedtd.php @@ -15,4 +15,4 @@ while($xml->read()) { } print "\n\nValid:\n"; var_dump($xml->isValid()); -?>
\ No newline at end of file +?> diff --git a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml index 68ee25ddb8..0f90a69cf0 100644 --- a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml @@ -4,4 +4,4 @@ <record><aaa><bbbb><ccc><![CDATA[XXX Xxxxxxxxxxxx]]></ccc><ddd><![CDATA[XXX Xx]]></ddd></bbbb><eee><![CDATA[Xxxxx xxxxxxx: xxxx://xxx.xxx.xx.xx/xxxx?xxxxXx=0xx000x0-000x-0xx0-x000-x0000xx0xx00 Xxxxxxxxxxxx xx Xxxxxxxxxxxx Xxxxxxxxx xx Xxxxxxxxx Xxxxxxxxxxxx Xxxxxxxxxxx Xxxxxxxxxxxx (XXX Xxxxxxxxxxxx), xxxxxxxxx xxxxxxx xx Xxx Xxxxxxxxxx Xxxxxxxxxx Xxx.]]></eee></aaa><fff><bbbb><ggg><![CDATA[Xxxxxxxxx Xxxxxxxxxxxxxxx Xxxxxxxxxx xx Xxxxxxxxxxxx]]></ggg><ccc><![CDATA[XXX Xxxxxxxxxxxx]]></ccc></bbbb><hhh><![CDATA[Xx xxxxx, xx xxxxxxxxxxx XXX Xxxxxxxxxxxx x xxxxxcé x’xxxxxxxx xxx x’Xxxxxxléx léxxxxxxxxx xx xx xxxxxxxx xx xx Xxxxxxxxxx Xxxxxxxxxx Xxx (xxx xxx xx xxxxxxxxxx xxxxxxxxx). Xxxxx xxx xréxxxx xxx xxxxxx xxx déxxxxxxxx XXX Xxxxxxxxxxxx xx xxxx xx’xxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxréxxxxxxtéx xx xxxxxxx xxx XX, xxx XXX xx xxx XXX xx xx xxxxxxxx xx xxxxx x’xxxxxxxx xx xxxxx xx xxxxxxxxx xxxxxxxxxxxxx xxréé (XXX). (Xxxxxxxxéx XXX - Xxx 0000)]]></hhh></fff></record> -</records>
\ No newline at end of file +</records> diff --git a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml index 9a59e0c978..7d8ef1fad3 100644 --- a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml @@ -4,4 +4,4 @@ <record><aaa><bbbb><ddd><![CDATA[XXX Xx]]></ddd></bbbb><eee><![CDATA[Xxxxx xxxxxxx: xxxx://xxx.xxx.xx.xx/xxxx?xxxxXx=0xx000x0-000x-0xx0-x000-x0000xx0xx00 Xxxxxxxxxxxx xx Xxxxxxxxxxxx Xxxxxxxxx xx Xxxxxxxxx Xxxxxxxxxxxx Xxxxxxxxxxx Xxxxxxxxxxxx (XXX Xxxxxxxxxxxx), xxxxxxxxx xxxxxxx xx Xxx Xxxxxxxxxx Xxxxxxxxxx Xxx.]]></eee></aaa><fff><bbbb><ggg><![CDATA[Xxxxxxxxx Xxxxxxxxxxxxxxx Xxxxxxxxxx xx Xxxxxxxxxxxx]]></ggg><ccc><![CDATA[XXX Xxxxxxxxxxxx]]></ccc></bbbb><hhh><![CDATA[Xx xxxxx, xx xxxxxxxxxxx XXX Xxxxxxxxxxxx x xxxxxcé x’xxxxxxxx xxx x’Xxxxxxléx léxxxxxxxxx xx xx xxxxxxxx xx xx Xxxxxxxxxx Xxxxxxxxxx Xxx (xxx xxx xx xxxxxxxxxx xxxxxxxxx). Xxxxx xxx xréxxxx xxx xxxxxx xxx déxxxxxxxx XXX Xxxxxxxxxxxx xx xxxx xx’xxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxréxxxxxxtéx xx xxxxxxx xxx XX, xxx XXX xx xxx XXX xx xx xxxxxxxx xx xxxxx x’xxxxxxxx xx xxxxx xx xxxxxxxxx xxxxxxxxxxxxx xxréé (XXX). (Xxxxxxxxéx XXX - Xxx 0000)]]></hhh></fff></record> -</records>
\ No newline at end of file +</records> diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index 35fbf26181..49acc247f6 100644 --- a/ext/xmlrpc/config.w32 +++ b/ext/xmlrpc/config.w32 @@ -19,4 +19,3 @@ if (PHP_XMLRPC != "no") { PHP_XMLRPC = "no"; } } - diff --git a/ext/xmlrpc/libxmlrpc/README b/ext/xmlrpc/libxmlrpc/README index 323edfa671..4835cd68e9 100644 --- a/ext/xmlrpc/libxmlrpc/README +++ b/ext/xmlrpc/libxmlrpc/README @@ -10,8 +10,3 @@ The rules are: This allows us to have a nicely encapsulated C api with opaque data types and private functions that are nonetheless shared between source files without redundant extern declarations.. - - - - - diff --git a/ext/xmlrpc/libxmlrpc/base64.h b/ext/xmlrpc/libxmlrpc/base64.h index 6a0c8ef6fc..f0272b4356 100644 --- a/ext/xmlrpc/libxmlrpc/base64.h +++ b/ext/xmlrpc/libxmlrpc/base64.h @@ -35,4 +35,3 @@ void _free_real(void *p, char *file, int line); #define malloc(s) _malloc_real(s,__FILE__,__LINE__) #define free(p) _free_real(p, __FILE__,__LINE__) #endif - diff --git a/ext/xmlrpc/libxmlrpc/encodings.c b/ext/xmlrpc/libxmlrpc/encodings.c index 5777152ea8..477077f777 100644 --- a/ext/xmlrpc/libxmlrpc/encodings.c +++ b/ext/xmlrpc/libxmlrpc/encodings.c @@ -115,4 +115,3 @@ char* utf8_decode(const char *s, int len, int *newlen, const char* encoding) { return convert(s, len, newlen, "UTF-8", encoding); } - diff --git a/ext/xmlrpc/libxmlrpc/system_methods.c b/ext/xmlrpc/libxmlrpc/system_methods.c index ff5e651fd0..31f4156a5d 100644 --- a/ext/xmlrpc/libxmlrpc/system_methods.c +++ b/ext/xmlrpc/libxmlrpc/system_methods.c @@ -370,6 +370,3 @@ XMLRPC_VALUE xsm_system_get_capabilities_cb(XMLRPC_SERVER server, XMLRPC_REQUEST /*-*********************** * End System Methods API * *************************/ - - - diff --git a/ext/xmlrpc/libxmlrpc/system_methods_private.h b/ext/xmlrpc/libxmlrpc/system_methods_private.h index fa3fc279f2..bea8779da9 100644 --- a/ext/xmlrpc/libxmlrpc/system_methods_private.h +++ b/ext/xmlrpc/libxmlrpc/system_methods_private.h @@ -85,7 +85,3 @@ int xsm_is_system_method(XMLRPC_Callback cb); #endif /* __SYSTEM_METHODS_PRIVATE_H */ - - - - diff --git a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c index 63cc52d6b7..0a391b8444 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c @@ -313,4 +313,3 @@ xml_element* DANDARPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { } return root; } - diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c index 64a9a6eaa5..cd0933fcbc 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -664,4 +664,3 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { return root; } - diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c index 309f0dce3d..860cba3e36 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c @@ -407,4 +407,3 @@ xml_element* XMLRPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { } return wrapper; } - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.h b/ext/xmlrpc/libxmlrpc/xmlrpc.h index 12b6c7a8ee..c3b30cbea8 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.h @@ -450,6 +450,3 @@ const char* XMLRPC_GetVersionString(void); #endif #endif /* not XMLRPC_ALREADY_INCLUDED */ - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c index c554e73dc4..727d5636de 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c @@ -596,6 +596,3 @@ int XMLRPC_ServerRegisterIntrospectionCallback(XMLRPC_SERVER server, XMLRPC_Intr /*-********************** * End Introspection API * ************************/ - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h index 41a31c6f51..2f90fc0e3c 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h @@ -96,6 +96,3 @@ int XMLRPC_ServerRegisterIntrospectionCallback(XMLRPC_SERVER server, XMLRPC_Intr #endif /* __XI_INTROSPECTION_H */ - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h index 5b231fe344..1a5d9f79a9 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h @@ -100,7 +100,3 @@ void xi_register_system_methods(XMLRPC_SERVER server); #endif /* __XI_INTROSPECTION_PRIVATE_H */ - - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_private.h b/ext/xmlrpc/libxmlrpc/xmlrpc_private.h index e43f78ecfb..7cda5c24be 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_private.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_private.h @@ -175,4 +175,3 @@ const char* type_to_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype); #endif /* XMLRPC_PRIVATE_ALREADY_INCLUDED */ - diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 19df2ad673..97e04eb2ca 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1458,4 +1458,3 @@ PHP_FUNCTION(xmlrpc_is_fault) * c-basic-offset: 4 * End: */ - diff --git a/ext/xmlwriter/config.w32 b/ext/xmlwriter/config.w32 index 2a95bfb820..7bd8a4befa 100644 --- a/ext/xmlwriter/config.w32 +++ b/ext/xmlwriter/config.w32 @@ -15,4 +15,3 @@ if (PHP_XMLWRITER == "yes" && PHP_LIBXML == "yes") { WARNING('Could not find xmlwriter.h'); } } - diff --git a/ext/xmlwriter/examples/xmlwriter_mem.php b/ext/xmlwriter/examples/xmlwriter_mem.php index 8f8eef9fa0..61902c08f6 100644 --- a/ext/xmlwriter/examples/xmlwriter_mem.php +++ b/ext/xmlwriter/examples/xmlwriter_mem.php @@ -36,4 +36,3 @@ echo $out; $out = xmlwriter_output_memory($xw); echo $out; - diff --git a/ext/xmlwriter/examples/xmlwriter_mem_ns.php b/ext/xmlwriter/examples/xmlwriter_mem_ns.php index e4d013194e..3ff61a3853 100644 --- a/ext/xmlwriter/examples/xmlwriter_mem_ns.php +++ b/ext/xmlwriter/examples/xmlwriter_mem_ns.php @@ -27,4 +27,3 @@ xmlwriter_end_document($xw); $out = xmlwriter_output_memory($xw, 0); echo $out; - diff --git a/ext/xsl/tests/53965/collection.xml b/ext/xsl/tests/53965/collection.xml index a3039cd101..1c9dc175cd 100644 --- a/ext/xsl/tests/53965/collection.xml +++ b/ext/xsl/tests/53965/collection.xml @@ -10,4 +10,4 @@ <artist>Jimi Hendrix</artist> <year>1997</year> </cd> -</collection>
\ No newline at end of file +</collection> diff --git a/ext/xsl/tests/area_name.xml b/ext/xsl/tests/area_name.xml index 76cea58511..fbe3b20212 100644 --- a/ext/xsl/tests/area_name.xml +++ b/ext/xsl/tests/area_name.xml @@ -7,6 +7,3 @@ <AREA_NAME_ENG>m."Avtovo"</AREA_NAME_ENG> </ROW> </AREA_NAME> - - - diff --git a/ext/xsl/tests/exslt.xml b/ext/xsl/tests/exslt.xml index 562e08e821..06110aabd4 100644 --- a/ext/xsl/tests/exslt.xml +++ b/ext/xsl/tests/exslt.xml @@ -12,4 +12,3 @@ <date date="2006-01-01"/> <date date="2007-12-31"/> </page> - diff --git a/ext/zend_test/config.w32 b/ext/zend_test/config.w32 index 9b1574ef4e..76a0f1ae5b 100644 --- a/ext/zend_test/config.w32 +++ b/ext/zend_test/config.w32 @@ -5,4 +5,3 @@ ARG_ENABLE("zend-test", "enable zend-test extension", "no"); if (PHP_ZEND_TEST != "no") { EXTENSION("zend_test", "test.c", PHP_ZEND_TEST_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); } - diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 1765efe7cb..0ad566a025 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -259,4 +259,3 @@ ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_GET_MODULE(zend_test) #endif - diff --git a/ext/zip/examples/addglob.php b/ext/zip/examples/addglob.php index 790312b4d5..3c432f0be5 100644 --- a/ext/zip/examples/addglob.php +++ b/ext/zip/examples/addglob.php @@ -11,4 +11,3 @@ $options = array( $found = $z->addGlob("/home/pierre/cvs/gd/libgd/tests/*.png", 0, $options); var_dump($found); $z->close(); - diff --git a/ext/zip/examples/addpattern.php b/ext/zip/examples/addpattern.php index a1a9b12291..41efaa5eb7 100644 --- a/ext/zip/examples/addpattern.php +++ b/ext/zip/examples/addpattern.php @@ -10,4 +10,3 @@ $options = array('remove_path' => '/home/pierre/cvs/gd/libgd/tests', $found = $z->addPattern("/(\.png)$/i", "/home/pierre/cvs/gd/libgd/tests", $options); var_dump($found); $z->close(); - diff --git a/ext/zip/examples/encryption.php b/ext/zip/examples/encryption.php index 69888170a9..9ef7dd8497 100644 --- a/ext/zip/examples/encryption.php +++ b/ext/zip/examples/encryption.php @@ -46,4 +46,3 @@ $ctx = stream_context_create(array( )); $text = file_get_contents("zip://$name#$file", false, $ctx); printf("Size = %d\n", strlen($text)); - diff --git a/ext/zip/examples/fopen.php b/ext/zip/examples/fopen.php index 32357f3c08..80de5d052a 100644 --- a/ext/zip/examples/fopen.php +++ b/ext/zip/examples/fopen.php @@ -31,5 +31,3 @@ while (!feof($fp)) { fclose($fp); file_put_contents('t',$contents); echo "done.\n"; - - diff --git a/ext/zip/examples/get_set_comments.php b/ext/zip/examples/get_set_comments.php index 5bd302e6da..bec4240246 100644 --- a/ext/zip/examples/get_set_comments.php +++ b/ext/zip/examples/get_set_comments.php @@ -35,4 +35,3 @@ echo $z->getCommentName('foobar/', ZIPARCHIVE::FL_UNCHANGED) . "\n"; echo "Archive comment: " . $z->getArchiveComment() . "\n"; echo "Archive comment (original): " . $z->getArchiveComment(ZIPARCHIVE::FL_UNCHANGED) . "\n"; - diff --git a/ext/zip/examples/im.php b/ext/zip/examples/im.php index 3721434054..b664e91c2b 100644 --- a/ext/zip/examples/im.php +++ b/ext/zip/examples/im.php @@ -8,4 +8,3 @@ $z->open(dirname(__FILE__) . '/test_im.zip'); $im_string = $z->getFromName("pear_item.gif"); $im = imagecreatefromstring($im_string); imagepng($im, 'b.png'); - diff --git a/ext/zip/tests/bug38943.inc b/ext/zip/tests/bug38943.inc index a6f45e8294..b439939e64 100644 --- a/ext/zip/tests/bug38943.inc +++ b/ext/zip/tests/bug38943.inc @@ -13,4 +13,3 @@ class myZip extends ZipArchive { $z = new myZip; $z->testp = "foobar"; var_dump($z); - diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32 index 820025aa7f..668b95ad6d 100644 --- a/ext/zlib/config.w32 +++ b/ext/zlib/config.w32 @@ -18,5 +18,3 @@ if (PHP_ZLIB == "yes") { PHP_ZLIB = "no" } } - - diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc index 441199ff08..bee4e51d9a 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -1,4 +1,3 @@ - <?php $data = <<<QUOTE To be or not to be, that is the question; @@ -85,4 +84,4 @@ That summons thee to heaven or to hell. QUOTE; -?>
\ No newline at end of file +?> diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc index e431afedbf..7556f81e6a 100644 --- a/ext/zlib/tests/func.inc +++ b/ext/zlib/tests/func.inc @@ -16,4 +16,3 @@ function get_zlib_version() return $version; } - diff --git a/ext/zlib/tests/gzopen_include_path.inc b/ext/zlib/tests/gzopen_include_path.inc index 7d6723a815..add04f74de 100644 --- a/ext/zlib/tests/gzopen_include_path.inc +++ b/ext/zlib/tests/gzopen_include_path.inc @@ -89,4 +89,4 @@ function teardown_relative_path() { rmdir($newdir); } } -?>
\ No newline at end of file +?> diff --git a/ext/zlib/tests/reading_include_path.inc b/ext/zlib/tests/reading_include_path.inc index ee71bb9c42..abe80bf69c 100644 --- a/ext/zlib/tests/reading_include_path.inc +++ b/ext/zlib/tests/reading_include_path.inc @@ -24,4 +24,4 @@ foreach($newdirs as $newdir) { } mkdir($workingDir); chdir($workingDir); -?>
\ No newline at end of file +?> diff --git a/ext/zlib/zlib_win32_howto.txt b/ext/zlib/zlib_win32_howto.txt index 89bdb29f1e..dffc32d9f1 100644 --- a/ext/zlib/zlib_win32_howto.txt +++ b/ext/zlib/zlib_win32_howto.txt @@ -11,5 +11,3 @@ php_build is a directory at the same level as php7. Start Visual Studio, load php_modules.dsw, select the ZLIB projects, and build it. - - @@ -1,4 +1,3 @@ - /* * Local variables: * tab-width: 4 @@ -26,4 +26,3 @@ for f in $CLEANUP_FILES; do cp $f $f.orig grep -v '#line ' $f.orig > $f done - diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h index 9c05bff66d..5d2fa9f352 100644 --- a/main/streams/php_streams_int.h +++ b/main/streams/php_streams_int.h @@ -68,4 +68,3 @@ void php_stream_mode_sanitize_fdopen_fopencookie(php_stream *stream, char *resul void php_stream_tidy_wrapper_error_log(php_stream_wrapper *wrapper); void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *path, const char *caption); - diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 2609f02817..c72c7765f0 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -1564,5 +1564,3 @@ php_stream_ops php_stream_userspace_dir_ops = { NULL, /* stat */ NULL /* set_option */ }; - - diff --git a/pear/Makefile.frag b/pear/Makefile.frag index bbe8ec3513..528683ba1b 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -34,4 +34,3 @@ install-pear: else \ cat $(srcdir)/install-pear.txt; \ fi - diff --git a/pear/fetch.php b/pear/fetch.php index 01d223392e..56767b62cb 100644 --- a/pear/fetch.php +++ b/pear/fetch.php @@ -72,5 +72,3 @@ if (is_resource($fp) && file_put_contents($argv[2], $fp)) { $err = error_get_last(); echo "\nError..\n", $err["message"], "\n"; exit(1); - - diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index d624141c9f..15ef022d24 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -73,4 +73,3 @@ TODO PHP functions like apache_sub_req (see php_functions.c) Source Code Highlighting Protocol handlers - diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 8ea1305d4f..20a801ff9e 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -55,4 +55,3 @@ if (PHP_APACHE2_4HANDLER != "no") { WARNING("Could not find apache 2.4 libraries/headers"); } } - diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag index 75c72bf8b7..79e2afec25 100644 --- a/sapi/cgi/Makefile.frag +++ b/sapi/cgi/Makefile.frag @@ -10,4 +10,3 @@ install-cgi: $(SAPI_CGI_PATH) @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 - diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag index 8f4f400401..aa1d642b9c 100644 --- a/sapi/cli/Makefile.frag +++ b/sapi/cli/Makefile.frag @@ -10,4 +10,3 @@ install-cli: $(SAPI_CLI_PATH) @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 - diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32 index 7d0e5954ff..c510e231d1 100644 --- a/sapi/cli/config.w32 +++ b/sapi/cli/config.w32 @@ -24,4 +24,3 @@ if (PHP_CLI_WIN32 == "yes") { SAPI('cli_win32', 'cli_win32.c php_cli_process_title.c ps_title.c', 'php-win.exe', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); ADD_FLAG("LDFLAGS_CLI_WIN32", "/stack:67108864"); } - diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc index 2a21ba35d0..ff4eef0e12 100644 --- a/sapi/cli/tests/php_cli_server.inc +++ b/sapi/cli/tests/php_cli_server.inc @@ -97,4 +97,3 @@ function php_cli_server_stop($handle) { return $success; } ?> - diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index 5be7af48f4..dcdb4d68aa 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -30,4 +30,3 @@ if test "$PHP_EMBED" != "no"; then else AC_MSG_RESULT(no) fi - diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c index e43eb5a86d..2bd890b224 100644 --- a/sapi/fpm/fpm/fpm.c +++ b/sapi/fpm/fpm/fpm.c @@ -1,4 +1,3 @@ - /* $Id: fpm.c,v 1.23 2008/07/20 16:38:31 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -122,4 +121,3 @@ run_child: /* only workers reach this point */ return fpm_globals.listening_socket; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h index 4916140e17..5ac3ea9106 100644 --- a/sapi/fpm/fpm/fpm.h +++ b/sapi/fpm/fpm/fpm.h @@ -1,4 +1,3 @@ - /* $Id: fpm.h,v 1.13 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_arrays.h b/sapi/fpm/fpm/fpm_arrays.h index 02846b7c01..6975ab21af 100644 --- a/sapi/fpm/fpm/fpm_arrays.h +++ b/sapi/fpm/fpm/fpm_arrays.h @@ -1,4 +1,3 @@ - /* $Id: fpm_arrays.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_atomic.h b/sapi/fpm/fpm/fpm_atomic.h index 662dd4726d..7b17df6bc1 100644 --- a/sapi/fpm/fpm/fpm_atomic.h +++ b/sapi/fpm/fpm/fpm_atomic.h @@ -1,4 +1,3 @@ - /* $Id: fpm_atomic.h,v 1.3 2008/09/18 23:34:11 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -165,4 +164,3 @@ static inline int fpm_spinlock(atomic_t *lock, int try_once) /* {{{ */ #define fpm_unlock(lock) lock = 0 #endif - diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c index 4ee316ba1b..bda85ef5a8 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -1,4 +1,3 @@ - /* $Id: fpm_children.c,v 1.32.2.2 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -478,4 +477,3 @@ int fpm_children_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_children.h b/sapi/fpm/fpm/fpm_children.h index 9c79f234e8..a488b544fd 100644 --- a/sapi/fpm/fpm/fpm_children.h +++ b/sapi/fpm/fpm/fpm_children.h @@ -1,4 +1,3 @@ - /* $Id: fpm_children.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_cleanup.c b/sapi/fpm/fpm/fpm_cleanup.c index 260ddb32e7..dbab8ed786 100644 --- a/sapi/fpm/fpm/fpm_cleanup.c +++ b/sapi/fpm/fpm/fpm_cleanup.c @@ -1,4 +1,3 @@ - /* $Id: fpm_cleanup.c,v 1.8 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -49,4 +48,3 @@ void fpm_cleanups_run(int type) /* {{{ */ fpm_array_free(&cleanups); } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_cleanup.h b/sapi/fpm/fpm/fpm_cleanup.h index 4d7cf391cb..71639afe94 100644 --- a/sapi/fpm/fpm/fpm_cleanup.h +++ b/sapi/fpm/fpm/fpm_cleanup.h @@ -1,4 +1,3 @@ - /* $Id: fpm_cleanup.h,v 1.5 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -18,4 +17,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_clock.c b/sapi/fpm/fpm/fpm_clock.c index 66751b81bb..b03531ff24 100644 --- a/sapi/fpm/fpm/fpm_clock.c +++ b/sapi/fpm/fpm/fpm_clock.c @@ -1,4 +1,3 @@ - /* $Id: fpm_clock.c,v 1.4 2008/09/18 23:19:59 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_clock.h b/sapi/fpm/fpm/fpm_clock.h index 6aab959e16..7f62d0055f 100644 --- a/sapi/fpm/fpm/fpm_clock.h +++ b/sapi/fpm/fpm/fpm_clock.h @@ -1,4 +1,3 @@ - /* $Id: fpm_clock.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index b93cd15fe7..42ee60b36c 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1,4 +1,3 @@ - /* $Id: fpm_conf.c,v 1.33.2.3 2008/12/13 03:50:29 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h index a0434b694d..2f11953367 100644 --- a/sapi/fpm/fpm/fpm_conf.h +++ b/sapi/fpm/fpm/fpm_conf.h @@ -1,4 +1,3 @@ - /* $Id: fpm_conf.h,v 1.12.2.2 2008/12/13 03:46:49 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -119,4 +118,3 @@ int fpm_conf_write_pid(); int fpm_conf_unlink_pid(); #endif - diff --git a/sapi/fpm/fpm/fpm_config.h b/sapi/fpm/fpm/fpm_config.h index 856414a920..78768ed214 100644 --- a/sapi/fpm/fpm/fpm_config.h +++ b/sapi/fpm/fpm/fpm_config.h @@ -76,4 +76,3 @@ #else # define HAVE_FPM_LQ 0 #endif - diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c index 73affab236..0581577115 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -1,4 +1,3 @@ - /* $Id: fpm_env.c,v 1.15 2008/09/18 23:19:59 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -275,4 +274,3 @@ int fpm_env_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_env.h b/sapi/fpm/fpm/fpm_env.h index bf472368da..24ff84b6f0 100644 --- a/sapi/fpm/fpm/fpm_env.h +++ b/sapi/fpm/fpm/fpm_env.h @@ -1,4 +1,3 @@ - /* $Id: fpm_env.h,v 1.9 2008/09/18 23:19:59 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -24,4 +23,3 @@ void clearenv(); #endif #endif - diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c index 2b8e8cf13a..3917a9658c 100644 --- a/sapi/fpm/fpm/fpm_events.c +++ b/sapi/fpm/fpm/fpm_events.c @@ -1,4 +1,3 @@ - /* $Id: fpm_events.c,v 1.21.2.2 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -537,4 +536,3 @@ int fpm_event_del(struct fpm_event_s *ev) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_events.h b/sapi/fpm/fpm/fpm_events.h index 416ec6e728..7e2c925345 100644 --- a/sapi/fpm/fpm/fpm_events.h +++ b/sapi/fpm/fpm/fpm_events.h @@ -1,4 +1,3 @@ - /* $Id: fpm_events.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index 02f8868142..cdfec8c5e0 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -1,4 +1,3 @@ - /* $Id: fpm_status.c 312262 2011-06-18 17:41:56Z felipe $ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_log.h b/sapi/fpm/fpm/fpm_log.h index d85d368da5..e3121777f0 100644 --- a/sapi/fpm/fpm/fpm_log.h +++ b/sapi/fpm/fpm/fpm_log.h @@ -1,4 +1,3 @@ - /* $Id: fpm_status.h 312263 2011-06-18 17:46:16Z felipe $ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_php.c b/sapi/fpm/fpm/fpm_php.c index 11a5e25f24..dc81b702ce 100644 --- a/sapi/fpm/fpm/fpm_php.c +++ b/sapi/fpm/fpm/fpm_php.c @@ -1,4 +1,3 @@ - /* $Id: fpm_php.c,v 1.22.2.4 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -286,4 +285,3 @@ char* fpm_php_get_string_from_table(zend_string *table, char *key) /* {{{ */ return NULL; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_php.h b/sapi/fpm/fpm/fpm_php.h index a2f2138d23..d0577e22f3 100644 --- a/sapi/fpm/fpm/fpm_php.h +++ b/sapi/fpm/fpm/fpm_php.h @@ -1,4 +1,3 @@ - /* $Id: fpm_php.h,v 1.10.2.1 2008/11/15 00:57:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -47,4 +46,3 @@ int fpm_php_limit_extensions(char *path); char* fpm_php_get_string_from_table(zend_string *table, char *key); #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index 26583881af..7480bd7648 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -1,4 +1,3 @@ - /* $Id: fpm_php_trace.c,v 1.27.2.1 2008/11/15 00:57:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -232,4 +231,3 @@ done0: /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.h b/sapi/fpm/fpm/fpm_php_trace.h index af5e456acb..3d9c81e472 100644 --- a/sapi/fpm/fpm/fpm_php_trace.h +++ b/sapi/fpm/fpm/fpm_php_trace.h @@ -1,4 +1,3 @@ - /* $Id: fpm_php_trace.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -10,4 +9,3 @@ struct fpm_child_s; void fpm_php_trace(struct fpm_child_s *); #endif - diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c index ca5a6f2e40..f99ec241c7 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.c +++ b/sapi/fpm/fpm/fpm_process_ctl.c @@ -1,4 +1,3 @@ - /* $Id: fpm_process_ctl.c,v 1.19.2.2 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -536,4 +535,3 @@ void fpm_pctl_on_socket_accept(struct fpm_event_s *ev, short which, void *arg) / zlog(ZLOG_DEBUG, "[pool %s] got accept without idle child available .... I forked", wp->config->name); } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_process_ctl.h b/sapi/fpm/fpm/fpm_process_ctl.h index 86a6ef0dfb..8888f738a0 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.h +++ b/sapi/fpm/fpm/fpm_process_ctl.h @@ -1,4 +1,3 @@ - /* $Id: fpm_process_ctl.h,v 1.6 2008/07/20 21:33:10 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -50,4 +49,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 3f82a7d4f7..a4ace85310 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -1,4 +1,3 @@ - /* $Id: fpm_request.c,v 1.9.2.1 2008/11/15 00:57:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ #ifdef HAVE_TIMES diff --git a/sapi/fpm/fpm/fpm_request.h b/sapi/fpm/fpm/fpm_request.h index d9e831d100..1328b5de4e 100644 --- a/sapi/fpm/fpm/fpm_request.h +++ b/sapi/fpm/fpm/fpm_request.h @@ -1,4 +1,3 @@ - /* $Id: fpm_request.h,v 1.4 2008/07/20 01:47:16 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c index b2ce46356f..7a65fcbeb7 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.c +++ b/sapi/fpm/fpm/fpm_scoreboard.c @@ -1,4 +1,3 @@ - /* $Id: fpm_status.c 312399 2011-06-23 08:03:52Z fat $ */ /* (c) 2009 Jerome Loyet */ @@ -336,4 +335,3 @@ float fpm_scoreboard_get_tick() /* {{{ */ } /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h index f58a28737d..abce616d76 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.h +++ b/sapi/fpm/fpm/fpm_scoreboard.h @@ -1,4 +1,3 @@ - /* $Id: fpm_status.h 312263 2011-06-18 17:46:16Z felipe $ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c index 7986056793..9a58e9d006 100644 --- a/sapi/fpm/fpm/fpm_shm.c +++ b/sapi/fpm/fpm/fpm_shm.c @@ -1,4 +1,3 @@ - /* $Id: fpm_shm.c,v 1.3 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin, Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_shm.h b/sapi/fpm/fpm/fpm_shm.h index bcb6099814..c9bfb4ee72 100644 --- a/sapi/fpm/fpm/fpm_shm.h +++ b/sapi/fpm/fpm/fpm_shm.h @@ -1,4 +1,3 @@ - /* $Id: fpm_shm.h,v 1.3 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -10,4 +9,3 @@ int fpm_shm_free(void *mem, size_t size); size_t fpm_shm_get_size_allocated(); #endif - diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c index 68cb15379b..0df119be38 100644 --- a/sapi/fpm/fpm/fpm_signals.c +++ b/sapi/fpm/fpm/fpm_signals.c @@ -1,4 +1,3 @@ - /* $Id: fpm_signals.c,v 1.24 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -252,4 +251,3 @@ int fpm_signals_get_fd() /* {{{ */ return sp[0]; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_signals.h b/sapi/fpm/fpm/fpm_signals.h index eb80faecfd..759a4e316c 100644 --- a/sapi/fpm/fpm/fpm_signals.h +++ b/sapi/fpm/fpm/fpm_signals.h @@ -1,4 +1,3 @@ - /* $Id: fpm_signals.h,v 1.5 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index 36a66544d7..727e2eb132 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -1,4 +1,3 @@ - /* $Id: fpm_sockets.c,v 1.20.2.1 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index 98b40ff206..020bb50134 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -1,4 +1,3 @@ - /* $Id: fpm_sockets.h,v 1.12 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c index 42d7d7bae0..1d78ebf849 100644 --- a/sapi/fpm/fpm/fpm_status.c +++ b/sapi/fpm/fpm/fpm_status.c @@ -1,4 +1,3 @@ - /* $Id$ */ /* (c) 2009 Jerome Loyet */ @@ -479,4 +478,3 @@ int fpm_status_handle_request(void) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_status.h b/sapi/fpm/fpm/fpm_status.h index c6c27cd031..37b2eed8f9 100644 --- a/sapi/fpm/fpm/fpm_status.h +++ b/sapi/fpm/fpm/fpm_status.h @@ -1,4 +1,3 @@ - /* $Id$ */ /* (c) 2009 Jerome Loyet */ diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c index 76e8b324df..7abd5b43a2 100644 --- a/sapi/fpm/fpm/fpm_stdio.c +++ b/sapi/fpm/fpm/fpm_stdio.c @@ -1,4 +1,3 @@ - /* $Id: fpm_stdio.c,v 1.22.2.2 2008/12/13 03:32:24 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -325,4 +324,3 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_stdio.h b/sapi/fpm/fpm/fpm_stdio.h index d3d61e46be..f5c45e1f6f 100644 --- a/sapi/fpm/fpm/fpm_stdio.h +++ b/sapi/fpm/fpm/fpm_stdio.h @@ -1,4 +1,3 @@ - /* $Id: fpm_stdio.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -17,4 +16,3 @@ int fpm_stdio_discard_pipes(struct fpm_child_s *child); int fpm_stdio_open_error_log(int reopen); #endif - diff --git a/sapi/fpm/fpm/fpm_str.h b/sapi/fpm/fpm/fpm_str.h index 65db5455a0..90250ffe3c 100644 --- a/sapi/fpm/fpm/fpm_str.h +++ b/sapi/fpm/fpm/fpm_str.h @@ -1,4 +1,3 @@ - /* $Id: fpm_str.h,v 1.3 2008/05/24 17:38:47 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_systemd.c b/sapi/fpm/fpm/fpm_systemd.c index 95d12c97f2..31b6a3d27a 100644 --- a/sapi/fpm/fpm/fpm_systemd.c +++ b/sapi/fpm/fpm/fpm_systemd.c @@ -110,4 +110,3 @@ int fpm_systemd_conf() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_systemd.h b/sapi/fpm/fpm/fpm_systemd.h index 3ee6217717..e978a7c7be 100644 --- a/sapi/fpm/fpm/fpm_systemd.h +++ b/sapi/fpm/fpm/fpm_systemd.h @@ -10,4 +10,3 @@ void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg); int fpm_systemd_conf(); #endif - diff --git a/sapi/fpm/fpm/fpm_trace.c b/sapi/fpm/fpm/fpm_trace.c index eae7fe9bbf..6fc24d544d 100644 --- a/sapi/fpm/fpm/fpm_trace.c +++ b/sapi/fpm/fpm/fpm_trace.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace.c,v 1.1 2008/07/20 20:59:00 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -33,5 +32,3 @@ int fpm_trace_get_strz(char *buf, size_t sz, long addr) /* {{{ */ } } /* }}} */ - - diff --git a/sapi/fpm/fpm/fpm_trace.h b/sapi/fpm/fpm/fpm_trace.h index b421172207..94cfafe213 100644 --- a/sapi/fpm/fpm/fpm_trace.h +++ b/sapi/fpm/fpm/fpm_trace.h @@ -1,4 +1,3 @@ - /* $Id: fpm_trace.h,v 1.3 2008/07/20 22:43:39 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -14,4 +13,3 @@ int fpm_trace_get_long(long addr, long *data); int fpm_trace_get_strz(char *buf, size_t sz, long addr); #endif - diff --git a/sapi/fpm/fpm/fpm_trace_mach.c b/sapi/fpm/fpm/fpm_trace_mach.c index 3b85e6a343..ee4e33469e 100644 --- a/sapi/fpm/fpm/fpm_trace_mach.c +++ b/sapi/fpm/fpm/fpm_trace_mach.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace_mach.c,v 1.4 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -95,5 +94,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - - diff --git a/sapi/fpm/fpm/fpm_trace_pread.c b/sapi/fpm/fpm/fpm_trace_pread.c index 6a6155740b..2f1fb5618f 100644 --- a/sapi/fpm/fpm/fpm_trace_pread.c +++ b/sapi/fpm/fpm/fpm_trace_pread.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace_pread.c,v 1.7 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -64,4 +63,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_trace_ptrace.c b/sapi/fpm/fpm/fpm_trace_ptrace.c index 838c61867c..37d340bbc3 100644 --- a/sapi/fpm/fpm/fpm_trace_ptrace.c +++ b/sapi/fpm/fpm/fpm_trace_ptrace.c @@ -1,4 +1,3 @@ - /* $Id: fpm_trace_ptrace.c,v 1.7 2008/09/18 23:34:11 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -79,4 +78,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index 44f8df3111..1539c07ba2 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -1,4 +1,3 @@ - /* $Id: fpm_unix.c,v 1.25.2.1 2008/12/13 03:18:23 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -579,4 +578,3 @@ int fpm_unix_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_unix.h b/sapi/fpm/fpm/fpm_unix.h index a79559f9e6..1e30fc09c3 100644 --- a/sapi/fpm/fpm/fpm_unix.h +++ b/sapi/fpm/fpm/fpm_unix.h @@ -1,4 +1,3 @@ - /* $Id: fpm_unix.h,v 1.8 2008/05/25 13:21:13 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -17,4 +16,3 @@ int fpm_unix_init_main(); extern size_t fpm_pagesize; #endif - diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c index a0022915cd..90e155975e 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.c +++ b/sapi/fpm/fpm/fpm_worker_pool.c @@ -1,4 +1,3 @@ - /* $Id: fpm_worker_pool.c,v 1.15.2.1 2008/12/13 03:21:18 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/fpm_worker_pool.h b/sapi/fpm/fpm/fpm_worker_pool.h index 6b2bc908dc..68179d283d 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.h +++ b/sapi/fpm/fpm/fpm_worker_pool.h @@ -1,4 +1,3 @@ - /* $Id: fpm_worker_pool.h,v 1.13 2008/08/26 15:09:15 anight Exp $ */ /* (c) 2007,2008 Andrei Nigmatulin */ @@ -55,4 +54,3 @@ int fpm_worker_pool_init_main(); extern struct fpm_worker_pool_s *fpm_worker_all_pools; #endif - diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c index 4884dca856..27ab6e4d14 100644 --- a/sapi/fpm/fpm/zlog.c +++ b/sapi/fpm/fpm/zlog.c @@ -1,4 +1,3 @@ - /* $Id: zlog.c,v 1.7 2008/05/22 21:08:32 anight Exp $ */ /* (c) 2004-2007 Andrei Nigmatulin */ diff --git a/sapi/fpm/fpm/zlog.h b/sapi/fpm/fpm/zlog.h index c2bf752b93..31a16fb88d 100644 --- a/sapi/fpm/fpm/zlog.h +++ b/sapi/fpm/fpm/zlog.h @@ -1,4 +1,3 @@ - /* $Id: zlog.h,v 1.7 2008/05/22 21:08:32 anight Exp $ */ /* (c) 2004-2007 Andrei Nigmatulin */ diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in index a4d533c197..8a541c0865 100644 --- a/sapi/fpm/php-fpm.service.in +++ b/sapi/fpm/php-fpm.service.in @@ -15,4 +15,3 @@ PrivateTmp=true [Install] WantedBy=multi-user.target - diff --git a/sapi/fpm/tests/response.inc b/sapi/fpm/tests/response.inc index 9888ec1b83..24285bf560 100644 --- a/sapi/fpm/tests/response.inc +++ b/sapi/fpm/tests/response.inc @@ -278,4 +278,4 @@ class Response return false; } -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/skipif.inc b/sapi/fpm/tests/skipif.inc index 25910a8e05..eec65a4112 100644 --- a/sapi/fpm/tests/skipif.inc +++ b/sapi/fpm/tests/skipif.inc @@ -12,4 +12,4 @@ require_once "tester.inc"; if (!FPM\Tester::findExecutable()) { die("skip php-fpm binary not found"); -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/status.inc b/sapi/fpm/tests/status.inc index 5965f130eb..39005de568 100644 --- a/sapi/fpm/tests/status.inc +++ b/sapi/fpm/tests/status.inc @@ -196,4 +196,4 @@ class Status true ); } -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index c3b6c83e59..70c03ad70f 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -1180,4 +1180,4 @@ class Tester print file_get_contents($accessLog); } } -}
\ No newline at end of file +} diff --git a/sapi/litespeed/README.md b/sapi/litespeed/README.md index e744030de7..3f5b7ad14f 100644 --- a/sapi/litespeed/README.md +++ b/sapi/litespeed/README.md @@ -219,7 +219,3 @@ For support questions, please post to our free support forum, at: https://www.litespeedtech.com/support/forum/ For bug report, please send bug report to bug [at] litespeedtech.com. - - - - diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 1cfd45ebbf..b3c5f9fd3a 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -1538,5 +1538,3 @@ PHP_FUNCTION(apache_get_modules) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - - diff --git a/sapi/litespeed/lsapidef.h b/sapi/litespeed/lsapidef.h index 4db8ff562d..f6c0cb0231 100644 --- a/sapi/litespeed/lsapidef.h +++ b/sapi/litespeed/lsapidef.h @@ -193,4 +193,3 @@ struct lsapi_resp_header #endif - diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index 685892e708..a93cdc345d 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -3962,5 +3962,3 @@ int LSAPI_Inc_Req_Processed(int cnt) { return __sync_add_and_fetch(s_global_counter, cnt); } - - diff --git a/sapi/litespeed/lsapilib.h b/sapi/litespeed/lsapilib.h index 1fd3f56176..ff27c9cd94 100644 --- a/sapi/litespeed/lsapilib.h +++ b/sapi/litespeed/lsapilib.h @@ -418,10 +418,3 @@ void LSAPI_Log(int flag, const char * fmt, ...) #endif - - - - - - - diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c index 6ceed3fb8b..1db123cc6d 100644 --- a/sapi/litespeed/lscriu.c +++ b/sapi/litespeed/lscriu.c @@ -739,4 +739,3 @@ int LSCRIU_Init(void) } return s_initial_start_reqs > 0; } - diff --git a/sapi/litespeed/lscriu.h b/sapi/litespeed/lscriu.h index cc0186ef79..02fc9b880a 100644 --- a/sapi/litespeed/lscriu.h +++ b/sapi/litespeed/lscriu.h @@ -64,4 +64,4 @@ void LSCRIU_inc_req_procssed(void); } #endif -#endif // LSCRIU_
\ No newline at end of file +#endif // LSCRIU_ diff --git a/sapi/phpdbg/Makefile.frag b/sapi/phpdbg/Makefile.frag index 091b1e831c..65377e608a 100644 --- a/sapi/phpdbg/Makefile.frag +++ b/sapi/phpdbg/Makefile.frag @@ -39,4 +39,3 @@ test-phpdbg: @$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg .PHONY: clean-phpdbg test-phpdbg - diff --git a/sapi/phpdbg/config.w32 b/sapi/phpdbg/config.w32 index e69ca455f7..9aca03dff6 100644 --- a/sapi/phpdbg/config.w32 +++ b/sapi/phpdbg/config.w32 @@ -31,4 +31,3 @@ if (PHP_PHPDBGS == "yes") { ADD_FLAG("LIBS_PHPDBGS", "ws2_32.lib user32.lib"); ADD_FLAG("CFLAGS_PHPDBGS", "/D YY_NO_UNISTD_H"); } - diff --git a/sapi/phpdbg/phpdbg_eol.h b/sapi/phpdbg/phpdbg_eol.h index afc31a906e..8d6ee8278e 100644 --- a/sapi/phpdbg/phpdbg_eol.h +++ b/sapi/phpdbg/phpdbg_eol.h @@ -43,4 +43,3 @@ char *phpdbg_eol_rep(int id); void phpdbg_eol_convert(char **str, int *len); #endif /* PHPDBG_EOL_H */ - diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 150647aa7e..1f26f7983b 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -353,4 +353,3 @@ PHPDBG_API void phpdbg_close_socket(int sock) { #endif } } - diff --git a/sapi/phpdbg/phpdbg_io.h b/sapi/phpdbg/phpdbg_io.h index d0b69d9b41..deda272da2 100644 --- a/sapi/phpdbg/phpdbg_io.h +++ b/sapi/phpdbg/phpdbg_io.h @@ -38,4 +38,3 @@ PHPDBG_API int phpdbg_open_socket(const char *interface, unsigned short port); PHPDBG_API void phpdbg_close_socket(int sock); #endif /* PHPDBG_IO_H */ - diff --git a/sapi/phpdbg/phpdbg_sigio_win32.c b/sapi/phpdbg/phpdbg_sigio_win32.c index b86ea05da2..3ca0ad8d37 100644 --- a/sapi/phpdbg/phpdbg_sigio_win32.c +++ b/sapi/phpdbg/phpdbg_sigio_win32.c @@ -109,4 +109,3 @@ sigio_watcher_stop(void) PHPDBG_G(swd).fd = -1; PHPDBG_G(sigio_watcher_thread) = INVALID_HANDLE_VALUE; } - diff --git a/sapi/phpdbg/phpdbg_sigsafe.c b/sapi/phpdbg/phpdbg_sigsafe.c index 081d864c5c..dab0d27d85 100644 --- a/sapi/phpdbg/phpdbg_sigsafe.c +++ b/sapi/phpdbg/phpdbg_sigsafe.c @@ -56,4 +56,3 @@ void phpdbg_clear_sigsafe_mem(void) { zend_bool phpdbg_active_sigsafe_mem(void) { return !!PHPDBG_G(sigsafe_mem).mem; } - diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index d3f8bb2136..06be3af28e 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -1,4 +1,3 @@ - # # Build environment install # diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php index 18521638d3..21f252522a 100644 --- a/scripts/dev/find_tested.php +++ b/scripts/dev/find_tested.php @@ -225,4 +225,3 @@ function map_token_value($x) { ?> - diff --git a/scripts/dev/gen_verify_stub b/scripts/dev/gen_verify_stub index ac6dc4434d..f326230e5d 100755 --- a/scripts/dev/gen_verify_stub +++ b/scripts/dev/gen_verify_stub @@ -48,4 +48,3 @@ do done exit 0 - diff --git a/scripts/dev/generate-phpt/src/codeSnippets/array.txt b/scripts/dev/generate-phpt/src/codeSnippets/array.txt index 69a4af72c1..fa007aab9c 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/array.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/array.txt @@ -6,4 +6,4 @@ $variation_array = array( 'int indexed array' => $index_array, 'associative array' => $assoc_array, 'nested arrays' => array('foo', $index_array, $assoc_array), - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/codeSnippets/boolean.txt b/scripts/dev/generate-phpt/src/codeSnippets/boolean.txt index 53db40d30b..024690e757 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/boolean.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/boolean.txt @@ -3,4 +3,4 @@ $variation_array = array( 'lowercase false' =>false, 'uppercase TRUE' =>TRUE, 'uppercase FALSE' =>FALSE, - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt b/scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt index d116022fb8..1b588a47e1 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt @@ -1,2 +1,2 @@ * - */
\ No newline at end of file + */ diff --git a/scripts/dev/generate-phpt/src/codeSnippets/commentStart.txt b/scripts/dev/generate-phpt/src/codeSnippets/commentStart.txt index e3466d5a1a..df6cefe76b 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/commentStart.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/commentStart.txt @@ -1,2 +1,2 @@ /** - *
\ No newline at end of file + * diff --git a/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt b/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt index a957781205..c3d034d07b 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt @@ -8,4 +8,4 @@ $variation_array = array( 'empty string SQ' => '', 'uppercase NULL' => NULL, 'lowercase null' => null, - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/codeSnippets/float.txt b/scripts/dev/generate-phpt/src/codeSnippets/float.txt index 75c2b6cd52..7afd16f5f9 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/float.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/float.txt @@ -4,4 +4,4 @@ $variation_array = array( 'float 12.3456789000e10' => 12.3456789000e10, 'float -12.3456789000e10' => -12.3456789000e10, 'float .5' => .5, - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/codeSnippets/int.txt b/scripts/dev/generate-phpt/src/codeSnippets/int.txt index cdd28ae435..0b2cd7c3b0 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/int.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/int.txt @@ -3,4 +3,4 @@ $variation_array = array ( 'int 1' => 1, 'int 12345' => 12345, 'int -12345' => -2345, - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt b/scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt index ff30235f07..5c34318c21 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt @@ -1 +1 @@ -}
\ No newline at end of file +} diff --git a/scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt b/scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt index 8fd5eb20fd..0a90360dea 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt @@ -1 +1 @@ -foreach ( $variation_array as $var ) {
\ No newline at end of file +foreach ( $variation_array as $var ) { diff --git a/scripts/dev/generate-phpt/src/codeSnippets/object.txt b/scripts/dev/generate-phpt/src/codeSnippets/object.txt index 28ee61bfae..0b9b16e4ef 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/object.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/object.txt @@ -22,4 +22,4 @@ class classWithoutToString $variation_array = array( 'instance of classWithToString' => new classWithToString(), 'instance of classWithoutToString' => new classWithoutToString(), - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/codeSnippets/string.txt b/scripts/dev/generate-phpt/src/codeSnippets/string.txt index a1d42376da..3b194276cc 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/string.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/string.txt @@ -7,4 +7,4 @@ $variation_array = array( 'string SQ' => 'string', 'mixed case string' => "sTrInG", 'heredoc' => $heredoc, - );
\ No newline at end of file + ); diff --git a/scripts/dev/generate-phpt/src/gtAutoload.php b/scripts/dev/generate-phpt/src/gtAutoload.php index 8c18c179eb..b215923f2c 100644 --- a/scripts/dev/generate-phpt/src/gtAutoload.php +++ b/scripts/dev/generate-phpt/src/gtAutoload.php @@ -60,4 +60,4 @@ class gtAutoload } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/gtClassMap.php b/scripts/dev/generate-phpt/src/gtClassMap.php index 1c346b83ce..2a359082f3 100644 --- a/scripts/dev/generate-phpt/src/gtClassMap.php +++ b/scripts/dev/generate-phpt/src/gtClassMap.php @@ -45,4 +45,4 @@ 'gtVariationContainerMethod' => 'testcase/gtVariationContainerMethod.php', 'gtVariationContainerFunction' => 'testcase/gtVariationContainerFunction.php', ); -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/gtCodeSnippet.php b/scripts/dev/generate-phpt/src/gtCodeSnippet.php index dc6543201a..0e02fa5572 100644 --- a/scripts/dev/generate-phpt/src/gtCodeSnippet.php +++ b/scripts/dev/generate-phpt/src/gtCodeSnippet.php @@ -69,4 +69,4 @@ class gtCodeSnippet } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/gtFunction.php b/scripts/dev/generate-phpt/src/gtFunction.php index b2752ad637..922374ede7 100644 --- a/scripts/dev/generate-phpt/src/gtFunction.php +++ b/scripts/dev/generate-phpt/src/gtFunction.php @@ -45,4 +45,4 @@ class gtFunction extends gtTestSubject { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/gtMethod.php b/scripts/dev/generate-phpt/src/gtMethod.php index dc8438c3b5..2db2bb7b0c 100644 --- a/scripts/dev/generate-phpt/src/gtMethod.php +++ b/scripts/dev/generate-phpt/src/gtMethod.php @@ -136,4 +136,4 @@ class gtMethod extends gtTestSubject { return $this->constructorInitialisationStatements; } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/gtTestCaseWriter.php b/scripts/dev/generate-phpt/src/gtTestCaseWriter.php index 9438e0f2ea..6b26a56c5e 100644 --- a/scripts/dev/generate-phpt/src/gtTestCaseWriter.php +++ b/scripts/dev/generate-phpt/src/gtTestCaseWriter.php @@ -24,4 +24,4 @@ class gtTestCaseWriter { fclose($fh); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/gtText.php b/scripts/dev/generate-phpt/src/gtText.php index 8cbd1650d4..c0eb469550 100644 --- a/scripts/dev/generate-phpt/src/gtText.php +++ b/scripts/dev/generate-phpt/src/gtText.php @@ -24,4 +24,4 @@ class gtText } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/exceptions/gtMissingOptionsException.php b/scripts/dev/generate-phpt/src/setup/exceptions/gtMissingOptionsException.php index 5bff5e01a0..e3c2f35afb 100644 --- a/scripts/dev/generate-phpt/src/setup/exceptions/gtMissingOptionsException.php +++ b/scripts/dev/generate-phpt/src/setup/exceptions/gtMissingOptionsException.php @@ -4,4 +4,4 @@ { } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/exceptions/gtUnknownSectionException.php b/scripts/dev/generate-phpt/src/setup/exceptions/gtUnknownSectionException.php index c4843240d7..b51482b00d 100644 --- a/scripts/dev/generate-phpt/src/setup/exceptions/gtUnknownSectionException.php +++ b/scripts/dev/generate-phpt/src/setup/exceptions/gtUnknownSectionException.php @@ -3,4 +3,4 @@ class gtUnknownSectionException extends RuntimeException { } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php b/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php index b1068e4600..f12ff8728a 100644 --- a/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php +++ b/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php @@ -95,4 +95,4 @@ class gtCommandLineOptions { } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php b/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php index 6c6de18345..e59c7a0be4 100644 --- a/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php +++ b/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php @@ -82,4 +82,4 @@ class gtOptionalSections { } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/gtPreCondition.php b/scripts/dev/generate-phpt/src/setup/gtPreCondition.php index 294b41e9f2..137325bf04 100644 --- a/scripts/dev/generate-phpt/src/setup/gtPreCondition.php +++ b/scripts/dev/generate-phpt/src/setup/gtPreCondition.php @@ -11,4 +11,4 @@ abstract class gtPreCondition { abstract public function getMessage(); } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/gtPreConditionList.php b/scripts/dev/generate-phpt/src/setup/gtPreConditionList.php index 88f9b36205..286699cfb8 100644 --- a/scripts/dev/generate-phpt/src/setup/gtPreConditionList.php +++ b/scripts/dev/generate-phpt/src/setup/gtPreConditionList.php @@ -30,4 +30,4 @@ class gtPreConditionList { } } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php index edd7a1cbae..a16cf81e4d 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php @@ -21,4 +21,4 @@ class gtIfClassHasMethod extends gtPreCondition { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php index f70af881ec..b78c1530f7 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php @@ -18,4 +18,4 @@ class gtIsSpecifiedFunctionOrMethod extends gtPreCondition { return gtText::get('functionOrMethodNotSpecified'); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php index ebc0a68f57..153efa5276 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php @@ -18,4 +18,4 @@ class gtIsSpecifiedTestType extends gtPreCondition { return gtText::get('testTypeNotSpecified'); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php index a39bab453e..545612ddf1 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidClass.php @@ -21,4 +21,4 @@ class gtIsValidClass extends gtPreCondition { return gtText::get('unknownClass'); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php index ed91c2ca3b..a5be4f1a0c 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsValidFunction.php @@ -22,4 +22,4 @@ class gtIsValidFunction extends gtPreCondition { return gtText::get('unknownFunction'); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php index 92560c8631..ff22dd3ee1 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php @@ -34,4 +34,4 @@ abstract class gtBasicTestCase extends gtTestCase { $this->testCase = gtCodeSnippet::appendBlankLines(1, $this->testCase ); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php index c0fc9eb61f..62acab3f37 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php @@ -59,4 +59,4 @@ class gtBasicTestCaseFunction extends gtBasicTestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php index d009d5038a..74a2414f86 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php @@ -49,4 +49,4 @@ public function constructTestCase() { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php index 82f955cf46..dbf9a665fd 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php @@ -50,4 +50,4 @@ abstract class gtErrorTestCase extends gtTestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php index fcba6d798c..e966fff708 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php @@ -54,4 +54,4 @@ class gtErrorTestCaseFunction extends gtErrorTestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php index fa1c8ca3f1..a0a96cfc74 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php @@ -56,4 +56,4 @@ class gtErrorTestCaseMethod extends gtErrorTestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php b/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php index f445d9e7f4..260cba4113 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php @@ -51,4 +51,4 @@ abstract class gtVariationContainer { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php index b6a3aa473c..8ac9300a49 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php @@ -40,4 +40,4 @@ class gtVariationContainerFunction extends gtVariationContainer { } } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php index 0d24337b3b..68f3a83895 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php @@ -43,4 +43,4 @@ class gtVariationContainerMethod extends gtVariationContainer { } } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php index e868b80795..67d8533976 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php @@ -1,4 +1,3 @@ - <?php /** @@ -52,4 +51,4 @@ abstract class gtVariationTestCase extends gtTestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php index 45cbe2046c..3545e5c272 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php @@ -61,4 +61,4 @@ class gtVariationTestCaseFunction extends gtVariationTestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php index db923f078a..51160f47f8 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php @@ -65,4 +65,4 @@ class gtVariationTestCaseMethod extends gtVariationTestCase { } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/src/texts/functionOrMethodNotSpecified.txt b/scripts/dev/generate-phpt/src/texts/functionOrMethodNotSpecified.txt index b497682cb7..3c80875698 100644 --- a/scripts/dev/generate-phpt/src/texts/functionOrMethodNotSpecified.txt +++ b/scripts/dev/generate-phpt/src/texts/functionOrMethodNotSpecified.txt @@ -1,3 +1 @@ - Please supply a function or method name to be tested. - diff --git a/scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt b/scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt index 1f11a3a1ba..5745d49aef 100644 --- a/scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt +++ b/scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt @@ -1,4 +1,2 @@ - You have given a class name but not supplied a method name to test. The method name is required. - diff --git a/scripts/dev/generate-phpt/src/texts/testTypeNotSpecified.txt b/scripts/dev/generate-phpt/src/texts/testTypeNotSpecified.txt index e83ddbb5c2..054f5807a0 100644 --- a/scripts/dev/generate-phpt/src/texts/testTypeNotSpecified.txt +++ b/scripts/dev/generate-phpt/src/texts/testTypeNotSpecified.txt @@ -1,3 +1 @@ - Please specify basic, error or variation tests. - diff --git a/scripts/dev/generate-phpt/src/texts/unknownClass.txt b/scripts/dev/generate-phpt/src/texts/unknownClass.txt index b0a47ca8b9..4d56d95f20 100644 --- a/scripts/dev/generate-phpt/src/texts/unknownClass.txt +++ b/scripts/dev/generate-phpt/src/texts/unknownClass.txt @@ -1,4 +1,2 @@ - The class name is not a valid PHP class name. Check that the extension containing the class is loaded. - diff --git a/scripts/dev/generate-phpt/src/texts/unknownFunction.txt b/scripts/dev/generate-phpt/src/texts/unknownFunction.txt index 2e76978a52..fa2164a30a 100644 --- a/scripts/dev/generate-phpt/src/texts/unknownFunction.txt +++ b/scripts/dev/generate-phpt/src/texts/unknownFunction.txt @@ -1,4 +1,2 @@ - The function name is not a valid PHP function name. Check that the extension containing the function is loaded. - diff --git a/scripts/dev/generate-phpt/src/texts/unknownMethod.txt b/scripts/dev/generate-phpt/src/texts/unknownMethod.txt index 8cc9eaeda6..3f932a730c 100644 --- a/scripts/dev/generate-phpt/src/texts/unknownMethod.txt +++ b/scripts/dev/generate-phpt/src/texts/unknownMethod.txt @@ -1,4 +1,2 @@ - The method name is not a valid PHP method name. Check that the extension containing the method is loaded. - diff --git a/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php b/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php index fa80c0766d..33a5cb65df 100644 --- a/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php @@ -21,4 +21,4 @@ class gtBasicTestCaseFunctionTest extends PHPUnit_Framework_TestCase { $this->assertTrue(is_string($fs)); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php b/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php index 18768b6294..8a4a23fe50 100644 --- a/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php @@ -25,4 +25,4 @@ class gtBasicTestCaseMethodTest extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php b/scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php index 6d4d5861c3..ca87320224 100644 --- a/scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php +++ b/scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php @@ -12,4 +12,4 @@ class gtCodeSnippetTest extends PHPUnit_Framework_TestCase $this->assertEquals($array[2], '}'); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php b/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php index 1bf32b4608..a034aeca4c 100644 --- a/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php +++ b/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php @@ -43,4 +43,4 @@ require_once 'PHPUnit/Framework.php'; $clo->parse(array('generate-phpt.php', '-f')); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php b/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php index c6399168be..0146266a73 100644 --- a/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php @@ -25,4 +25,4 @@ class gtErrorTestCaseFunctionTest extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php b/scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php index 894a551597..5c9dbfbb30 100644 --- a/scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php @@ -27,4 +27,4 @@ class gtErrorTestCaseMethodTest extends PHPUnit_Framework_TestCase { $this->assertTrue(is_string($fs)); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtFunctionTest.php b/scripts/dev/generate-phpt/tests/gtFunctionTest.php index 5afcd950d4..f8b17680d4 100644 --- a/scripts/dev/generate-phpt/tests/gtFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtFunctionTest.php @@ -68,4 +68,4 @@ class gtFunctionTest extends PHPUnit_Framework_TestCase } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php b/scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php index b9f2410b5d..4494415dea 100644 --- a/scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php @@ -38,4 +38,4 @@ class gtIfClassHasMethodTest extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php b/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php index a60f77ef37..d86945e85c 100644 --- a/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php @@ -38,4 +38,4 @@ class gtIsSpecifiedFunctionOrMethodTest extends PHPUnit_Framework_TestCase { $this->assertEquals($ch->getMessage(), gtText::get('functionOrMethodNotSpecified')); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php b/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php index bc7cf9412d..858e803e8c 100644 --- a/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php @@ -29,4 +29,4 @@ class gtIsSpecifiedTestTypeTest extends PHPUnit_Framework_TestCase { $this->assertEquals($ch->getMessage(), gtText::get('testTypeNotSpecified')); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php b/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php index 507ca232db..2a18e50fc5 100644 --- a/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php @@ -38,4 +38,4 @@ class gtIsValidClassTest extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php b/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php index 07a7038dcc..d0193c4fff 100644 --- a/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php @@ -37,4 +37,4 @@ class gtIsValidFunctionTest extends PHPUnit_Framework_TestCase { $this->assertEquals($ch->getMessage(), gtText::get('unknownFunction')); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php b/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php index 0f1b349f4d..4519b0e217 100644 --- a/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php @@ -37,4 +37,4 @@ class gtIsValidMethodTest extends PHPUnit_Framework_TestCase { $this->assertEquals($ch->getMessage(), gtText::get('unknownMethod')); } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtMethodTest.php b/scripts/dev/generate-phpt/tests/gtMethodTest.php index 430161ee1c..8057d6655b 100644 --- a/scripts/dev/generate-phpt/tests/gtMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtMethodTest.php @@ -79,4 +79,4 @@ class gtMethodTest extends PHPUnit_Framework_TestCase } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php b/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php index 541dbdf2dd..4352e68abe 100644 --- a/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php +++ b/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php @@ -55,4 +55,4 @@ class gtOptionalSectionsTest extends PHPUnit_Framework_TestCase } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php b/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php index 83178b21e7..6d3a3ad546 100644 --- a/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php @@ -56,4 +56,4 @@ class gtVariationTestCaseFunctionTest extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php b/scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php index a074fcceeb..b5c4d64f6a 100644 --- a/scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php @@ -24,4 +24,4 @@ class gtVariationTestCaseMethodTest extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/server-tests-config.php b/server-tests-config.php index 645a5e8e98..ca01ffe1cb 100755 --- a/server-tests-config.php +++ b/server-tests-config.php @@ -71,4 +71,4 @@ $conf = array( */ ); -?>
\ No newline at end of file +?> diff --git a/tests/basic/timeout_config.inc b/tests/basic/timeout_config.inc index 7182080939..3bd9eeaa70 100644 --- a/tests/basic/timeout_config.inc +++ b/tests/basic/timeout_config.inc @@ -8,4 +8,3 @@ function busy_wait($how_long) while ($until > microtime(TRUE)); } - diff --git a/tests/lang/bug73172.inc b/tests/lang/bug73172.inc index 5e4a85ea2e..760cbecc8b 100644 --- a/tests/lang/bug73172.inc +++ b/tests/lang/bug73172.inc @@ -4,4 +4,3 @@ function test($a, $x, $y){ return; } test('test', 9223372036854775808, 'test'); - diff --git a/tests/quicktester.inc b/tests/quicktester.inc index 70cb115684..ba60e74a51 100644 --- a/tests/quicktester.inc +++ b/tests/quicktester.inc @@ -72,4 +72,3 @@ foreach ($tests as $n=>$test) } } if ($success) echo "OK"; - diff --git a/tests/security/open_basedir.inc b/tests/security/open_basedir.inc index d229f8497f..d30f2f8384 100644 --- a/tests/security/open_basedir.inc +++ b/tests/security/open_basedir.inc @@ -136,4 +136,3 @@ function test_open_basedir($function) { } ?> - diff --git a/travis/ext/pdo_pgsql/setup.sh b/travis/ext/pdo_pgsql/setup.sh index 6f16f72cc2..5f3cf67f92 100755 --- a/travis/ext/pdo_pgsql/setup.sh +++ b/travis/ext/pdo_pgsql/setup.sh @@ -1,2 +1,2 @@ #!/bin/bash -export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password='
\ No newline at end of file +export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password=' diff --git a/travis/ext/pgsql/setup.sh b/travis/ext/pgsql/setup.sh index ef13733edc..108f47db25 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash echo ' <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc" -psql -c 'create database test;' -U postgres
\ No newline at end of file +psql -c 'create database test;' -U postgres diff --git a/win32/build/Makefile b/win32/build/Makefile index 68fa579b5f..ed4ff3eed7 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -252,4 +252,3 @@ really-install: @echo Registering event source with syslog (requires admin rights) @echo It's okay for this step to fail: -$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL) - diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index 517db128bd..37c449a059 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -57,4 +57,3 @@ _VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest !endif install: build-headers build-bins - diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index 2fbbdad93c..5cbc945d13 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -260,4 +260,3 @@ C.Write(file_get_contents("win32/build/configure.tail")); B.WriteLine("@echo off"); B.WriteLine("cscript /nologo configure.js %*"); - diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 4f7a463442..e90dae0b81 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -337,4 +337,3 @@ ARG_ENABLE("test-ini", "Enable automatic php.ini generation. The test.ini will b ARG_WITH("test-ini-ext-exclude", "Comma separated list of shared extensions to \ be excluded from the test.ini", "no"); - diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 812d28faf5..f43ebeb6a6 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -125,4 +125,3 @@ DEFINE("PHP_DIR", PHP_DIR); ARG_WITH("codegen-arch", "Architecture for code generation", "no"); toolset_setup_codegen_arch(); - diff --git a/win32/build/configure.tail b/win32/build/configure.tail index 70625a43d4..d17d4ae67b 100644 --- a/win32/build/configure.tail +++ b/win32/build/configure.tail @@ -8,4 +8,3 @@ if (!MODE_PHPIZE && sapi_enabled.length < 1) { } generate_files(); - diff --git a/win32/build/confutils.js b/win32/build/confutils.js index b216659ebf..371d586ef8 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3487,4 +3487,3 @@ function add_asan_opts(cflags_name, libs_name, ldflags_name) ADD_FLAG(ldflags_name, "/libpath:\"" + get_clang_lib_dir() + "\\windows\""); } } - diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index 794b9cb710..a79885f008 100644 --- a/win32/build/phpize.bat +++ b/win32/build/phpize.bat @@ -8,4 +8,3 @@ IF NOT EXIST configure.bat ( echo Now run 'configure --help' ) SET PHP_BUILDCONF_PATH= - diff --git a/win32/build/wsyslog.mc b/win32/build/wsyslog.mc index 01d4d3a86b..f326abf7d9 100755 --- a/win32/build/wsyslog.mc +++ b/win32/build/wsyslog.mc @@ -25,4 +25,3 @@ SymbolicName=PHP_SYSLOG_ERROR_TYPE Language=English %1 %2 . - diff --git a/win32/cp_enc_map_gen.c b/win32/cp_enc_map_gen.c index 2010e0ca4c..34861d148b 100644 --- a/win32/cp_enc_map_gen.c +++ b/win32/cp_enc_map_gen.c @@ -1,4 +1,3 @@ - #include <stdio.h> #include <windows.h> diff --git a/win32/param.h b/win32/param.h index 1601a3cc16..552323c5b1 100644 --- a/win32/param.h +++ b/win32/param.h @@ -1,4 +1,3 @@ - /***************************************************************************** * * * sys/param.c * |