From 03f3b8479b88688e45fd0879b755937fd01f593a Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Oct 2018 12:51:01 +0200 Subject: [PATCH 1/3] 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-' ' characters plus a terminating '' 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 --- .appveyor.yml | 2 -- Makefile.frag | 1 - Makefile.gcov | 1 - README.EXT_SKEL | 1 - README.REDIST.BINS | 1 - README.SELF-CONTAINED-EXTENSIONS | 1 - README.TESTING2 | 3 --- README.WIN32-BUILD-SYSTEM | 1 - README.md | 1 - README.namespaces | 1 - TSRM/acinclude.m4 | 2 -- TSRM/config.w32 | 1 - TSRM/m4/gethostbyname.m4 | 1 - UPGRADING | 1 - UPGRADING.INTERNALS | 1 - Zend/Makefile.am | 1 - Zend/README.ZEND_VM | 1 - Zend/RFCs/001.txt | 1 - Zend/RFCs/003.txt | 4 ---- Zend/buildconf | 1 - Zend/tests/bug40236.inc | 2 +- Zend/tests/methods-on-non-objects-nested.inc | 2 +- Zend/tests/nowdoc.inc | 1 - Zend/tests/return_types/classes.php.inc | 1 - Zend/zend_dtrace.c | 1 - Zend/zend_highlight.c | 1 - Zend/zend_smart_str.h | 1 - Zend/zend_strtod_int.h | 1 - Zend/zend_vm_execute.skl | 1 - appveyor/build.bat | 1 - appveyor/build_task.bat | 1 - appveyor/test.bat | 1 - appveyor/test_task.bat | 1 - build/build2.mk | 1 - build/genif.sh | 2 -- buildconf.bat | 2 +- ext/bcmath/libbcmath/AUTHORS | 2 -- ext/bcmath/libbcmath/COPYING.LIB | 3 --- ext/bcmath/libbcmath/ChangeLog | 1 - ext/bcmath/libbcmath/FAQ | 1 - ext/bcmath/libbcmath/Makefile.am | 1 - ext/bcmath/libbcmath/acconfig.h | 1 - ext/bcmath/libbcmath/aclocal.m4 | 1 - ext/bcmath/libbcmath/config.h.in | 1 - ext/bcmath/libbcmath/configure | 2 -- ext/bcmath/libbcmath/configure.in | 1 - ext/bcmath/libbcmath/src/add.c | 1 - ext/bcmath/libbcmath/src/compare.c | 1 - ext/bcmath/libbcmath/src/div.c | 1 - ext/bcmath/libbcmath/src/divmod.c | 1 - ext/bcmath/libbcmath/src/doaddsub.c | 1 - ext/bcmath/libbcmath/src/init.c | 1 - ext/bcmath/libbcmath/src/int2num.c | 1 - ext/bcmath/libbcmath/src/nearzero.c | 1 - ext/bcmath/libbcmath/src/neg.c | 1 - ext/bcmath/libbcmath/src/num2long.c | 1 - ext/bcmath/libbcmath/src/raise.c | 1 - ext/bcmath/libbcmath/src/rmzero.c | 1 - ext/bcmath/libbcmath/src/sqrt.c | 1 - ext/bcmath/libbcmath/src/str2num.c | 1 - ext/bcmath/libbcmath/src/sub.c | 1 - ext/bcmath/libbcmath/src/zero.c | 1 - ext/calendar/dow.c | 1 - ext/com_dotnet/com_iterator.c | 1 - ext/com_dotnet/com_saproxy.c | 1 - ext/com_dotnet/com_typeinfo.c | 2 -- ext/com_dotnet/com_variant.c | 1 - ext/com_dotnet/com_wrapper.c | 2 -- ext/ctype/ctype.xml | 1 - ext/curl/tests/server.inc | 1 - ext/dba/CREDITS | 2 +- ext/dba/README | 2 +- ext/dba/tests/dba_handler.inc | 2 +- ext/dom/examples/relaxNG.php | 2 +- ext/dom/examples/relaxNG.xml | 2 +- ext/dom/examples/shipping.php | 2 +- ext/dom/examples/shipping.xml | 2 +- ext/dom/tests/bug67081_0.xml | 1 - ext/dom/tests/bug67081_1.xml | 1 - ext/dom/tests/bug67081_2.xml | 1 - ext/dom/tests/dom.xml | 2 +- ext/dom/tests/nsdoc.xml | 2 +- ext/dom/tests/skipif.inc | 2 +- ext/enchant/php_enchant.h | 1 - ext/exif/example.php | 2 +- ext/exif/test.php | 2 +- ext/exif/test.txt | 2 +- ext/ext_skel_win32.php | 1 - ext/fileinfo/Makefile.frag | 1 - ext/filter/docs/filter.txt | 1 - ext/filter/docs/input_get_args.php | 1 - ext/gd/gd_compat.c | 1 - ext/gettext/gettext.c | 1 - ext/hash/config.w32 | 1 - ext/hash/hash.c | 1 - ext/iconv/config.w32 | 1 - ext/iconv/tests/test.inc | 2 +- ext/imap/IMAP_Win32_HOWTO.txt | 2 -- ext/imap/tests/README | 5 ----- ext/imap/tests/clean.inc | 2 +- ext/intl/common/common_date.cpp | 1 - ext/intl/common/common_date.h | 1 - ext/intl/dateformat/dateformat_attrcpp.cpp | 1 - ext/intl/dateformat/dateformat_attrcpp.h | 1 - ext/intl/dateformat/dateformat_format.c | 1 - ext/intl/dateformat/dateformat_helpers.h | 1 - ext/intl/dateformat/dateformat_parse.c | 1 - ext/intl/doc/Tutorial.txt | 1 - ext/intl/doc/grapheme_api.php | 2 -- ext/intl/doc/normalizer_api.php | 2 -- ext/intl/grapheme/grapheme_string.c | 1 - ext/intl/grapheme/grapheme_util.c | 1 - ext/intl/tests/resourcebundle.build | 2 +- ext/intl/tests/resourcebundle.inc | 1 - ext/intl/uchar/uchar.c | 1 - ext/json/config.w32 | 1 - ext/json/json_scanner.re | 1 - ext/json/php_json_parser.h | 1 - ext/json/php_json_scanner.h | 1 - ext/ldap/config.w32 | 1 - ext/mbstring/README | 2 -- ext/mbstring/README.libmbfl | 2 -- ext/mbstring/README_PHP3-i18n-ja | 1 - ext/mbstring/libmbfl/DISCLAIMER | 1 - ext/mbstring/libmbfl/INSTALL | 2 -- ext/mbstring/libmbfl/NEWS | 1 - ext/mbstring/libmbfl/filters/emoji2uni.h | 1 - ext/mbstring/libmbfl/filters/html_entities.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_7bit.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_ascii.h | 2 -- ext/mbstring/libmbfl/filters/mbfilter_base64.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_big5.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_byte2.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_byte4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1251.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1251.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_cp1252.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1254.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_cp51932.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp850.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp866.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp932.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_gb18030.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_jis.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_qprint.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_sjis.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c | 2 -- .../libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_ucs2.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_ucs4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_uhc.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf16.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_utf32.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_utf7.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_uuencode.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_uuencode.h | 1 - ext/mbstring/libmbfl/filters/sjis_mac2uni.h | 2 -- ext/mbstring/libmbfl/filters/unicode_prop.h | 1 - ext/mbstring/libmbfl/filters/unicode_table_jis2004.h | 1 - ext/mbstring/libmbfl/filters/unicode_table_koi8u.h | 1 - ext/mbstring/libmbfl/mbfl/mbfilter_pass.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_allocators.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_convert.c | 2 -- ext/mbstring/libmbfl/mbfl/mbfl_language.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h | 1 - ext/mbstring/libmbfl/mbfl/mbfl_string.c | 2 -- ext/mbstring/libmbfl/nls/nls_de.c | 1 - ext/mbstring/libmbfl/nls/nls_en.c | 1 - ext/mbstring/libmbfl/nls/nls_kr.c | 1 - ext/mbstring/libmbfl/nls/nls_neutral.c | 1 - ext/mbstring/libmbfl/nls/nls_tr.c | 1 - ext/mbstring/libmbfl/nls/nls_uni.c | 1 - ext/mbstring/libmbfl/nls/nls_zh.c | 1 - .../tests/conv_encoding.tests/cp51932_cp50220raw.exp | 1 - ext/mbstring/mb_gpc.c | 1 - ext/mbstring/php_mbregex.h | 1 - ext/mbstring/php_unicode.h | 3 --- ext/mbstring/ucgendat/OPENLDAP_LICENSE | 2 +- ext/mbstring/ucgendat/README | 3 --- ext/mysqli/mysqli_fe.h | 1 - ext/mysqli/mysqli_libmysql.h | 1 - ext/mysqli/tests/clean_table.inc | 2 +- ext/mysqli/tests/local_infile_tools.inc | 2 +- ext/mysqli/tests/reflection_tools.inc | 2 +- ext/mysqli/tests/skipif.inc | 2 +- ext/mysqli/tests/skipifemb.inc | 2 +- ext/mysqli/tests/skipifnotemb.inc | 2 +- ext/odbc/tests/config.inc | 1 - ext/opcache/tests/php_cli_server.inc | 1 - ext/openssl/config.w32 | 2 -- ext/pcntl/README | 5 ----- ext/pcre/config.w32 | 1 - ext/pcre/config0.m4 | 1 - ext/pdo/CREDITS | 1 - ext/pdo/Makefile.frag | 1 - ext/pdo/README | 2 -- ext/pdo/config.m4 | 1 - ext/pdo/pdo_sqlstate.c | 1 - ext/pdo_mysql/CREDITS | 1 - ext/pdo_mysql/tests/skipif.inc | 2 +- ext/pdo_mysql/tests/table.inc | 2 +- ext/pdo_oci/config.m4 | 1 - ext/pdo_odbc/EXPERIMENTAL | 2 -- ext/pdo_odbc/config.w32 | 2 -- ext/pdo_sqlite/php_pdo_sqlite.h | 1 - ext/pgsql/README | 1 - ext/pgsql/config.m4 | 2 -- ext/pgsql/tests/nonblocking.inc | 1 - ext/phar/Makefile.frag | 1 - ext/phar/func_interceptors.c | 1 - ext/phar/gdbhelp | 2 +- ext/phar/phar/directorygraphiterator.inc | 2 +- ext/phar/phar/directorytreeiterator.inc | 2 +- ext/phar/phar/invertedregexiterator.inc | 2 +- ext/phar/phar/phar.inc | 2 +- ext/phar/phar/phar.php | 2 +- ext/phar/tests/cache_list/files/frontcontroller13.phar.inc | 2 +- ext/phar/tests/cache_list/files/nophar.phar.inc | 2 +- ext/phar/tests/cache_list/files/phar_oo_test.inc | 2 +- ext/phar/tests/cache_list/files/phar_test.inc | 2 +- ext/phar/tests/files/frontcontroller13.phar.inc | 2 +- ext/phar/tests/files/nophar.phar.inc | 2 +- ext/phar/tests/files/phar_oo_test.inc | 2 +- ext/phar/tests/files/stuboflength1041.phar.inc | 2 +- ext/phar/tests/tar/files/corrupt_tarmaker.php.inc | 2 +- ext/phar/tests/tar/files/make.dangerous.tar.php.inc | 2 +- ext/phar/tests/tar/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/tar/files/tarmaker.php.inc | 2 +- ext/phar/tests/zip/files/corrupt_zipmaker.php.inc | 2 +- ext/phar/tests/zip/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/zip/files/zipmaker.php.inc | 2 +- ext/pspell/README | 2 +- ext/pspell/config.w32 | 1 - ext/readline/config.w32 | 1 - ext/readline/php_readline.h | 1 - ext/readline/readline_cli.h | 2 -- ext/reflection/tests/included4.inc | 2 +- ext/session/tests/save_handler.inc | 1 - ext/shmop/README | 2 -- ext/simplexml/tests/000.xml | 2 +- ext/simplexml/tests/bug24392.xml | 2 +- ext/simplexml/tests/sxe.xml | 2 +- ext/simplexml/tests/sxe私はガラスを食べられます.xml | 2 +- ext/skeleton/CREDITS | 2 +- ext/snmp/config.w32 | 1 - ext/snmp/tests/skipif.inc | 1 - ext/soap/interop/test.utility.php | 2 +- ext/soap/php_sdl.c | 1 - ext/soap/tests/interop/Round2/Base/round2_base.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_doclit.inc | 2 +- .../interop/Round3/GroupD/round3_groupD_doclitparams.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_emptysa.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import1.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import2.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import3.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc | 2 +- .../tests/interop/Round3/GroupE/round3_groupE_list.inc | 2 +- ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc | 2 +- .../tests/interop/Round3/GroupF/round3_groupF_headers.inc | 2 +- ext/sockets/config.w32 | 1 - ext/sockets/php_sockets.h | 1 - ext/spl/examples/autoload.inc | 2 +- ext/spl/examples/cachingrecursiveiterator.inc | 2 +- ext/spl/examples/callbackfilteriterator.inc | 2 +- ext/spl/examples/class_tree.php | 2 +- ext/spl/examples/dba_array.php | 2 +- ext/spl/examples/dba_dump.php | 2 +- ext/spl/examples/dbareader.inc | 2 +- ext/spl/examples/directorygraphiterator.inc | 2 +- ext/spl/examples/directorytree.inc | 2 +- ext/spl/examples/directorytree.php | 2 +- ext/spl/examples/directorytreeiterator.inc | 2 +- ext/spl/examples/findfile.inc | 2 +- ext/spl/examples/findfile.php | 2 +- ext/spl/examples/findregex.php | 2 +- ext/spl/examples/ini_groups.php | 2 +- ext/spl/examples/inigroups.inc | 2 +- ext/spl/examples/keyfilter.inc | 2 +- ext/spl/examples/nocvsdir.php | 2 +- ext/spl/examples/phar_from_dir.php | 2 +- ext/spl/examples/regexfindfile.inc | 2 +- ext/spl/examples/searchiterator.inc | 2 +- ext/spl/examples/tests/examples.inc | 2 +- ext/spl/internal/emptyiterator.inc | 2 +- ext/spl/internal/filteriterator.inc | 2 +- ext/spl/internal/infiniteiterator.inc | 2 +- ext/spl/internal/limititerator.inc | 2 +- ext/spl/internal/norewinditerator.inc | 2 +- ext/spl/internal/outeriterator.inc | 2 +- ext/spl/internal/parentiterator.inc | 2 +- ext/spl/internal/recursivearrayiterator.inc | 2 +- ext/spl/internal/recursivecachingiterator.inc | 2 +- ext/spl/internal/recursivefilteriterator.inc | 2 +- ext/spl/internal/recursiveiterator.inc | 2 +- ext/spl/internal/recursiveiteratoriterator.inc | 2 +- ext/spl/internal/recursiveregexiterator.inc | 2 +- ext/spl/internal/recursivetreeiterator.inc | 2 +- ext/spl/internal/seekableiterator.inc | 2 +- ext/spl/spl_heap.c | 1 - ext/spl/tests/testclass.class.inc | 2 +- ext/spl/tests/testclass.inc | 2 +- ext/spl/tests/testclass.php.inc | 2 +- ext/standard/Makefile.frag | 1 - ext/standard/assert.c | 1 - ext/standard/cyr_convert.h | 3 --- ext/standard/file.h | 1 - ext/standard/html_tables/ents_html401.txt | 2 +- ext/standard/html_tables/ents_html5.txt | 2 +- ext/standard/html_tables/ents_xhtml.txt | 2 +- ext/standard/http.c | 1 - ext/standard/info.h | 1 - ext/standard/mt_rand.c | 1 - ext/standard/php_crypt_r.c | 1 - ext/standard/php_http.h | 1 - ext/standard/php_mt_rand.h | 1 - ext/standard/proc_open.h | 1 - ext/standard/streamsfuncs.c | 1 - ext/standard/streamsfuncs.h | 1 - ext/standard/tests/array/compare_function.inc | 2 +- ext/standard/tests/class_object/AutoInterface.inc | 2 +- ext/standard/tests/class_object/AutoLoaded.inc | 2 +- ext/standard/tests/class_object/AutoTest.inc | 2 +- ext/standard/tests/class_object/AutoTrait.inc | 2 +- ext/standard/tests/file/fopen_include_path.inc | 2 +- ext/standard/tests/file/windows_mb_path/util.inc | 1 - ext/standard/tests/file/windows_mb_path/util_utf8.inc | 1 - ext/standard/tests/filters/filter_errors.inc | 1 - ext/standard/tests/general_functions/proc_open_pipes.inc | 1 - ext/standard/tests/math/allowed_rounding_error.inc | 2 +- ext/standard/tests/misc/browscap_lite_2016_12_06.ini | 1 - ext/standard/tests/streams/bug64433_srv.inc | 2 +- ext/sysvshm/config.w32 | 2 +- ext/tidy/README | 1 - ext/tidy/config.w32 | 1 - ext/tidy/examples/dumpit5.php | 2 +- ext/tokenizer/config.w32 | 2 -- ext/tokenizer/tokenizer_data.c | 1 - ext/wddx/config.w32 | 2 -- ext/xmlreader/config.w32 | 1 - ext/xmlreader/examples/relaxNG.xml | 2 +- ext/xmlreader/examples/xmlreader_relaxNG.php | 2 +- ext/xmlreader/examples/xmlreader_validatedtd.php | 2 +- ext/xmlreader/tests/XMLReaderBad_bug71805.xml | 2 +- ext/xmlreader/tests/XMLReaderGood_bug71805.xml | 2 +- ext/xmlrpc/config.w32 | 1 - ext/xmlrpc/libxmlrpc/README | 5 ----- ext/xmlrpc/libxmlrpc/base64.h | 1 - ext/xmlrpc/libxmlrpc/encodings.c | 1 - ext/xmlrpc/libxmlrpc/system_methods.c | 3 --- ext/xmlrpc/libxmlrpc/system_methods_private.h | 4 ---- ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c | 1 - ext/xmlrpc/libxmlrpc/xml_to_soap.c | 1 - ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c | 1 - ext/xmlrpc/libxmlrpc/xmlrpc.h | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h | 4 ---- ext/xmlrpc/libxmlrpc/xmlrpc_private.h | 1 - ext/xmlrpc/xmlrpc-epi-php.c | 1 - ext/xmlwriter/config.w32 | 1 - ext/xmlwriter/examples/xmlwriter_mem.php | 1 - ext/xmlwriter/examples/xmlwriter_mem_ns.php | 1 - ext/xsl/tests/53965/collection.xml | 2 +- ext/xsl/tests/area_name.xml | 3 --- ext/xsl/tests/exslt.xml | 1 - ext/zip/examples/addglob.php | 1 - ext/zip/examples/addpattern.php | 1 - ext/zip/examples/fopen.php | 2 -- ext/zip/examples/get_set_comments.php | 1 - ext/zip/examples/im.php | 1 - ext/zip/tests/bug38943.inc | 1 - ext/zlib/config.w32 | 2 -- ext/zlib/tests/data.inc | 3 +-- ext/zlib/tests/func.inc | 1 - ext/zlib/tests/gzopen_include_path.inc | 2 +- ext/zlib/tests/reading_include_path.inc | 2 +- ext/zlib/zlib_win32_howto.txt | 2 -- footer | 1 - genfiles | 1 - main/streams/php_streams_int.h | 1 - main/streams/userspace.c | 2 -- netware/sendmail_nw.h | 1 - pear/Makefile.frag | 1 - pear/fetch.php | 2 -- sapi/apache2handler/README | 1 - sapi/apache2handler/config.w32 | 1 - sapi/cgi/Makefile.frag | 1 - sapi/cli/Makefile.frag | 1 - sapi/cli/config.w32 | 1 - sapi/cli/tests/php_cli_server.inc | 1 - sapi/embed/config.m4 | 1 - sapi/fpm/fpm/fpm.c | 2 -- sapi/fpm/fpm/fpm.h | 1 - sapi/fpm/fpm/fpm_arrays.h | 1 - sapi/fpm/fpm/fpm_atomic.h | 2 -- sapi/fpm/fpm/fpm_children.c | 2 -- sapi/fpm/fpm/fpm_children.h | 1 - sapi/fpm/fpm/fpm_cleanup.c | 2 -- sapi/fpm/fpm/fpm_cleanup.h | 2 -- sapi/fpm/fpm/fpm_clock.c | 1 - sapi/fpm/fpm/fpm_clock.h | 1 - sapi/fpm/fpm/fpm_conf.c | 1 - sapi/fpm/fpm/fpm_conf.h | 2 -- sapi/fpm/fpm/fpm_config.h | 1 - sapi/fpm/fpm/fpm_env.c | 2 -- sapi/fpm/fpm/fpm_env.h | 2 -- sapi/fpm/fpm/fpm_events.c | 2 -- sapi/fpm/fpm/fpm_events.h | 1 - sapi/fpm/fpm/fpm_log.c | 1 - sapi/fpm/fpm/fpm_log.h | 1 - sapi/fpm/fpm/fpm_php.c | 2 -- sapi/fpm/fpm/fpm_php.h | 2 -- sapi/fpm/fpm/fpm_php_trace.c | 2 -- sapi/fpm/fpm/fpm_php_trace.h | 2 -- sapi/fpm/fpm/fpm_process_ctl.c | 2 -- sapi/fpm/fpm/fpm_process_ctl.h | 2 -- sapi/fpm/fpm/fpm_request.c | 1 - sapi/fpm/fpm/fpm_request.h | 1 - sapi/fpm/fpm/fpm_scoreboard.c | 2 -- sapi/fpm/fpm/fpm_scoreboard.h | 1 - sapi/fpm/fpm/fpm_shm.c | 1 - sapi/fpm/fpm/fpm_shm.h | 2 -- sapi/fpm/fpm/fpm_signals.c | 2 -- sapi/fpm/fpm/fpm_signals.h | 1 - sapi/fpm/fpm/fpm_sockets.c | 1 - sapi/fpm/fpm/fpm_sockets.h | 1 - sapi/fpm/fpm/fpm_status.c | 2 -- sapi/fpm/fpm/fpm_status.h | 1 - sapi/fpm/fpm/fpm_stdio.c | 2 -- sapi/fpm/fpm/fpm_stdio.h | 2 -- sapi/fpm/fpm/fpm_str.h | 1 - sapi/fpm/fpm/fpm_systemd.c | 1 - sapi/fpm/fpm/fpm_systemd.h | 1 - sapi/fpm/fpm/fpm_trace.c | 3 --- sapi/fpm/fpm/fpm_trace.h | 2 -- sapi/fpm/fpm/fpm_trace_mach.c | 3 --- sapi/fpm/fpm/fpm_trace_pread.c | 2 -- sapi/fpm/fpm/fpm_trace_ptrace.c | 2 -- sapi/fpm/fpm/fpm_unix.c | 2 -- sapi/fpm/fpm/fpm_unix.h | 2 -- sapi/fpm/fpm/fpm_worker_pool.c | 1 - sapi/fpm/fpm/fpm_worker_pool.h | 2 -- sapi/fpm/fpm/zlog.c | 1 - sapi/fpm/fpm/zlog.h | 1 - sapi/fpm/php-fpm.service.in | 1 - sapi/fpm/tests/response.inc | 2 +- sapi/fpm/tests/skipif.inc | 2 +- sapi/fpm/tests/status.inc | 2 +- sapi/fpm/tests/tester.inc | 2 +- sapi/litespeed/README.md | 4 ---- sapi/litespeed/lsapi_main.c | 2 -- sapi/litespeed/lsapidef.h | 1 - sapi/litespeed/lsapilib.c | 2 -- sapi/litespeed/lsapilib.h | 7 ------- sapi/litespeed/lscriu.c | 1 - sapi/litespeed/lscriu.h | 2 +- sapi/phpdbg/Makefile.frag | 1 - sapi/phpdbg/config.w32 | 1 - sapi/phpdbg/phpdbg_eol.h | 1 - sapi/phpdbg/phpdbg_io.c | 1 - sapi/phpdbg/phpdbg_io.h | 1 - sapi/phpdbg/phpdbg_sigio_win32.c | 1 - sapi/phpdbg/phpdbg_sigsafe.c | 1 - scripts/Makefile.frag | 1 - scripts/dev/find_tested.php | 1 - scripts/dev/gen_verify_stub | 1 - scripts/dev/generate-phpt/src/codeSnippets/array.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/boolean.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt | 2 +- .../dev/generate-phpt/src/codeSnippets/commentStart.txt | 2 +- .../generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/float.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/int.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/object.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/string.txt | 2 +- scripts/dev/generate-phpt/src/gtAutoload.php | 2 +- scripts/dev/generate-phpt/src/gtClassMap.php | 2 +- scripts/dev/generate-phpt/src/gtCodeSnippet.php | 2 +- scripts/dev/generate-phpt/src/gtFunction.php | 2 +- scripts/dev/generate-phpt/src/gtMethod.php | 2 +- scripts/dev/generate-phpt/src/gtTestCaseWriter.php | 2 +- scripts/dev/generate-phpt/src/gtText.php | 2 +- .../src/setup/exceptions/gtMissingOptionsException.php | 2 +- .../src/setup/exceptions/gtUnknownSectionException.php | 2 +- .../dev/generate-phpt/src/setup/gtCommandLineOptions.php | 2 +- scripts/dev/generate-phpt/src/setup/gtOptionalSections.php | 2 +- scripts/dev/generate-phpt/src/setup/gtPreCondition.php | 2 +- scripts/dev/generate-phpt/src/setup/gtPreConditionList.php | 2 +- .../src/setup/preconditions/gtIfClassHasMethod.php | 2 +- .../setup/preconditions/gtIsSpecifiedFunctionOrMethod.php | 2 +- .../src/setup/preconditions/gtIsSpecifiedTestType.php | 2 +- .../src/setup/preconditions/gtIsValidClass.php | 2 +- .../src/setup/preconditions/gtIsValidFunction.php | 2 +- scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php | 2 +- .../generate-phpt/src/testcase/gtBasicTestCaseFunction.php | 2 +- .../generate-phpt/src/testcase/gtBasicTestCaseMethod.php | 2 +- scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php | 2 +- .../generate-phpt/src/testcase/gtErrorTestCaseFunction.php | 2 +- .../generate-phpt/src/testcase/gtErrorTestCaseMethod.php | 2 +- .../generate-phpt/src/testcase/gtVariationContainer.php | 2 +- .../src/testcase/gtVariationContainerFunction.php | 2 +- .../src/testcase/gtVariationContainerMethod.php | 2 +- .../dev/generate-phpt/src/testcase/gtVariationTestCase.php | 3 +-- .../src/testcase/gtVariationTestCaseFunction.php | 2 +- .../src/testcase/gtVariationTestCaseMethod.php | 2 +- .../src/texts/functionOrMethodNotSpecified.txt | 2 -- scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt | 2 -- .../dev/generate-phpt/src/texts/testTypeNotSpecified.txt | 2 -- scripts/dev/generate-phpt/src/texts/unknownClass.txt | 2 -- scripts/dev/generate-phpt/src/texts/unknownFunction.txt | 2 -- scripts/dev/generate-phpt/src/texts/unknownMethod.txt | 2 -- .../generate-phpt/tests/gtBasicTestCaseFunctionTest.php | 2 +- .../dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php | 2 +- .../dev/generate-phpt/tests/gtCommandLineOptionsTest.php | 2 +- .../generate-phpt/tests/gtErrorTestCaseFunctionTest.php | 2 +- .../dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtFunctionTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php | 2 +- .../tests/gtIsSpecifiedFunctionOrMethodTest.php | 2 +- .../dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIsValidClassTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php | 2 +- .../tests/gtVariationTestCaseFunctionTest.php | 2 +- .../generate-phpt/tests/gtVariationTestCaseMethodTest.php | 2 +- server-tests-config.php | 2 +- tests/basic/timeout_config.inc | 1 - tests/lang/bug73172.inc | 1 - tests/quicktester.inc | 1 - tests/security/open_basedir.inc | 1 - travis/ext/pdo_pgsql/setup.sh | 2 +- travis/ext/pgsql/setup.sh | 2 +- win32/build/Makefile | 1 - win32/build/Makefile.phpize | 1 - win32/build/config.w32 | 1 - win32/build/config.w32.phpize.in | 1 - win32/build/configure.tail | 1 - win32/build/confutils.js | 1 - win32/build/phpize.bat | 1 - win32/build/wsyslog.mc | 1 - win32/cp_enc_map_gen.c | 2 -- win32/dllmain.c | 1 - win32/ftok.c | 1 - win32/getrusage.h | 1 - win32/param.h | 1 - win32/php_inttypes.h | 1 - win32/php_win32_globals.h | 1 - win32/select.h | 1 - win32/winutil.h | 1 - 578 files changed, 196 insertions(+), 747 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b4d8d47b8bf..25039210659 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,3 @@ - version: "{branch}.build.{build}" image: Visual Studio 2015 @@ -47,4 +46,3 @@ build_script: test_script: - appveyor\test.bat - diff --git a/Makefile.frag b/Makefile.frag index cbea640966d..7c65cfab3c7 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,4 +1,3 @@ - # # Zend # diff --git a/Makefile.gcov b/Makefile.gcov index b290d777d8c..671fedab40a 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -1,4 +1,3 @@ - # # LCOV # diff --git a/README.EXT_SKEL b/README.EXT_SKEL index 7ec3f8e194a..b4ba71323d4 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 b2536d05bc3..0f0bc5d0b60 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.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS index 0baf8086042..a94fed0c255 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 88a6e4c9858..c263b871508 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 34e7fcc4bc2..833e9943f3d 100644 --- a/README.WIN32-BUILD-SYSTEM +++ b/README.WIN32-BUILD-SYSTEM @@ -3,4 +3,3 @@ The Win32 Build System. See http://wiki.php.net/internals/windows/stepbystepbuild vim:tw=78:sw=1:ts=1:et - diff --git a/README.md b/README.md index 6080dc4adf8..64346cb915c 100644 --- a/README.md +++ b/README.md @@ -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/README.namespaces b/README.namespaces index b5200b3f3b9..732a6c06be9 100644 --- a/README.namespaces +++ b/README.namespaces @@ -171,4 +171,3 @@ TODO * Add getNamespace() methods to ReflectionClass and ReflectionFunction * Rename namespaces to packages? - diff --git a/TSRM/acinclude.m4 b/TSRM/acinclude.m4 index fcf97fd352e..f886570c773 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 e7d3f3b9763..cfbd1691276 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 ac3eb060185..3f598849bd4 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 b/UPGRADING index 20ef01131ee..5919bc19649 100644 --- a/UPGRADING +++ b/UPGRADING @@ -523,4 +523,3 @@ PHP 7.1 UPGRADE NOTES ======================================== 13. Other Changes ======================================== - diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index c5c07b3a3d1..3b517fd0d72 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -88,4 +88,3 @@ changes. See: https://wiki.php.net/phpng-upgrading ======================== 3. Module changes ======================== - diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 5f7f25df677..fcf3495e306 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 bf5f57cffc6..da29b49b174 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/RFCs/001.txt b/Zend/RFCs/001.txt index 5366190789b..31646850a62 100644 --- a/Zend/RFCs/001.txt +++ b/Zend/RFCs/001.txt @@ -133,4 +133,3 @@ The new object model is not dependent on other features. Many of the other Zend Engine 2.0 features, such as the $foo->bar()->barbara() syntax, destructors and others completely rely on this new object model. - diff --git a/Zend/RFCs/003.txt b/Zend/RFCs/003.txt index ac042183d42..44b1c3dc4e5 100644 --- a/Zend/RFCs/003.txt +++ b/Zend/RFCs/003.txt @@ -66,7 +66,3 @@ following could not reliably run. Old code that does not take advantage of this will run without modifications. - - - - diff --git a/Zend/buildconf b/Zend/buildconf index fe8dee6f767..b2e0a2958c2 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 fc03349f7e0..a8b97e691e1 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 8511414b82c..63d1c0d0da4 100755 --- a/Zend/tests/methods-on-non-objects-nested.inc +++ b/Zend/tests/methods-on-non-objects-nested.inc @@ -1,4 +1,4 @@ d = 4; } }; $d = new d; ?> - diff --git a/Zend/tests/return_types/classes.php.inc b/Zend/tests/return_types/classes.php.inc index e4b691e3537..34abd8490a4 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_dtrace.c b/Zend/zend_dtrace.c index a92ba405468..bb968666aea 100644 --- a/Zend/zend_dtrace.c +++ b/Zend/zend_dtrace.c @@ -114,4 +114,3 @@ ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *ret /* }}} */ #endif /* HAVE_DTRACE */ - diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index 6e3d1657d20..0a234c82dee 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -240,4 +240,3 @@ ZEND_API void zend_strip(void) * indent-tabs-mode: t * End: */ - diff --git a/Zend/zend_smart_str.h b/Zend/zend_smart_str.h index 203760ae5d9..b45463ba467 100644 --- a/Zend/zend_smart_str.h +++ b/Zend/zend_smart_str.h @@ -120,4 +120,3 @@ static zend_always_inline void smart_str_setl(smart_str *dest, const char *src, } #endif - diff --git a/Zend/zend_strtod_int.h b/Zend/zend_strtod_int.h index ec970384302..0f74744d72f 100644 --- a/Zend/zend_strtod_int.h +++ b/Zend/zend_strtod_int.h @@ -145,4 +145,3 @@ typedef unsigned long int uint32_t; #endif #endif /* ZEND_STRTOD_INT_H */ - diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index 345d7bde7b2..76e25165206 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -82,4 +82,3 @@ ZEND_API void zend_deserialize_opcode_handler(zend_op *op) { op->handler = zend_opcode_handlers[(zend_uintptr_t)op->handler]; } - diff --git a/appveyor/build.bat b/appveyor/build.bat index a93c40d4e71..05cfd54d41a 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 8c8694c52ae..35a0aabb9d7 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -57,4 +57,3 @@ nmake /NOLOGO if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/test.bat b/appveyor/test.bat index 484a2da99d5..220ef7a9977 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 a420c969b73..9adb596bf4e 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 --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 630b15c148d..bc038fdbf78 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -52,4 +52,3 @@ configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ @rm -f $@ $(PHP_AUTOCONF) -f $(SUPPRESS_WARNINGS) - diff --git a/build/genif.sh b/build/genif.sh index e2bc6ac89d9..4a9c0faee72 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 27a4bcb2d1b..698d80a823f 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 982db9dc405..f2d831cf652 100644 --- a/ext/bcmath/libbcmath/AUTHORS +++ b/ext/bcmath/libbcmath/AUTHORS @@ -1,3 +1 @@ Phil Nelson wrote bcmath library. - - diff --git a/ext/bcmath/libbcmath/COPYING.LIB b/ext/bcmath/libbcmath/COPYING.LIB index c4792dd27a3..aa4f4aca85c 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 b8d459a2bbf..eea6b016e2b 100644 --- a/ext/bcmath/libbcmath/ChangeLog +++ b/ext/bcmath/libbcmath/ChangeLog @@ -7,4 +7,3 @@ Wed Jun 7 09:39:02 2000 Phil Nelson 2000-05-21 Phil Nelson * Initial setup of bcmath library., calling it version 0.1. - diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 1b06b301ba1..423600ac76f 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 e5be8201b31..066be6df50c 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 4d301dcacf2..74ee5ddaa89 100644 --- a/ext/bcmath/libbcmath/acconfig.h +++ b/ext/bcmath/libbcmath/acconfig.h @@ -6,4 +6,3 @@ /* Define to `size_t' if and don't define. */ #undef ptrdiff_t - diff --git a/ext/bcmath/libbcmath/aclocal.m4 b/ext/bcmath/libbcmath/aclocal.m4 index e60c9eb55c7..71ebc0fa84c 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 21cfb9255f9..d9572c474dd 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 0b74129785e..7b766e09e8c 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.in b/ext/bcmath/libbcmath/configure.in index 3da89e949f2..2e5333136e1 100644 --- a/ext/bcmath/libbcmath/configure.in +++ b/ext/bcmath/libbcmath/configure.in @@ -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 ade5b5969a0..150f27c53c7 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 6217ef1af33..cb7d04e0714 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 3da88744310..d445307f170 100644 --- a/ext/bcmath/libbcmath/src/div.c +++ b/ext/bcmath/libbcmath/src/div.c @@ -271,4 +271,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 08c2f8a2a2d..848a4cc8506 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 cef0fdbf1ba..991c294e990 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/init.c b/ext/bcmath/libbcmath/src/init.c index d3a2e580e5e..f27eb4b446b 100644 --- a/ext/bcmath/libbcmath/src/init.c +++ b/ext/bcmath/libbcmath/src/init.c @@ -131,4 +131,3 @@ bc_init_num (bc_num *num) { *num = bc_copy_num (BCG(_zero_)); } - diff --git a/ext/bcmath/libbcmath/src/int2num.c b/ext/bcmath/libbcmath/src/int2num.c index a8965f6040e..79a6e19075b 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 1f2f0708ccf..933e501108b 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 619a59bb05c..65081dbef6c 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 be84986d236..81e82a6fac9 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 c625d4e5264..bf61814a335 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 1b81601b201..93cc26d12d7 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 265d75b5fba..a7c4d732a6b 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 62544de80ec..f38d341570f 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 b63f1bc90ac..2278b0f14f5 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 ffb54975468..d732dddfcdc 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 44f0490ed1f..0e055183a48 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 03db8fd45de..fda6cf33848 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 4fff1341786..29ae28efc21 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 7302871bcff..a0fa3c07491 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 a746d61837a..a3af63120f9 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 347a4958315..f21af9b503e 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 312c195e05d..ac5934d7848 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 124e0f898cc..b7c1570195e 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 370b3ea2710..e7748197eac 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 3d23fb914c8..ec0610b71f6 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 9792f008299..51f27050ca8 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 d265fd988e1..219cf8aa721 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 6b0cac12250..5d9f31fee09 100644 --- a/ext/dom/examples/relaxNG.xml +++ b/ext/dom/examples/relaxNG.xml @@ -1 +1 @@ -hello \ No newline at end of file +hello diff --git a/ext/dom/examples/shipping.php b/ext/dom/examples/shipping.php index 5205fd2014c..cc7a1b896ed 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 dc8a09e3017..1faeaf9f4ed 100644 --- a/ext/dom/examples/shipping.xml +++ b/ext/dom/examples/shipping.xml @@ -18,4 +18,4 @@ 9.90 - \ No newline at end of file + diff --git a/ext/dom/tests/bug67081_0.xml b/ext/dom/tests/bug67081_0.xml index 604eea57b16..160e9d31c3d 100644 --- a/ext/dom/tests/bug67081_0.xml +++ b/ext/dom/tests/bug67081_0.xml @@ -3,4 +3,3 @@ ]> - diff --git a/ext/dom/tests/bug67081_1.xml b/ext/dom/tests/bug67081_1.xml index 7ae542e977d..f699805f648 100644 --- a/ext/dom/tests/bug67081_1.xml +++ b/ext/dom/tests/bug67081_1.xml @@ -4,4 +4,3 @@ ]> - diff --git a/ext/dom/tests/bug67081_2.xml b/ext/dom/tests/bug67081_2.xml index c10af0966ce..baa98702121 100644 --- a/ext/dom/tests/bug67081_2.xml +++ b/ext/dom/tests/bug67081_2.xml @@ -2,4 +2,3 @@ - diff --git a/ext/dom/tests/dom.xml b/ext/dom/tests/dom.xml index 09ac674e55d..c7bbc55413d 100644 --- a/ext/dom/tests/dom.xml +++ b/ext/dom/tests/dom.xml @@ -5,4 +5,4 @@ ]> - \ No newline at end of file + diff --git a/ext/dom/tests/nsdoc.xml b/ext/dom/tests/nsdoc.xml index 9503fd8c5b1..9153729d1a7 100644 --- a/ext/dom/tests/nsdoc.xml +++ b/ext/dom/tests/nsdoc.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ext/dom/tests/skipif.inc b/ext/dom/tests/skipif.inc index 08fd695d97e..16ab73febb0 100644 --- a/ext/dom/tests/skipif.inc +++ b/ext/dom/tests/skipif.inc @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h index 00fc8ea4a6d..20fd8ea26aa 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/example.php b/ext/exif/example.php index e34dc05f6d4..678500f67cd 100644 --- a/ext/exif/example.php +++ b/ext/exif/example.php @@ -20,4 +20,4 @@ foreach($exif as $key=>$section) { } ?> - \ No newline at end of file + diff --git a/ext/exif/test.php b/ext/exif/test.php index 907b9ea080a..35234706644 100644 --- a/ext/exif/test.php +++ b/ext/exif/test.php @@ -1,3 +1,3 @@ \ No newline at end of file +?> diff --git a/ext/exif/test.txt b/ext/exif/test.txt index 1c12b509e65..9fd705636b3 100644 --- a/ext/exif/test.txt +++ b/ext/exif/test.txt @@ -362,4 +362,4 @@ if (function_exists('exif_read_data')) { } ?> - \ No newline at end of file + diff --git a/ext/ext_skel_win32.php b/ext/ext_skel_win32.php index ba44ae60897..64be05c1f54 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 5af690a9b4c..ba84e9a9f55 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 a5d4bce41fc..a641b76ec63 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 b580524489e..de8daacab71 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 51020a3c71d..86ac23cc2c4 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 fa76f4c159d..834d6395529 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 1c06a0af190..ef0c01884c1 100644 --- a/ext/hash/config.w32 +++ b/ext/hash/config.w32 @@ -21,4 +21,3 @@ if (PHP_HASH != "no") { "php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h " + "php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_sha3.h"); } - diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 39033d9d926..fdd78668a25 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1430,4 +1430,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 3fd91038b0b..d34b47feaec 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 78f180462f7..68d2a3e10cc 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 88c46694866..901f2b8e181 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 0e554e94c05..99424b3995a 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 2557489ba15..4f381bf893b 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 26c198bc426..9210c36ebdc 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -247,4 +247,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 d6b7c207193..6d15145516c 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 858cbf5d4da..fec8eb1a67f 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 c8e4e5b702c..ab699145405 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 2d1e78b512b..5e51796cad3 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 eb90c991691..a2a146b7d7e 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 a8331777bb0..52f885195b1 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 316d81357c2..b4feb2ae153 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 91f4869166d..75ad7a04b58 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 a9bb566e679..21b02a9109f 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 91d5741ea1b..57bac1e1d15 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -908,4 +908,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 d81060b5a1f..3765ffe424a 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 560dc8fb450..273e4407b7a 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 2ec138bb7d3..a7727a3ec83 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 1add74b2b5c..d9f257dd681 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/config.w32 b/ext/json/config.w32 index c1a8ccfb306..df9e9096bd3 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -19,4 +19,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 db4520eed62..69bae85d984 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -356,4 +356,3 @@ std: */ } - diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h index 5378e50104d..d8af613878c 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 b90c25df44e..3fc6a223678 100644 --- a/ext/json/php_json_scanner.h +++ b/ext/json/php_json_scanner.h @@ -44,4 +44,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 11aa5cb4524..488f0eadf70 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -26,4 +26,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 338aa79fcd0..c2db83436b2 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 de72aab440f..8f9ac620af5 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 ddb688d1c59..151d5ca52cd 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 Fixed mail() which was causing segmentation fault when header was null. - diff --git a/ext/mbstring/libmbfl/DISCLAIMER b/ext/mbstring/libmbfl/DISCLAIMER index 97fe77c33c0..21b7a91d55a 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 4a6bf169db8..3b691b8844a 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 82a763b6955..75ea1c5117f 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 adce0b75d48..198b2354d3b 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 6833fd81055..be2cf904435 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 ab1727146a8..43f82fc41c8 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 99b48153870..3c8aead9efc 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 adecdee888c..9e0dafd154b 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 122ff4c7780..f5ab8809ce8 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 7452c127fca..6fdcbda7c8d 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 7475e5424c8..239568a128c 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 2d47ac304ae..bc3befea81b 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 becae48c191..b76cc9f6806 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 0c5eba3dd51..ab2f8f11b13 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 78e79335e44..6f4711ab79c 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 75d249fbe8b..655c5583ed1 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 aae45380c84..58fd9f4d1f1 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 179873eb3a0..c5767ec8fc6 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 307f370d03c..f87a603a7da 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 4063a68208a..de7de7213c9 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 bf3ec25ee7a..093f026bdfd 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 3b13850882d..b3641239029 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 aeb94c388d7..1d7ee1ebf91 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 95aec45f4dd..26be59cab0d 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 bc780c99ee6..9b28556dee6 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 721c16292b0..8c732d74629 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 501bcb8d197..682d8401f30 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 fc6678ecb69..cf084399f8b 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 382d0c2294e..4688e679059 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 f6d1b21b554..dd34b532978 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 cbc8f77d879..480f890b2d0 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 03581ccf45c..ef7b7e645d9 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 50649ddeb6d..8e236b667d8 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 e1897069eb6..c04cfd87b4f 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 a04910eb78e..1c4979362c7 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 0bd4d5e1555..db10cc693f1 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 df89eb75bab..318eaeb3c0f 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 d8d4494a225..406370a3d3c 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 fad0f5c51e1..505f7dec8fd 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 97948d0ff61..1550937bbec 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 b3fbb4f94bf..892e4bda3d3 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 c141dc41024..1878f4d08f1 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 782e0dfaf93..ab4b3db9834 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 2087786c066..383d623d5d3 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 a856aa3d469..e8056ab99ac 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 265c577e5fd..c262dde9bfb 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 637e69074c8..b99c658e4de 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 32f174f6028..d11cf5a8aed 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 8906b8ff097..c662a0d8aae 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 2e1c696f8ad..b8a0e227785 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 3e008e80357..cb46fa51ef7 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 aa0883fff45..14b9fa48232 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 db0979c25de..76066420072 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 72c772b0725..ce56433316f 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 41e02bf3149..410ba64b6fa 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 b8cdfcaf792..15831011a33 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 c02d21f878d..9d4bd5fd6bc 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 7853d96ba44..c50caba29dd 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 bbb92b98e7f..6eaefbc2e39 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 327e2a1278f..01afcc1f2d9 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 2674e0c9b85..e59c685fe85 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 b19432f76a4..2efaae50a24 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 f52c94cf374..96353023cab 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 b553ad5d13d..6cdfcc7f58d 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -623,5 +623,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 9ca2d591839..7ac3920f0d0 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 0e8a82f0e82..1f753d197fe 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 69f594350e8..c9c670373d4 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 b559e2dee30..f84cbe74ed2 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 0700e4f2c4e..7fa23d4f536 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 afff43af489..aba4be5b8c4 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 87a6a194c34..ab747472194 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 c7044ff293f..950a610e0db 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 6a0100105b0..cf76000cd9e 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 d9a49931eaf..1434481b34b 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 0e63ef11b76..740bcfd881e 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 96ee53bb084..c79961027cd 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 b180a342550..b325236dee9 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 c242cba1c3c..64412ab2802 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 6295703c0a3..05ad7571e44 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 7717bf89f98..c100231e4a2 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 e56780a4c12..8b4d52f489d 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 6759d8a1c22..a4ba66e15b4 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 716cc84416b..86e5fcb3796 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/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc index 7b4d9c12a98..748fd43c627 100644 --- a/ext/mysqli/tests/local_infile_tools.inc +++ b/ext/mysqli/tests/local_infile_tools.inc @@ -153,4 +153,4 @@ return true; } -?> \ No newline at end of file +?> diff --git a/ext/mysqli/tests/reflection_tools.inc b/ext/mysqli/tests/reflection_tools.inc index c8338bfa24b..6648526ed05 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 a7581fb4806..5562aab84ba 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 254a4ccece7..ad143a42a46 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 d73d185bc4c..fa5fb9f0a34 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 dcc4cbb3bff..d9da63d0b70 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/tests/php_cli_server.inc b/ext/opcache/tests/php_cli_server.inc index ca781b7cd76..70ef14e5858 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 ade17d402a5..fd79e0472db 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 34313b2040c..ab1dfa1f2d2 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 02256887a1e..aeea1c45061 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 1ba11d6c35c..0ea6a17b6dd 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -77,4 +77,3 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality] AC_MSG_RESULT([no]) fi fi - diff --git a/ext/pdo/CREDITS b/ext/pdo/CREDITS index 5971cdb0dd6..a9899d230fd 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 d2b59744efc..495d03366bd 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/README b/ext/pdo/README index da806b0f30f..dfba3982a4b 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 0196a72b5bb..db060bc5049 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -66,4 +66,3 @@ for more detail on this issue. 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 8f2debc9128..a5902635481 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_mysql/CREDITS b/ext/pdo_mysql/CREDITS index 0423cccd64f..eb11169bd93 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/skipif.inc b/ext/pdo_mysql/tests/skipif.inc index d48670aec6a..c3076ec3c11 100644 --- a/ext/pdo_mysql/tests/skipif.inc +++ b/ext/pdo_mysql/tests/skipif.inc @@ -4,4 +4,4 @@ if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) if (version_compare(PHP_VERSION, '5.1.0') < 0) die('skip Most tests assume PHP 5.1+'); -?> \ No newline at end of file +?> diff --git a/ext/pdo_mysql/tests/table.inc b/ext/pdo_mysql/tests/table.inc index c7bb9cc5ee4..54bf14f07d5 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 0a64b80ccad..fe1249a3722 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -252,4 +252,3 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_ 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 139597f9cb0..e69de29bb2d 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 cd1017f2e4e..e582db203e2 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 69f17a7bf08..a1c36cb97b4 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 26f7aad02d4..11f112dfc02 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 8201e88dba0..684da977d92 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 4cf7c09a513..c121c62413f 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 0e3713fc63b..2b7f0ffae60 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/func_interceptors.c b/ext/phar/func_interceptors.c index 5f3055d5e8b..0e1d159332a 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -1210,4 +1210,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 14ff89c56be..bd4150e3efb 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 5a658ddabce..34579678a77 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 9ed2e1a1bf5..2c681632fb7 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 aec87e6ab14..8f82f41f2aa 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 c28de0aa7a6..129a0c43bf8 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 f6f26c23f28..13538777a56 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 0bfef468530..df74c138805 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'] = 'setStub('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 9863e8da937..0691e4dc804 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 f82471d13b4..b1bb6d0e384 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 0bfef468530..df74c138805 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'] = 'setStub('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 45421568dee..3883d494c15 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 28ce8427f34..9d51a750dfe 100644 --- a/ext/phar/tests/files/stuboflength1041.phar.inc +++ b/ext/phar/tests/files/stuboflength1041.phar.inc @@ -18,4 +18,4 @@ $phar->setStub('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 52f5a235073..641dda56f59 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 413dd7bd1bd..895977bf2fb 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 0df7ee99335..5860bf84d31 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 9fbfe341c3c..c030895f2c6 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 cec8ef77939..4f4758bbb64 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 ad16fda6592..c9eebad7edc 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 58806289db4..9fc884c65b0 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 741a4bc8f0e..413163c0323 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 482c99cc045..9e21e6bb540 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 50c1d21ab4b..1d708ccc058 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 26d88068a9f..2e6aae072b2 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 88947251cd4..313fc5feca7 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 ba0489222d3..6fcc433b2c2 100644 --- a/ext/session/tests/save_handler.inc +++ b/ext/session/tests/save_handler.inc @@ -100,4 +100,3 @@ function feature() { } ?> - diff --git a/ext/shmop/README b/ext/shmop/README index 1bb95b220e2..60088df08fb 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 b0f2785463f..86a22ba0fac 100755 --- a/ext/simplexml/tests/000.xml +++ b/ext/simplexml/tests/000.xml @@ -13,4 +13,4 @@ Here is some more - \ No newline at end of file + diff --git a/ext/simplexml/tests/bug24392.xml b/ext/simplexml/tests/bug24392.xml index d669f1df418..2cb5106eea6 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/"> http://slashdot.org/search.pl - \ No newline at end of file + diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 413be72087d..0a730ae8094 100755 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ext/simplexml/tests/sxe私はガラスを食べられます.xml b/ext/simplexml/tests/sxe私はガラスを食べられます.xml index 413be72087d..0a730ae8094 100644 --- a/ext/simplexml/tests/sxe私はガラスを食べられます.xml +++ b/ext/simplexml/tests/sxe私はガラスを食べられます.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ext/skeleton/CREDITS b/ext/skeleton/CREDITS index 58fc71019ae..407205f7439 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 0848d5701ec..c24eec0cb3a 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 72423251fda..d8ee31d0c49 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 5b1f699c9be..e581772bbb5 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 8564c654f09..695867d7e2d 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 48eaf40f896..b5d6ced74c6 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 a9da5653e37..727def1ee6b 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 b65da2782c3..8ecf366824b 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 ee38a121369..0b97f8bac9d 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 ecde53e1559..8981c0e6ba4 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 5957c374a1d..3eea780899c 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 3a3df9791bf..c96dcbb6438 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 e88df3312b9..8b4804db147 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 19a769c001f..7b918c0afbb 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 e90586efdb2..d2af69e4be5 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 b7e67b0f527..0940d1c3995 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 e6c4cfea689..5e87583c0ba 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 ce0de82d59b..26fcdaa8869 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -120,4 +120,3 @@ php_socket *socket_import_file_descriptor(PHP_SOCKET sock); * c-basic-offset: 4 * End: */ - diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc index 2ccd0d1be8b..0dc423199e4 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 4fa6b235c31..f0e060a0a7a 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 51757012ec8..4d49a52807c 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 fc021d5c01c..a5d2d7b1ca4 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 f217c345467..7930348f7c4 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 7ea8e762552..4c080729b2d 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 01de37e990c..095c5c29d51 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 3f0bb263e2a..65a4dd7a389 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 7bd9c2c597d..20a15c815fa 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 dc26d6cc22e..38759837f50 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 8454d9e3056..52a4e114ed3 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 02ab7924335..afafa8124df 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 60146cbffd0..7a850feddb0 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 288c0924b14..284f985943b 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 4c6c89bd70d..540fc68c9cf 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 cb2bb04a57d..d33f169c4b8 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 abc925ec432..21bb79a2d1d 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 6993268945c..d8e4362ab60 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 d75788e840d..23fcfc97772 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 d5dd7225360..395624b8de9 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 ff4963bc72c..451ae08fd27 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 feeba7db243..75025146598 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 ac80e795812..c7a05717a6f 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 e11e467a10e..27cb9c064f0 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 04d78271827..ffd728cf09d 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 00c41228723..78c96d1049c 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 8747a6116ec..6b61dbba028 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 f26d29da56a..c2684ae51c9 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 69a223444d9..e3c5605f832 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 2059b97c1c6..418fb0d9e13 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 3ae127ad94b..fcbbda70424 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 87d98da8852..2c0d9ef998b 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 6e6c023486d..a89fbd8577e 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 c22a92bf716..46110c9fb9e 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 42231043987..51cf6c415fa 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 dfcdc059952..a2312414eab 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 77286369818..83e5588c74b 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 e7e7ea0bd02..c2e460b95a8 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 f5fe7411fac..c5d6034423c 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 ceb24c877cd..0684d2098da 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 ceb24c877cd..0684d2098da 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 8b6e3e233ab..72d5eee4aaa 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/assert.c b/ext/standard/assert.c index 5f1d12a0f41..03316941dbb 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -386,4 +386,3 @@ PHP_FUNCTION(assert_options) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h index 56861f149ae..8b9b737d66d 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 77af9b8bbbe..20b859919c8 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 bd3ded9fdec..c0533b01340 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 005bebbe200..18fcc02f9cb 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 81800bcd2dc..90cebfd2745 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 5d8ccb9caee..694f6a194e5 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -266,4 +266,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 1c0e445dfac..d22521bb9fb 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 e08e61fc84c..4dedfc443e0 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -333,4 +333,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 deb945a5cc0..f8c1843f854 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 4128863555c..445a93d613d 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 411f7e32795..fb641c2d327 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/proc_open.h b/ext/standard/proc_open.h index 857771a0aaa..7bc0a83b18a 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 9d2dc7ae32d..ed3b1a5f33f 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1614,4 +1614,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 70258bc8d91..7d07c514970 100644 --- a/ext/standard/streamsfuncs.h +++ b/ext/standard/streamsfuncs.h @@ -74,4 +74,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 e5176802abb..4fa672e7675 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 f1e5b1f58fc..805d7f1f6f1 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 52e6671ddc1..2935b801e55 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 a0c8244265e..fb487fb0714 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 698e975ef71..c371d592710 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 5bc9b6ce3b2..e33dae49156 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 98cec87dc63..de4072a1aaf 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 8d7009f91cc..e0915649984 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 7345df383c9..f64ab64d0d5 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 0d9894683a1..576118ffd63 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 71dbf9af4a5..9ba754b5829 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 8f911659778..b5a7432e2d8 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 e79a2fd6d6d..dcdb1bcbaaa 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 3a9a0d47df6..80fb28ee61f 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 0fb6c0f035a..b46a038fad9 100644 --- a/ext/tidy/README +++ b/ext/tidy/README @@ -1,4 +1,3 @@ - README FOR ext/tidy by John Coggeshall diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index 654c1590c98..44b2abeacc4 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 1cae9b7d9a8..571e0366fb1 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 dd3b89e7789..226ca8e234a 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 6b36ab0e39f..c9062ff4ff9 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 a34c36ec911..48b78d1aec1 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 cca068a95ce..7fb1f8494be 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 6b0cac12250..5d9f31fee09 100644 --- a/ext/xmlreader/examples/relaxNG.xml +++ b/ext/xmlreader/examples/relaxNG.xml @@ -1 +1 @@ -hello \ No newline at end of file +hello diff --git a/ext/xmlreader/examples/xmlreader_relaxNG.php b/ext/xmlreader/examples/xmlreader_relaxNG.php index e56739a2fb2..09f14be8cd6 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 520a61ee30d..b5508b61691 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 68ee25ddb88..0f90a69cf02 100644 --- a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml index 9a59e0c9782..7d8ef1fad32 100644 --- a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index 35fbf261811..49acc247f6b 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 323edfa6718..4835cd68e9f 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 6a0c8ef6fc8..f0272b43567 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 081e38e5deb..01cc7dbab81 100644 --- a/ext/xmlrpc/libxmlrpc/encodings.c +++ b/ext/xmlrpc/libxmlrpc/encodings.c @@ -124,4 +124,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 ff5e651fd0d..31f4156a5d2 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 fa3fc279f2d..bea8779da92 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 000df192fdc..d5920ed2213 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c @@ -316,4 +316,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 e0604bae620..b1d62656527 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -667,4 +667,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 c557ee06d80..36b9ae9d1ba 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c @@ -410,4 +410,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 9b0d9341297..dea14f6a58b 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.h @@ -449,6 +449,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 6da21b974e8..7723d8ec214 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c @@ -599,6 +599,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 41a31c6f515..2f90fc0e3c2 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 5b231fe3446..1a5d9f79a97 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 fbe7104aac1..da8a99aa13e 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 068ae665828..71aa6534ef3 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 2a95bfb8208..7bd8a4befa3 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 8f8eef9fa0a..61902c08f67 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 e4d013194e3..3ff61a38538 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 a3039cd1015..1c9dc175cd9 100644 --- a/ext/xsl/tests/53965/collection.xml +++ b/ext/xsl/tests/53965/collection.xml @@ -10,4 +10,4 @@ Jimi Hendrix 1997 - \ No newline at end of file + diff --git a/ext/xsl/tests/area_name.xml b/ext/xsl/tests/area_name.xml index 76cea58511e..fbe3b202124 100644 --- a/ext/xsl/tests/area_name.xml +++ b/ext/xsl/tests/area_name.xml @@ -7,6 +7,3 @@ m."Avtovo" - - - diff --git a/ext/xsl/tests/exslt.xml b/ext/xsl/tests/exslt.xml index 562e08e8216..06110aabd49 100644 --- a/ext/xsl/tests/exslt.xml +++ b/ext/xsl/tests/exslt.xml @@ -12,4 +12,3 @@ - diff --git a/ext/zip/examples/addglob.php b/ext/zip/examples/addglob.php index 790312b4d58..3c432f0be5f 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 a1a9b122914..41efaa5eb73 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/fopen.php b/ext/zip/examples/fopen.php index 32357f3c08f..80de5d052a4 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 5bd302e6da4..bec4240246d 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 3721434054d..b664e91c2ba 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 a6f45e8294e..b439939e64d 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 820025aa7ff..668b95ad6d5 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 441199ff08a..bee4e51d9ad 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -1,4 +1,3 @@ - \ No newline at end of file +?> diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc index 0a422cab780..ceca94d3003 100644 --- a/ext/zlib/tests/func.inc +++ b/ext/zlib/tests/func.inc @@ -14,4 +14,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 7d6723a8150..add04f74de8 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 ee71bb9c423..abe80bf69c1 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 89bdb29f1eb..dffc32d9f13 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. - - diff --git a/footer b/footer index 64d3768113f..42a6cd7005e 100644 --- a/footer +++ b/footer @@ -1,4 +1,3 @@ - /* * Local variables: * tab-width: 4 diff --git a/genfiles b/genfiles index 516b3316fb0..a561c3d8f1c 100755 --- a/genfiles +++ b/genfiles @@ -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 9c05bff66d3..5d2fa9f3523 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 31a79089302..9acce0701fb 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -1570,5 +1570,3 @@ php_stream_ops php_stream_userspace_dir_ops = { NULL, /* stat */ NULL /* set_option */ }; - - diff --git a/netware/sendmail_nw.h b/netware/sendmail_nw.h index b88f8e12a13..80080f95efb 100644 --- a/netware/sendmail_nw.h +++ b/netware/sendmail_nw.h @@ -1,4 +1,3 @@ - #define closesocket close #define LPCSTR char * #define LPSTR char* diff --git a/pear/Makefile.frag b/pear/Makefile.frag index bbe8ec35135..528683ba1b5 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 01d223392e4..56767b62cb7 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 d624141c9f0..15ef022d24e 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 8ea1305d4fc..20a801ff9e2 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 75c72bf8b71..79e2afec254 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 8f4f400401c..aa1d642b9cd 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 7d0e5954ff8..c510e231d1e 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 2a21ba35d06..ff4eef0e129 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 5be7af48f4d..dcdb4d68aa2 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 e43eb5a86d6..2bd890b224c 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 4916140e174..5ac3ea91066 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 02846b7c014..6975ab21af4 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 662dd4726d5..7b17df6bc1b 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 4ee316ba1b9..bda85ef5a86 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 9c79f234e8f..a488b544fd9 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 260ddb32e76..dbab8ed7861 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 4d7cf391cb7..71639afe94c 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 66751b81bb8..b03531ff24d 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 6aab959e16d..7f62d0055f7 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 0e3bb26c305..f8d5da478ca 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 4021cbc2e3b..8f29b5786ab 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 */ @@ -118,4 +117,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 856414a9202..78768ed214e 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 73affab236b..05815771151 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 bf472368da3..24ff84b6f05 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 2b8e8cf13ad..3917a9658cb 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 416ec6e728a..7e2c925345c 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 02f88681420..cdfec8c5e04 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 d85d368da5f..e3121777f02 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 e20276974d1..aa58ebd28bf 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 */ @@ -283,4 +282,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 a2f2138d23f..d0577e22f37 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 d04afcf9661..454309d402d 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 af5e456acbb..3d9c81e472e 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 ca5a6f2e405..f99ec241c74 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 86a6ef0dfbb..8888f738a08 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 3f82a7d4f75..a4ace853104 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 d9e831d1009..1328b5de4e3 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 b2ce46356f9..7a65fcbeb71 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 f58a28737df..abce616d769 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 7986056793c..9a58e9d0063 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 bcb60998144..c9bfb4ee72d 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 68cb15379b6..0df119be386 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 eb80faecfdb..759a4e316ca 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 de0f479afc9..b1e3a404f9a 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 98b40ff206d..020bb50134f 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 42d7d7bae08..1d78ebf849a 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 c6c27cd031c..37b2eed8f9e 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 76e8b324df6..7abd5b43a22 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 d3d61e46be2..f5c45e1f6f5 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 65db5455a0e..90250ffe3c9 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 95d12c97f2f..31b6a3d27ae 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 3ee62177170..e978a7c7be4 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 eae7fe9bbfc..6fc24d544dd 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 b4211722077..94cfafe2139 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 3b85e6a3435..ee4e33469e6 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 6a6155740bd..2f1fb5618f0 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 838c61867c4..37d340bbc37 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 44f8df31115..1539c07ba29 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 a79559f9e6a..1e30fc09c32 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 a0022915cdc..90e155975e4 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 6b2bc908dc7..68179d283d7 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 4884dca856b..27ab6e4d140 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 c2bf752b935..31a16fb88dd 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 a4d533c1972..8a541c08655 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 9888ec1b83f..24285bf560c 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 25910a8e05e..eec65a41122 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 5965f130eb2..39005de5686 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 c3b6c83e597..70c03ad70f1 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 e744030de74..3f5b7ad14f8 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 6c986b4906b..c6112353fdc 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -1540,5 +1540,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 4db8ff562d9..f6c0cb02312 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 685892e7081..a93cdc345d2 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 1fd3f56176a..ff27c9cd943 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 6ceed3fb8bc..1db123cc6d2 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 cc0186ef79f..02fc9b880a1 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 091b1e831c8..65377e608a6 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 e69ca455f79..9aca03dff6a 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 afc31a906ec..8d6ee8278ea 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 150647aa7eb..1f26f7983b4 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 d0b69d9b41e..deda272da2f 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 b86ea05da2f..3ca0ad8d376 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 081d864c5c9..dab0d27d85e 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 d3f8bb21368..06be3af28e1 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 18521638d3d..21f252522a3 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 ac6dc4434d2..f326230e5d4 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 69a4af72c13..fa007aab9c4 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 53db40d30b2..024690e757e 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 d116022fb8a..1b588a47e17 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 e3466d5a1a4..df6cefe76bd 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 a9577812056..c3d034d07bc 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 75c2b6cd521..7afd16f5f98 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 cdd28ae4359..0b2cd7c3b00 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 ff30235f076..5c34318c214 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 8fd5eb20fdb..0a90360dea6 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 28ee61bfae7..0b9b16e4ef6 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 a1d42376da5..3b194276cc3 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 8c18c179eb2..b215923f2c6 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 1c346b83ce3..2a359082f33 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 dc6543201a7..0e02fa55727 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 b2752ad637b..922374ede79 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 dc8438c3b5f..2db2bb7b0cb 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 9438e0f2ea1..6b26a56c5ed 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 8cbd1650d4d..c0eb469550a 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 5bff5e01a0a..e3c2f35afb0 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 c4843240d70..b51482b00da 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 b1068e46004..f12ff8728a4 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 6c6de183456..e59c7a0be4a 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 294b41e9f2c..137325bf04b 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 88f9b36205c..286699cfb80 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 edd7a1cbae6..a16cf81e4da 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 f70af881ec0..b78c1530f71 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 ebc0a68f576..153efa52762 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 a39bab453ef..545612ddf1e 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 ed91c2ca3b5..a5be4f1a0ce 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 92560c86311..ff22dd3ee1f 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 c0fc9eb61f5..62acab3f376 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 d009d5038ae..74a2414f86b 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 82f955cf467..dbf9a665fde 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 fcba6d798c4..e966fff708d 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 fa1c8ca3f19..a0a96cfc74a 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 f445d9e7f4d..260cba4113e 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 b6a3aa473cd..8ac9300a497 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 0d24337b3b0..68f3a838954 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 e868b80795e..67d8533976c 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php @@ -1,4 +1,3 @@ - \ 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 45cbe2046cc..3545e5c2728 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 db923f078ac..51160f47f84 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 b497682cb7d..3c80875698c 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 1f11a3a1bac..5745d49aef1 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 e83ddbb5c23..054f5807a01 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 b0a47ca8b9c..4d56d95f20d 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 2e76978a529..fa2164a30a7 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 8cc9eaeda66..3f932a730cc 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 fa80c0766da..33a5cb65dfb 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 18768b62943..8a4a23fe50a 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 6d4d5861c31..ca87320224a 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 1bf32b46086..a034aeca4c5 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 c6399168be3..0146266a730 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 894a5515971..5c9dbfbb30f 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 5afcd950d46..f8b17680d41 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 b9f2410b5d5..4494415dea2 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 a60f77ef377..d86945e85cc 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 bc7cf9412d7..858e803e8c9 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 507ca232db5..2a18e50fc50 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 07a7038dccd..d0193c4fffb 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 0f1b349f4d5..4519b0e2176 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 430161ee1c2..8057d6655b6 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 541dbdf2ddb..4352e68abe7 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 83178b21e78..6d3a3ad5461 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 a074fcceeb3..b5c4d64f6ac 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 645a5e8e982..ca01ffe1cbf 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 71820809399..3bd9eeaa708 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 5e4a85ea2e2..760cbecc8bb 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 70cb1156843..ba60e74a510 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 d229f8497fd..d30f2f83848 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 6f16f72cc25..5f3cf67f921 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 ef13733edc9..108f47db250 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash echo ' ' >> "./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 59077d09b86..bb9144bcacf 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -249,4 +249,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 517db128bd1..37c449a059e 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/config.w32 b/win32/build/config.w32 index 05ad6e194a3..ff1cbb864c3 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -318,4 +318,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 812d28faf5e..f43ebeb6a64 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 70625a43d42..d17d4ae67b6 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 1bf452e9671..28f2129fa40 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3346,4 +3346,3 @@ function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part return ret; } - diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index 794b9cb7106..a79885f0088 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 01d4d3a86bf..f326abf7d97 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 d27e28e82b5..bd2f108287a 100644 --- a/win32/cp_enc_map_gen.c +++ b/win32/cp_enc_map_gen.c @@ -1,4 +1,3 @@ - #include #include @@ -247,4 +246,3 @@ main(int argc, char **argv) return 0; } - diff --git a/win32/dllmain.c b/win32/dllmain.c index 947c38d5ad8..2c59d626296 100644 --- a/win32/dllmain.c +++ b/win32/dllmain.c @@ -78,4 +78,3 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy) return ret; } - diff --git a/win32/ftok.c b/win32/ftok.c index 429133043e7..164651d3327 100644 --- a/win32/ftok.c +++ b/win32/ftok.c @@ -59,4 +59,3 @@ ftok(const char *pathname, int proj_id) return ret; } - diff --git a/win32/getrusage.h b/win32/getrusage.h index 59e0b2d5dd3..bc3898436a8 100644 --- a/win32/getrusage.h +++ b/win32/getrusage.h @@ -114,4 +114,3 @@ struct rusage PHPAPI int getrusage(int who, struct rusage *usage); #endif - diff --git a/win32/param.h b/win32/param.h index f312b03b189..3c14992f645 100644 --- a/win32/param.h +++ b/win32/param.h @@ -1,4 +1,3 @@ - /***************************************************************************** * * * sys/param.c * diff --git a/win32/php_inttypes.h b/win32/php_inttypes.h index 4130649cf26..20e9c9b7753 100644 --- a/win32/php_inttypes.h +++ b/win32/php_inttypes.h @@ -311,4 +311,3 @@ imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) #else #include #endif - diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 6451e0e0492..8b721a0d62e 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -55,4 +55,3 @@ void php_win32_core_globals_dtor(void *vg); PHP_RSHUTDOWN_FUNCTION(win32_core_globals); #endif - diff --git a/win32/select.h b/win32/select.h index 8c4a93d2240..4bc0ac5a884 100644 --- a/win32/select.h +++ b/win32/select.h @@ -19,4 +19,3 @@ /* $Id$ */ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv); - diff --git a/win32/winutil.h b/win32/winutil.h index ad1aad741a7..0947a66608c 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -53,4 +53,3 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err); } while (0) PHP_WINUTIL_API char *php_win32_get_username(void); - From 60a69daec60f1886e166e8060556777819c66f98 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Oct 2018 12:54:08 +0200 Subject: [PATCH 2/3] 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-' ' characters plus a terminating '' 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 --- .appveyor.yml | 2 -- .gitignore | 1 - Makefile.frag | 1 - Makefile.gcov | 1 - NEWS | 1 - README.EXT_SKEL | 1 - README.REDIST.BINS | 1 - README.RELEASE_PROCESS | 1 - README.SELF-CONTAINED-EXTENSIONS | 1 - README.TESTING2 | 3 --- README.WIN32-BUILD-SYSTEM | 1 - README.md | 1 - TSRM/acinclude.m4 | 2 -- TSRM/config.w32 | 1 - TSRM/m4/gethostbyname.m4 | 1 - UPGRADING.INTERNALS | 1 - Zend/Makefile.am | 1 - Zend/README.ZEND_VM | 1 - Zend/buildconf | 1 - Zend/tests/bug40236.inc | 2 +- Zend/tests/methods-on-non-objects-nested.inc | 2 +- Zend/tests/nowdoc.inc | 1 - Zend/tests/return_types/classes.php.inc | 1 - Zend/zend_highlight.c | 1 - Zend/zend_vm_execute.skl | 1 - appveyor/build.bat | 1 - appveyor/build_task.bat | 1 - appveyor/test.bat | 1 - appveyor/test_task.bat | 1 - build/build2.mk | 1 - build/genif.sh | 2 -- buildconf.bat | 2 +- ext/bcmath/libbcmath/AUTHORS | 2 -- ext/bcmath/libbcmath/COPYING.LIB | 3 --- ext/bcmath/libbcmath/ChangeLog | 1 - ext/bcmath/libbcmath/FAQ | 1 - ext/bcmath/libbcmath/Makefile.am | 1 - ext/bcmath/libbcmath/acconfig.h | 1 - ext/bcmath/libbcmath/aclocal.m4 | 1 - ext/bcmath/libbcmath/config.h.in | 1 - ext/bcmath/libbcmath/configure | 2 -- ext/bcmath/libbcmath/configure.ac | 1 - ext/bcmath/libbcmath/src/add.c | 1 - ext/bcmath/libbcmath/src/compare.c | 1 - ext/bcmath/libbcmath/src/div.c | 1 - ext/bcmath/libbcmath/src/divmod.c | 1 - ext/bcmath/libbcmath/src/doaddsub.c | 1 - ext/bcmath/libbcmath/src/int2num.c | 1 - ext/bcmath/libbcmath/src/nearzero.c | 1 - ext/bcmath/libbcmath/src/neg.c | 1 - ext/bcmath/libbcmath/src/num2long.c | 1 - ext/bcmath/libbcmath/src/raise.c | 1 - ext/bcmath/libbcmath/src/rmzero.c | 1 - ext/bcmath/libbcmath/src/sqrt.c | 1 - ext/bcmath/libbcmath/src/str2num.c | 1 - ext/bcmath/libbcmath/src/sub.c | 1 - ext/bcmath/libbcmath/src/zero.c | 1 - ext/calendar/dow.c | 1 - ext/com_dotnet/com_iterator.c | 1 - ext/com_dotnet/com_saproxy.c | 1 - ext/com_dotnet/com_typeinfo.c | 2 -- ext/com_dotnet/com_variant.c | 1 - ext/com_dotnet/com_wrapper.c | 2 -- ext/ctype/ctype.xml | 1 - ext/curl/tests/server.inc | 1 - ext/dba/CREDITS | 2 +- ext/dba/README | 2 +- ext/dba/tests/dba_handler.inc | 2 +- ext/dom/examples/relaxNG.php | 2 +- ext/dom/examples/relaxNG.xml | 2 +- ext/dom/examples/shipping.php | 2 +- ext/dom/examples/shipping.xml | 2 +- ext/dom/tests/bug67081_0.xml | 1 - ext/dom/tests/bug67081_1.xml | 1 - ext/dom/tests/bug67081_2.xml | 1 - ext/dom/tests/dom.xml | 2 +- ext/dom/tests/nsdoc.xml | 2 +- ext/dom/tests/skipif.inc | 2 +- ext/enchant/php_enchant.h | 1 - ext/exif/config.w32 | 2 +- ext/exif/example.php | 2 +- ext/exif/test.php | 2 +- ext/exif/test.txt | 2 +- ext/ext_skel_win32.php | 1 - ext/fileinfo/Makefile.frag | 1 - ext/filter/docs/filter.txt | 1 - ext/filter/docs/input_get_args.php | 1 - ext/gd/gd_compat.c | 1 - ext/gettext/gettext.c | 1 - ext/hash/config.w32 | 1 - ext/hash/hash.c | 1 - ext/iconv/config.w32 | 1 - ext/iconv/tests/test.inc | 2 +- ext/imap/IMAP_Win32_HOWTO.txt | 2 -- ext/imap/tests/README | 5 ----- ext/imap/tests/clean.inc | 2 +- ext/intl/common/common_date.cpp | 1 - ext/intl/common/common_date.h | 1 - ext/intl/dateformat/dateformat_attrcpp.cpp | 1 - ext/intl/dateformat/dateformat_attrcpp.h | 1 - ext/intl/dateformat/dateformat_format.c | 1 - ext/intl/dateformat/dateformat_helpers.h | 1 - ext/intl/dateformat/dateformat_parse.c | 1 - ext/intl/doc/Tutorial.txt | 1 - ext/intl/doc/grapheme_api.php | 2 -- ext/intl/doc/normalizer_api.php | 2 -- ext/intl/grapheme/grapheme_string.c | 1 - ext/intl/grapheme/grapheme_util.c | 1 - ext/intl/tests/resourcebundle.build | 2 +- ext/intl/tests/resourcebundle.inc | 1 - ext/intl/uchar/uchar.c | 1 - ext/json/Makefile.frag.w32 | 1 - ext/json/config.w32 | 1 - ext/json/json_scanner.re | 1 - ext/json/php_json_parser.h | 1 - ext/json/php_json_scanner.h | 1 - ext/ldap/config.w32 | 1 - ext/mbstring/README | 2 -- ext/mbstring/README.libmbfl | 2 -- ext/mbstring/README_PHP3-i18n-ja | 1 - ext/mbstring/libmbfl/DISCLAIMER | 1 - ext/mbstring/libmbfl/INSTALL | 2 -- ext/mbstring/libmbfl/NEWS | 1 - ext/mbstring/libmbfl/filters/emoji2uni.h | 1 - ext/mbstring/libmbfl/filters/html_entities.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_7bit.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_ascii.h | 2 -- ext/mbstring/libmbfl/filters/mbfilter_base64.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_big5.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_byte2.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_byte4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1251.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1251.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_cp1252.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1254.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_cp51932.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp850.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp866.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp932.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_gb18030.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_jis.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_qprint.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_sjis.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c | 2 -- .../libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_ucs2.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_ucs4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_uhc.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf16.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_utf32.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_utf7.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_uuencode.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_uuencode.h | 1 - ext/mbstring/libmbfl/filters/sjis_mac2uni.h | 2 -- ext/mbstring/libmbfl/filters/unicode_prop.h | 1 - ext/mbstring/libmbfl/filters/unicode_table_jis2004.h | 1 - ext/mbstring/libmbfl/filters/unicode_table_koi8u.h | 1 - ext/mbstring/libmbfl/mbfl/mbfilter_pass.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_allocators.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_convert.c | 2 -- ext/mbstring/libmbfl/mbfl/mbfl_language.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h | 1 - ext/mbstring/libmbfl/mbfl/mbfl_string.c | 2 -- ext/mbstring/libmbfl/nls/nls_de.c | 1 - ext/mbstring/libmbfl/nls/nls_en.c | 1 - ext/mbstring/libmbfl/nls/nls_kr.c | 1 - ext/mbstring/libmbfl/nls/nls_neutral.c | 1 - ext/mbstring/libmbfl/nls/nls_tr.c | 1 - ext/mbstring/libmbfl/nls/nls_uni.c | 1 - ext/mbstring/libmbfl/nls/nls_zh.c | 1 - .../tests/conv_encoding.tests/cp51932_cp50220raw.exp | 1 - ext/mbstring/mb_gpc.c | 1 - ext/mbstring/php_mbregex.h | 1 - ext/mbstring/php_unicode.h | 3 --- ext/mbstring/ucgendat/OPENLDAP_LICENSE | 2 +- ext/mbstring/ucgendat/README | 3 --- ext/mysqli/mysqli_fe.h | 1 - ext/mysqli/mysqli_libmysql.h | 1 - ext/mysqli/tests/clean_table.inc | 2 +- ext/mysqli/tests/reflection_tools.inc | 2 +- ext/mysqli/tests/skipif.inc | 2 +- ext/mysqli/tests/skipifemb.inc | 2 +- ext/mysqli/tests/skipifnotemb.inc | 2 +- ext/odbc/tests/config.inc | 1 - ext/opcache/config.w32 | 1 - ext/opcache/tests/php_cli_server.inc | 1 - ext/openssl/config.w32 | 2 -- ext/pcntl/README | 5 ----- ext/pcre/config.w32 | 1 - ext/pcre/config0.m4 | 1 - ext/pdo/CREDITS | 1 - ext/pdo/Makefile.frag | 1 - ext/pdo/Makefile.frag.w32 | 2 -- ext/pdo/README | 2 -- ext/pdo/config.m4 | 1 - ext/pdo/pdo_sqlstate.c | 1 - ext/pdo_dblib/config.w32 | 1 - ext/pdo_mysql/CREDITS | 1 - ext/pdo_mysql/tests/table.inc | 2 +- ext/pdo_oci/config.m4 | 1 - ext/pdo_odbc/EXPERIMENTAL | 2 -- ext/pdo_odbc/config.w32 | 2 -- ext/pdo_sqlite/php_pdo_sqlite.h | 1 - ext/pgsql/README | 1 - ext/pgsql/config.m4 | 2 -- ext/pgsql/tests/nonblocking.inc | 1 - ext/phar/Makefile.frag | 1 - ext/phar/Makefile.frag.w32 | 2 -- ext/phar/func_interceptors.c | 1 - ext/phar/gdbhelp | 2 +- ext/phar/phar/directorygraphiterator.inc | 2 +- ext/phar/phar/directorytreeiterator.inc | 2 +- ext/phar/phar/invertedregexiterator.inc | 2 +- ext/phar/phar/phar.inc | 2 +- ext/phar/phar/phar.php | 2 +- ext/phar/tests/cache_list/files/frontcontroller13.phar.inc | 2 +- ext/phar/tests/cache_list/files/nophar.phar.inc | 2 +- ext/phar/tests/cache_list/files/phar_oo_test.inc | 2 +- ext/phar/tests/cache_list/files/phar_test.inc | 2 +- ext/phar/tests/files/frontcontroller13.phar.inc | 2 +- ext/phar/tests/files/nophar.phar.inc | 2 +- ext/phar/tests/files/phar_oo_test.inc | 2 +- ext/phar/tests/files/stuboflength1041.phar.inc | 2 +- ext/phar/tests/tar/files/corrupt_tarmaker.php.inc | 2 +- ext/phar/tests/tar/files/make.dangerous.tar.php.inc | 2 +- ext/phar/tests/tar/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/tar/files/tarmaker.php.inc | 2 +- ext/phar/tests/zip/files/corrupt_zipmaker.php.inc | 2 +- ext/phar/tests/zip/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/zip/files/zipmaker.php.inc | 2 +- ext/pspell/README | 2 +- ext/pspell/config.w32 | 1 - ext/readline/config.w32 | 1 - ext/readline/php_readline.h | 1 - ext/readline/readline_cli.h | 2 -- ext/reflection/tests/included4.inc | 2 +- ext/session/tests/save_handler.inc | 1 - ext/shmop/README | 2 -- ext/simplexml/tests/000.xml | 2 +- ext/simplexml/tests/bug24392.xml | 2 +- ext/simplexml/tests/sxe.xml | 2 +- ext/simplexml/tests/sxe私はガラスを食べられます.xml | 2 +- ext/skeleton/CREDITS | 2 +- ext/snmp/config.w32 | 1 - ext/snmp/tests/skipif.inc | 1 - ext/soap/interop/test.utility.php | 2 +- ext/soap/php_sdl.c | 1 - ext/soap/tests/interop/Round2/Base/round2_base.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_doclit.inc | 2 +- .../interop/Round3/GroupD/round3_groupD_doclitparams.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_emptysa.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import1.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import2.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import3.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc | 2 +- .../tests/interop/Round3/GroupE/round3_groupE_list.inc | 2 +- ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc | 2 +- .../tests/interop/Round3/GroupF/round3_groupF_headers.inc | 2 +- ext/sockets/config.w32 | 1 - ext/sockets/php_sockets.h | 1 - ext/sodium/README.md | 1 - ext/spl/examples/autoload.inc | 2 +- ext/spl/examples/cachingrecursiveiterator.inc | 2 +- ext/spl/examples/callbackfilteriterator.inc | 2 +- ext/spl/examples/class_tree.php | 2 +- ext/spl/examples/dba_array.php | 2 +- ext/spl/examples/dba_dump.php | 2 +- ext/spl/examples/dbareader.inc | 2 +- ext/spl/examples/directorygraphiterator.inc | 2 +- ext/spl/examples/directorytree.inc | 2 +- ext/spl/examples/directorytree.php | 2 +- ext/spl/examples/directorytreeiterator.inc | 2 +- ext/spl/examples/findfile.inc | 2 +- ext/spl/examples/findfile.php | 2 +- ext/spl/examples/findregex.php | 2 +- ext/spl/examples/ini_groups.php | 2 +- ext/spl/examples/inigroups.inc | 2 +- ext/spl/examples/keyfilter.inc | 2 +- ext/spl/examples/nocvsdir.php | 2 +- ext/spl/examples/phar_from_dir.php | 2 +- ext/spl/examples/regexfindfile.inc | 2 +- ext/spl/examples/searchiterator.inc | 2 +- ext/spl/examples/tests/examples.inc | 2 +- ext/spl/internal/emptyiterator.inc | 2 +- ext/spl/internal/filteriterator.inc | 2 +- ext/spl/internal/infiniteiterator.inc | 2 +- ext/spl/internal/limititerator.inc | 2 +- ext/spl/internal/norewinditerator.inc | 2 +- ext/spl/internal/outeriterator.inc | 2 +- ext/spl/internal/parentiterator.inc | 2 +- ext/spl/internal/recursivearrayiterator.inc | 2 +- ext/spl/internal/recursivecachingiterator.inc | 2 +- ext/spl/internal/recursivefilteriterator.inc | 2 +- ext/spl/internal/recursiveiterator.inc | 2 +- ext/spl/internal/recursiveiteratoriterator.inc | 2 +- ext/spl/internal/recursiveregexiterator.inc | 2 +- ext/spl/internal/recursivetreeiterator.inc | 2 +- ext/spl/internal/seekableiterator.inc | 2 +- ext/spl/spl_heap.c | 1 - ext/spl/tests/testclass.class.inc | 2 +- ext/spl/tests/testclass.inc | 2 +- ext/spl/tests/testclass.php.inc | 2 +- ext/standard/Makefile.frag | 1 - ext/standard/Makefile.frag.w32 | 2 -- ext/standard/assert.c | 1 - ext/standard/config.w32 | 1 - ext/standard/cyr_convert.h | 3 --- ext/standard/file.h | 1 - ext/standard/html_tables/ents_html401.txt | 2 +- ext/standard/html_tables/ents_html5.txt | 2 +- ext/standard/html_tables/ents_xhtml.txt | 2 +- ext/standard/http.c | 1 - ext/standard/info.h | 1 - ext/standard/mt_rand.c | 1 - ext/standard/php_crypt_r.c | 1 - ext/standard/php_http.h | 1 - ext/standard/php_mt_rand.h | 1 - ext/standard/php_smart_string.h | 1 - ext/standard/php_smart_string_public.h | 1 - ext/standard/proc_open.h | 1 - ext/standard/streamsfuncs.c | 1 - ext/standard/streamsfuncs.h | 1 - ext/standard/tests/array/compare_function.inc | 2 +- ext/standard/tests/class_object/AutoInterface.inc | 2 +- ext/standard/tests/class_object/AutoLoaded.inc | 2 +- ext/standard/tests/class_object/AutoTest.inc | 2 +- ext/standard/tests/class_object/AutoTrait.inc | 2 +- ext/standard/tests/file/fopen_include_path.inc | 2 +- ext/standard/tests/file/windows_mb_path/util.inc | 1 - ext/standard/tests/file/windows_mb_path/util_utf8.inc | 1 - ext/standard/tests/filters/filter_errors.inc | 1 - ext/standard/tests/general_functions/proc_open_pipes.inc | 1 - ext/standard/tests/math/allowed_rounding_error.inc | 2 +- ext/standard/tests/misc/browscap_lite_2016_12_06.ini | 1 - ext/standard/tests/streams/bug64433_srv.inc | 2 +- ext/sysvshm/config.w32 | 2 +- ext/tidy/README | 1 - ext/tidy/config.w32 | 1 - ext/tidy/examples/dumpit5.php | 2 +- ext/tokenizer/config.w32 | 2 -- ext/tokenizer/tokenizer_data.c | 1 - ext/wddx/config.w32 | 2 -- ext/xmlreader/config.w32 | 1 - ext/xmlreader/examples/relaxNG.xml | 2 +- ext/xmlreader/examples/xmlreader_relaxNG.php | 2 +- ext/xmlreader/examples/xmlreader_validatedtd.php | 2 +- ext/xmlreader/tests/XMLReaderBad_bug71805.xml | 2 +- ext/xmlreader/tests/XMLReaderGood_bug71805.xml | 2 +- ext/xmlrpc/config.w32 | 1 - ext/xmlrpc/libxmlrpc/README | 5 ----- ext/xmlrpc/libxmlrpc/base64.h | 1 - ext/xmlrpc/libxmlrpc/encodings.c | 1 - ext/xmlrpc/libxmlrpc/system_methods.c | 3 --- ext/xmlrpc/libxmlrpc/system_methods_private.h | 4 ---- ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c | 1 - ext/xmlrpc/libxmlrpc/xml_to_soap.c | 1 - ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c | 1 - ext/xmlrpc/libxmlrpc/xmlrpc.h | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection.c | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h | 4 ---- ext/xmlrpc/libxmlrpc/xmlrpc_private.h | 1 - ext/xmlrpc/xmlrpc-epi-php.c | 1 - ext/xmlwriter/config.w32 | 1 - ext/xmlwriter/examples/xmlwriter_mem.php | 1 - ext/xmlwriter/examples/xmlwriter_mem_ns.php | 1 - ext/xsl/tests/53965/collection.xml | 2 +- ext/xsl/tests/area_name.xml | 3 --- ext/xsl/tests/exslt.xml | 1 - ext/zend_test/config.w32 | 1 - ext/zend_test/test.c | 1 - ext/zip/examples/addglob.php | 1 - ext/zip/examples/addpattern.php | 1 - ext/zip/examples/encryption.php | 1 - ext/zip/examples/fopen.php | 2 -- ext/zip/examples/get_set_comments.php | 1 - ext/zip/examples/im.php | 1 - ext/zip/tests/bug38943.inc | 1 - ext/zlib/config.w32 | 2 -- ext/zlib/tests/data.inc | 3 +-- ext/zlib/tests/func.inc | 1 - ext/zlib/tests/gzopen_include_path.inc | 2 +- ext/zlib/tests/reading_include_path.inc | 2 +- ext/zlib/zlib_win32_howto.txt | 2 -- footer | 1 - genfiles | 1 - main/streams/php_streams_int.h | 1 - main/streams/userspace.c | 2 -- pear/Makefile.frag | 1 - pear/fetch.php | 2 -- sapi/apache2handler/README | 1 - sapi/apache2handler/config.w32 | 1 - sapi/cgi/Makefile.frag | 1 - sapi/cli/Makefile.frag | 1 - sapi/cli/config.w32 | 1 - sapi/cli/tests/php_cli_server.inc | 1 - sapi/embed/config.m4 | 1 - sapi/fpm/fpm/fpm.c | 2 -- sapi/fpm/fpm/fpm.h | 1 - sapi/fpm/fpm/fpm_arrays.h | 1 - sapi/fpm/fpm/fpm_atomic.h | 2 -- sapi/fpm/fpm/fpm_children.c | 2 -- sapi/fpm/fpm/fpm_children.h | 1 - sapi/fpm/fpm/fpm_cleanup.c | 2 -- sapi/fpm/fpm/fpm_cleanup.h | 2 -- sapi/fpm/fpm/fpm_clock.c | 1 - sapi/fpm/fpm/fpm_clock.h | 1 - sapi/fpm/fpm/fpm_conf.c | 1 - sapi/fpm/fpm/fpm_conf.h | 2 -- sapi/fpm/fpm/fpm_config.h | 1 - sapi/fpm/fpm/fpm_env.c | 2 -- sapi/fpm/fpm/fpm_env.h | 2 -- sapi/fpm/fpm/fpm_events.c | 2 -- sapi/fpm/fpm/fpm_events.h | 1 - sapi/fpm/fpm/fpm_log.c | 1 - sapi/fpm/fpm/fpm_log.h | 1 - sapi/fpm/fpm/fpm_php.c | 2 -- sapi/fpm/fpm/fpm_php.h | 2 -- sapi/fpm/fpm/fpm_php_trace.c | 2 -- sapi/fpm/fpm/fpm_php_trace.h | 2 -- sapi/fpm/fpm/fpm_process_ctl.c | 2 -- sapi/fpm/fpm/fpm_process_ctl.h | 2 -- sapi/fpm/fpm/fpm_request.c | 1 - sapi/fpm/fpm/fpm_request.h | 1 - sapi/fpm/fpm/fpm_scoreboard.c | 2 -- sapi/fpm/fpm/fpm_scoreboard.h | 1 - sapi/fpm/fpm/fpm_shm.c | 1 - sapi/fpm/fpm/fpm_shm.h | 2 -- sapi/fpm/fpm/fpm_signals.c | 2 -- sapi/fpm/fpm/fpm_signals.h | 1 - sapi/fpm/fpm/fpm_sockets.c | 1 - sapi/fpm/fpm/fpm_sockets.h | 1 - sapi/fpm/fpm/fpm_status.c | 2 -- sapi/fpm/fpm/fpm_status.h | 1 - sapi/fpm/fpm/fpm_stdio.c | 2 -- sapi/fpm/fpm/fpm_stdio.h | 2 -- sapi/fpm/fpm/fpm_str.h | 1 - sapi/fpm/fpm/fpm_systemd.c | 1 - sapi/fpm/fpm/fpm_systemd.h | 1 - sapi/fpm/fpm/fpm_trace.c | 3 --- sapi/fpm/fpm/fpm_trace.h | 2 -- sapi/fpm/fpm/fpm_trace_mach.c | 3 --- sapi/fpm/fpm/fpm_trace_pread.c | 2 -- sapi/fpm/fpm/fpm_trace_ptrace.c | 2 -- sapi/fpm/fpm/fpm_unix.c | 2 -- sapi/fpm/fpm/fpm_unix.h | 2 -- sapi/fpm/fpm/fpm_worker_pool.c | 1 - sapi/fpm/fpm/fpm_worker_pool.h | 2 -- sapi/fpm/fpm/zlog.c | 1 - sapi/fpm/fpm/zlog.h | 1 - sapi/fpm/php-fpm.service.in | 1 - sapi/fpm/tests/response.inc | 2 +- sapi/fpm/tests/skipif.inc | 2 +- sapi/fpm/tests/status.inc | 2 +- sapi/fpm/tests/tester.inc | 2 +- sapi/litespeed/README.md | 4 ---- sapi/litespeed/lsapi_main.c | 2 -- sapi/litespeed/lsapidef.h | 1 - sapi/litespeed/lsapilib.c | 2 -- sapi/litespeed/lsapilib.h | 7 ------- sapi/litespeed/lscriu.c | 1 - sapi/litespeed/lscriu.h | 2 +- sapi/phpdbg/Makefile.frag | 1 - sapi/phpdbg/config.w32 | 1 - sapi/phpdbg/phpdbg_eol.h | 1 - sapi/phpdbg/phpdbg_io.c | 1 - sapi/phpdbg/phpdbg_io.h | 1 - sapi/phpdbg/phpdbg_sigio_win32.c | 1 - sapi/phpdbg/phpdbg_sigsafe.c | 1 - scripts/Makefile.frag | 1 - scripts/dev/find_tested.php | 1 - scripts/dev/gen_verify_stub | 1 - scripts/dev/generate-phpt/src/codeSnippets/array.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/boolean.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/commentEnd.txt | 2 +- .../dev/generate-phpt/src/codeSnippets/commentStart.txt | 2 +- .../generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/float.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/int.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/loopClose.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/loopStart.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/object.txt | 2 +- scripts/dev/generate-phpt/src/codeSnippets/string.txt | 2 +- scripts/dev/generate-phpt/src/gtAutoload.php | 2 +- scripts/dev/generate-phpt/src/gtClassMap.php | 2 +- scripts/dev/generate-phpt/src/gtCodeSnippet.php | 2 +- scripts/dev/generate-phpt/src/gtFunction.php | 2 +- scripts/dev/generate-phpt/src/gtMethod.php | 2 +- scripts/dev/generate-phpt/src/gtTestCaseWriter.php | 2 +- scripts/dev/generate-phpt/src/gtText.php | 2 +- .../src/setup/exceptions/gtMissingOptionsException.php | 2 +- .../src/setup/exceptions/gtUnknownSectionException.php | 2 +- .../dev/generate-phpt/src/setup/gtCommandLineOptions.php | 2 +- scripts/dev/generate-phpt/src/setup/gtOptionalSections.php | 2 +- scripts/dev/generate-phpt/src/setup/gtPreCondition.php | 2 +- scripts/dev/generate-phpt/src/setup/gtPreConditionList.php | 2 +- .../src/setup/preconditions/gtIfClassHasMethod.php | 2 +- .../setup/preconditions/gtIsSpecifiedFunctionOrMethod.php | 2 +- .../src/setup/preconditions/gtIsSpecifiedTestType.php | 2 +- .../src/setup/preconditions/gtIsValidClass.php | 2 +- .../src/setup/preconditions/gtIsValidFunction.php | 2 +- scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php | 2 +- .../generate-phpt/src/testcase/gtBasicTestCaseFunction.php | 2 +- .../generate-phpt/src/testcase/gtBasicTestCaseMethod.php | 2 +- scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php | 2 +- .../generate-phpt/src/testcase/gtErrorTestCaseFunction.php | 2 +- .../generate-phpt/src/testcase/gtErrorTestCaseMethod.php | 2 +- .../generate-phpt/src/testcase/gtVariationContainer.php | 2 +- .../src/testcase/gtVariationContainerFunction.php | 2 +- .../src/testcase/gtVariationContainerMethod.php | 2 +- .../dev/generate-phpt/src/testcase/gtVariationTestCase.php | 3 +-- .../src/testcase/gtVariationTestCaseFunction.php | 2 +- .../src/testcase/gtVariationTestCaseMethod.php | 2 +- .../src/texts/functionOrMethodNotSpecified.txt | 2 -- scripts/dev/generate-phpt/src/texts/methodNotSpecified.txt | 2 -- .../dev/generate-phpt/src/texts/testTypeNotSpecified.txt | 2 -- scripts/dev/generate-phpt/src/texts/unknownClass.txt | 2 -- scripts/dev/generate-phpt/src/texts/unknownFunction.txt | 2 -- scripts/dev/generate-phpt/src/texts/unknownMethod.txt | 2 -- .../generate-phpt/tests/gtBasicTestCaseFunctionTest.php | 2 +- .../dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php | 2 +- .../dev/generate-phpt/tests/gtCommandLineOptionsTest.php | 2 +- .../generate-phpt/tests/gtErrorTestCaseFunctionTest.php | 2 +- .../dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtFunctionTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIfClassHasMethodTest.php | 2 +- .../tests/gtIsSpecifiedFunctionOrMethodTest.php | 2 +- .../dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIsValidClassTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php | 2 +- scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtMethodTest.php | 2 +- scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php | 2 +- .../tests/gtVariationTestCaseFunctionTest.php | 2 +- .../generate-phpt/tests/gtVariationTestCaseMethodTest.php | 2 +- server-tests-config.php | 2 +- tests/basic/timeout_config.inc | 1 - tests/lang/bug73172.inc | 1 - tests/quicktester.inc | 1 - tests/security/open_basedir.inc | 1 - travis/ext/pdo_pgsql/setup.sh | 2 +- travis/ext/pgsql/setup.sh | 2 +- win32/build/Makefile | 1 - win32/build/Makefile.phpize | 1 - win32/build/buildconf.js | 1 - win32/build/config.w32 | 1 - win32/build/config.w32.phpize.in | 1 - win32/build/configure.tail | 1 - win32/build/confutils.js | 1 - win32/build/phpize.bat | 1 - win32/build/wsyslog.mc | 1 - win32/cp_enc_map_gen.c | 1 - win32/param.h | 1 - 578 files changed, 195 insertions(+), 746 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3e0efe8b67e..295eb983e3b 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 2e45e0a44ff..8fea9202f62 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 cbea640966d..7c65cfab3c7 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,4 +1,3 @@ - # # Zend # diff --git a/Makefile.gcov b/Makefile.gcov index b290d777d8c..671fedab40a 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -1,4 +1,3 @@ - # # LCOV # diff --git a/NEWS b/NEWS index 034976bff94..2c30d47674e 100644 --- a/NEWS +++ b/NEWS @@ -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 7ec3f8e194a..b4ba71323d4 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 b2536d05bc3..0f0bc5d0b60 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 df6a9f514e8..4a1a0230120 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 0baf8086042..a94fed0c255 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 88a6e4c9858..c263b871508 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 bc113a03408..e46d0e4210f 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 - diff --git a/README.md b/README.md index 6080dc4adf8..64346cb915c 100644 --- a/README.md +++ b/README.md @@ -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 fcf97fd352e..f886570c773 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 e7d3f3b9763..cfbd1691276 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 ac3eb060185..3f598849bd4 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 2d613f7d615..d50e9e57468 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 5f7f25df677..fcf3495e306 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 bf5f57cffc6..da29b49b174 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 fe8dee6f767..b2e0a2958c2 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 fc03349f7e0..a8b97e691e1 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 8511414b82c..63d1c0d0da4 100755 --- a/Zend/tests/methods-on-non-objects-nested.inc +++ b/Zend/tests/methods-on-non-objects-nested.inc @@ -1,4 +1,4 @@ d = 4; } }; $d = new d; ?> - diff --git a/Zend/tests/return_types/classes.php.inc b/Zend/tests/return_types/classes.php.inc index e4b691e3537..34abd8490a4 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 49fe8e49a0d..e1eed23a4cf 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 8eda5a48b04..2bbfc1fa92c 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 36e8fbdd4e8..0beee511ee1 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 ede3fd2eb4d..e39de73d623 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 eb61bece665..6d4c5fa408f 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 60eb6dc164a..8d0d8ebf1f9 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 8396d73e8c6..1742bdf01d4 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 e2bc6ac89d9..4a9c0faee72 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 27a4bcb2d1b..698d80a823f 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 982db9dc405..f2d831cf652 100644 --- a/ext/bcmath/libbcmath/AUTHORS +++ b/ext/bcmath/libbcmath/AUTHORS @@ -1,3 +1 @@ Phil Nelson wrote bcmath library. - - diff --git a/ext/bcmath/libbcmath/COPYING.LIB b/ext/bcmath/libbcmath/COPYING.LIB index c4792dd27a3..aa4f4aca85c 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 b8d459a2bbf..eea6b016e2b 100644 --- a/ext/bcmath/libbcmath/ChangeLog +++ b/ext/bcmath/libbcmath/ChangeLog @@ -7,4 +7,3 @@ Wed Jun 7 09:39:02 2000 Phil Nelson 2000-05-21 Phil Nelson * Initial setup of bcmath library., calling it version 0.1. - diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 1b06b301ba1..423600ac76f 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 e5be8201b31..066be6df50c 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 4d301dcacf2..74ee5ddaa89 100644 --- a/ext/bcmath/libbcmath/acconfig.h +++ b/ext/bcmath/libbcmath/acconfig.h @@ -6,4 +6,3 @@ /* Define to `size_t' if and don't define. */ #undef ptrdiff_t - diff --git a/ext/bcmath/libbcmath/aclocal.m4 b/ext/bcmath/libbcmath/aclocal.m4 index e60c9eb55c7..71ebc0fa84c 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 21cfb9255f9..d9572c474dd 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 0b74129785e..7b766e09e8c 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 3da89e949f2..2e5333136e1 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 ade5b5969a0..150f27c53c7 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 6217ef1af33..cb7d04e0714 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 df5de299190..b326ea12501 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 08c2f8a2a2d..848a4cc8506 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 cef0fdbf1ba..991c294e990 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 a8965f6040e..79a6e19075b 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 1f2f0708ccf..933e501108b 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 619a59bb05c..65081dbef6c 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 be84986d236..81e82a6fac9 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 c625d4e5264..bf61814a335 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 1b81601b201..93cc26d12d7 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 265d75b5fba..a7c4d732a6b 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 62544de80ec..f38d341570f 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 b63f1bc90ac..2278b0f14f5 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 ffb54975468..d732dddfcdc 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 44f0490ed1f..0e055183a48 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 03db8fd45de..fda6cf33848 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 4fff1341786..29ae28efc21 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 7302871bcff..a0fa3c07491 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 a746d61837a..a3af63120f9 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 347a4958315..f21af9b503e 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 312c195e05d..ac5934d7848 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 124e0f898cc..b7c1570195e 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 370b3ea2710..e7748197eac 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 3d23fb914c8..ec0610b71f6 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 9792f008299..51f27050ca8 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 d265fd988e1..219cf8aa721 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 6b0cac12250..5d9f31fee09 100644 --- a/ext/dom/examples/relaxNG.xml +++ b/ext/dom/examples/relaxNG.xml @@ -1 +1 @@ -hello \ No newline at end of file +hello diff --git a/ext/dom/examples/shipping.php b/ext/dom/examples/shipping.php index 5205fd2014c..cc7a1b896ed 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 dc8a09e3017..1faeaf9f4ed 100644 --- a/ext/dom/examples/shipping.xml +++ b/ext/dom/examples/shipping.xml @@ -18,4 +18,4 @@ 9.90 - \ No newline at end of file + diff --git a/ext/dom/tests/bug67081_0.xml b/ext/dom/tests/bug67081_0.xml index 604eea57b16..160e9d31c3d 100644 --- a/ext/dom/tests/bug67081_0.xml +++ b/ext/dom/tests/bug67081_0.xml @@ -3,4 +3,3 @@ ]> - diff --git a/ext/dom/tests/bug67081_1.xml b/ext/dom/tests/bug67081_1.xml index 7ae542e977d..f699805f648 100644 --- a/ext/dom/tests/bug67081_1.xml +++ b/ext/dom/tests/bug67081_1.xml @@ -4,4 +4,3 @@ ]> - diff --git a/ext/dom/tests/bug67081_2.xml b/ext/dom/tests/bug67081_2.xml index c10af0966ce..baa98702121 100644 --- a/ext/dom/tests/bug67081_2.xml +++ b/ext/dom/tests/bug67081_2.xml @@ -2,4 +2,3 @@ - diff --git a/ext/dom/tests/dom.xml b/ext/dom/tests/dom.xml index 09ac674e55d..c7bbc55413d 100644 --- a/ext/dom/tests/dom.xml +++ b/ext/dom/tests/dom.xml @@ -5,4 +5,4 @@ ]> - \ No newline at end of file + diff --git a/ext/dom/tests/nsdoc.xml b/ext/dom/tests/nsdoc.xml index 9503fd8c5b1..9153729d1a7 100644 --- a/ext/dom/tests/nsdoc.xml +++ b/ext/dom/tests/nsdoc.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ext/dom/tests/skipif.inc b/ext/dom/tests/skipif.inc index 08fd695d97e..16ab73febb0 100644 --- a/ext/dom/tests/skipif.inc +++ b/ext/dom/tests/skipif.inc @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h index 00fc8ea4a6d..20fd8ea26aa 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 ad000c42518..3777028b857 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 e34dc05f6d4..678500f67cd 100644 --- a/ext/exif/example.php +++ b/ext/exif/example.php @@ -20,4 +20,4 @@ foreach($exif as $key=>$section) { } ?> - \ No newline at end of file + diff --git a/ext/exif/test.php b/ext/exif/test.php index 907b9ea080a..35234706644 100644 --- a/ext/exif/test.php +++ b/ext/exif/test.php @@ -1,3 +1,3 @@ \ No newline at end of file +?> diff --git a/ext/exif/test.txt b/ext/exif/test.txt index 1c12b509e65..9fd705636b3 100644 --- a/ext/exif/test.txt +++ b/ext/exif/test.txt @@ -362,4 +362,4 @@ if (function_exists('exif_read_data')) { } ?> - \ No newline at end of file + diff --git a/ext/ext_skel_win32.php b/ext/ext_skel_win32.php index ba44ae60897..64be05c1f54 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 5af690a9b4c..ba84e9a9f55 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 a5d4bce41fc..a641b76ec63 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 b580524489e..de8daacab71 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 51020a3c71d..86ac23cc2c4 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 fa76f4c159d..834d6395529 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 e56b66fa2db..aa37c121a63 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 1214688fea6..f22fa56403f 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 3fd91038b0b..d34b47feaec 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 78f180462f7..68d2a3e10cc 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 88c46694866..901f2b8e181 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 0e554e94c05..99424b3995a 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 2557489ba15..4f381bf893b 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 bd2baee7765..4da00b0221f 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 d6b7c207193..6d15145516c 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 858cbf5d4da..fec8eb1a67f 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 c8e4e5b702c..ab699145405 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 2d1e78b512b..5e51796cad3 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 eb90c991691..a2a146b7d7e 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 bdf9a1e32ce..a9d9ec99542 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 316d81357c2..b4feb2ae153 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 91f4869166d..75ad7a04b58 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 a9bb566e679..21b02a9109f 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 fd032793901..028c7907c12 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 d81060b5a1f..3765ffe424a 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 560dc8fb450..273e4407b7a 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 2ec138bb7d3..a7727a3ec83 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 1add74b2b5c..d9f257dd681 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 eaf47e22be9..ee71c7a9976 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 d16e0686d3b..58c2c5b672a 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 3fda1df5ad7..cf45b90ea05 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 5378e50104d..d8af613878c 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 b707e230ebc..4fd5f217fd4 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 7713bdc42bb..24795121cd9 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 338aa79fcd0..c2db83436b2 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 de72aab440f..8f9ac620af5 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 ddb688d1c59..151d5ca52cd 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 Fixed mail() which was causing segmentation fault when header was null. - diff --git a/ext/mbstring/libmbfl/DISCLAIMER b/ext/mbstring/libmbfl/DISCLAIMER index 97fe77c33c0..21b7a91d55a 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 4a6bf169db8..3b691b8844a 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 82a763b6955..75ea1c5117f 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 adce0b75d48..198b2354d3b 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 6833fd81055..be2cf904435 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 ab1727146a8..43f82fc41c8 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 99b48153870..3c8aead9efc 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 adecdee888c..9e0dafd154b 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 122ff4c7780..f5ab8809ce8 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 7452c127fca..6fdcbda7c8d 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 7475e5424c8..239568a128c 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 2d47ac304ae..bc3befea81b 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 becae48c191..b76cc9f6806 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 0c5eba3dd51..ab2f8f11b13 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 78e79335e44..6f4711ab79c 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 75d249fbe8b..655c5583ed1 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 aae45380c84..58fd9f4d1f1 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 179873eb3a0..c5767ec8fc6 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 307f370d03c..f87a603a7da 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 4063a68208a..de7de7213c9 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 bf3ec25ee7a..093f026bdfd 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 3b13850882d..b3641239029 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 aeb94c388d7..1d7ee1ebf91 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 95aec45f4dd..26be59cab0d 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 bc780c99ee6..9b28556dee6 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 721c16292b0..8c732d74629 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 501bcb8d197..682d8401f30 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 fc6678ecb69..cf084399f8b 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 382d0c2294e..4688e679059 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 f6d1b21b554..dd34b532978 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 cbc8f77d879..480f890b2d0 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 03581ccf45c..ef7b7e645d9 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 50649ddeb6d..8e236b667d8 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 e1897069eb6..c04cfd87b4f 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 a04910eb78e..1c4979362c7 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 0bd4d5e1555..db10cc693f1 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 df89eb75bab..318eaeb3c0f 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 d8d4494a225..406370a3d3c 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 fad0f5c51e1..505f7dec8fd 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 97948d0ff61..1550937bbec 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 b3fbb4f94bf..892e4bda3d3 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 c141dc41024..1878f4d08f1 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 782e0dfaf93..ab4b3db9834 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 2087786c066..383d623d5d3 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 a856aa3d469..e8056ab99ac 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 265c577e5fd..c262dde9bfb 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 637e69074c8..b99c658e4de 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 32f174f6028..d11cf5a8aed 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 8906b8ff097..c662a0d8aae 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 2e1c696f8ad..b8a0e227785 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 3e008e80357..cb46fa51ef7 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 aa0883fff45..14b9fa48232 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 db0979c25de..76066420072 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 72c772b0725..ce56433316f 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 41e02bf3149..410ba64b6fa 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 b8cdfcaf792..15831011a33 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 c02d21f878d..9d4bd5fd6bc 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 7853d96ba44..c50caba29dd 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 bbb92b98e7f..6eaefbc2e39 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 327e2a1278f..01afcc1f2d9 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 2674e0c9b85..e59c685fe85 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 b19432f76a4..2efaae50a24 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 f52c94cf374..96353023cab 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 a73a0c80e50..54e4b3c2a4d 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 9ca2d591839..7ac3920f0d0 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 0e8a82f0e82..1f753d197fe 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 69f594350e8..c9c670373d4 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 b559e2dee30..f84cbe74ed2 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 0700e4f2c4e..7fa23d4f536 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 afff43af489..aba4be5b8c4 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 87a6a194c34..ab747472194 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 c7044ff293f..950a610e0db 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 6a0100105b0..cf76000cd9e 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 d9a49931eaf..1434481b34b 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 0e63ef11b76..740bcfd881e 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 96ee53bb084..c79961027cd 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 b180a342550..b325236dee9 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 c242cba1c3c..64412ab2802 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 6295703c0a3..05ad7571e44 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 7717bf89f98..c100231e4a2 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 e56780a4c12..8b4d52f489d 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 6759d8a1c22..a4ba66e15b4 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 716cc84416b..86e5fcb3796 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 c8338bfa24b..6648526ed05 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 a7581fb4806..5562aab84ba 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 254a4ccece7..ad143a42a46 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 d73d185bc4c..fa5fb9f0a34 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 dcc4cbb3bff..d9da63d0b70 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 cd3391a46d7..a05946289b6 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 ca781b7cd76..70ef14e5858 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 ade17d402a5..fd79e0472db 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 34313b2040c..ab1dfa1f2d2 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 02256887a1e..aeea1c45061 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 95298a90b2b..721b7f61916 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 5971cdb0dd6..a9899d230fd 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 d2b59744efc..495d03366bd 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 3e21fad7e4c..43f8d2c1520 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 da806b0f30f..dfba3982a4b 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 105c7da4d2c..5d6a8818a94 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 8f2debc9128..a5902635481 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 50435bc64b6..2f46eaf453a 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 0423cccd64f..eb11169bd93 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 c7bb9cc5ee4..54bf14f07d5 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 12a9e897e06..daa3d018f71 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 139597f9cb0..e69de29bb2d 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 cd1017f2e4e..e582db203e2 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 69f17a7bf08..a1c36cb97b4 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 26f7aad02d4..11f112dfc02 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 8201e88dba0..684da977d92 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 4cf7c09a513..c121c62413f 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 0e3713fc63b..2b7f0ffae60 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 c50b1dbc515..311681bd9b0 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 c0ec38e13e4..ca9e276d807 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 14ff89c56be..bd4150e3efb 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 5a658ddabce..34579678a77 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 9ed2e1a1bf5..2c681632fb7 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 aec87e6ab14..8f82f41f2aa 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 c28de0aa7a6..129a0c43bf8 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 f6f26c23f28..13538777a56 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 0bfef468530..df74c138805 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'] = 'setStub('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 9863e8da937..0691e4dc804 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 f82471d13b4..b1bb6d0e384 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 0bfef468530..df74c138805 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'] = 'setStub('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 45421568dee..3883d494c15 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 28ce8427f34..9d51a750dfe 100644 --- a/ext/phar/tests/files/stuboflength1041.phar.inc +++ b/ext/phar/tests/files/stuboflength1041.phar.inc @@ -18,4 +18,4 @@ $phar->setStub('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 52f5a235073..641dda56f59 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 413dd7bd1bd..895977bf2fb 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 0df7ee99335..5860bf84d31 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 9fbfe341c3c..c030895f2c6 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 cec8ef77939..4f4758bbb64 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 ad16fda6592..c9eebad7edc 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 58806289db4..9fc884c65b0 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 741a4bc8f0e..413163c0323 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 482c99cc045..9e21e6bb540 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 50c1d21ab4b..1d708ccc058 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 26d88068a9f..2e6aae072b2 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 88947251cd4..313fc5feca7 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 15ad29029f6..56b3505284b 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 1bb95b220e2..60088df08fb 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 b0f2785463f..86a22ba0fac 100755 --- a/ext/simplexml/tests/000.xml +++ b/ext/simplexml/tests/000.xml @@ -13,4 +13,4 @@ Here is some more - \ No newline at end of file + diff --git a/ext/simplexml/tests/bug24392.xml b/ext/simplexml/tests/bug24392.xml index d669f1df418..2cb5106eea6 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/"> http://slashdot.org/search.pl - \ No newline at end of file + diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 413be72087d..0a730ae8094 100755 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ext/simplexml/tests/sxe私はガラスを食べられます.xml b/ext/simplexml/tests/sxe私はガラスを食べられます.xml index 413be72087d..0a730ae8094 100644 --- a/ext/simplexml/tests/sxe私はガラスを食べられます.xml +++ b/ext/simplexml/tests/sxe私はガラスを食べられます.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ext/skeleton/CREDITS b/ext/skeleton/CREDITS index 58fc71019ae..407205f7439 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 0848d5701ec..c24eec0cb3a 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 72423251fda..d8ee31d0c49 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 5b1f699c9be..e581772bbb5 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 8564c654f09..695867d7e2d 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 48eaf40f896..b5d6ced74c6 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 a9da5653e37..727def1ee6b 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 b65da2782c3..8ecf366824b 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 ee38a121369..0b97f8bac9d 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 ecde53e1559..8981c0e6ba4 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 5957c374a1d..3eea780899c 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 3a3df9791bf..c96dcbb6438 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 e88df3312b9..8b4804db147 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 19a769c001f..7b918c0afbb 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 e90586efdb2..d2af69e4be5 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 b7e67b0f527..0940d1c3995 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 e6c4cfea689..5e87583c0ba 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 7914b97d893..998cd073462 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 104570a2412..64b575956b8 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 2ccd0d1be8b..0dc423199e4 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 4fa6b235c31..f0e060a0a7a 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 51757012ec8..4d49a52807c 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 fc021d5c01c..a5d2d7b1ca4 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 f217c345467..7930348f7c4 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 7ea8e762552..4c080729b2d 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 01de37e990c..095c5c29d51 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 3f0bb263e2a..65a4dd7a389 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 7bd9c2c597d..20a15c815fa 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 dc26d6cc22e..38759837f50 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 8454d9e3056..52a4e114ed3 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 02ab7924335..afafa8124df 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 60146cbffd0..7a850feddb0 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 288c0924b14..284f985943b 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 4c6c89bd70d..540fc68c9cf 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 cb2bb04a57d..d33f169c4b8 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 abc925ec432..21bb79a2d1d 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 6993268945c..d8e4362ab60 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 d75788e840d..23fcfc97772 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 d5dd7225360..395624b8de9 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 ff4963bc72c..451ae08fd27 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 feeba7db243..75025146598 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 ac80e795812..c7a05717a6f 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 e11e467a10e..27cb9c064f0 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 04d78271827..ffd728cf09d 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 00c41228723..78c96d1049c 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 8747a6116ec..6b61dbba028 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 f26d29da56a..c2684ae51c9 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 69a223444d9..e3c5605f832 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 2059b97c1c6..418fb0d9e13 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 3ae127ad94b..fcbbda70424 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 87d98da8852..2c0d9ef998b 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 6e6c023486d..a89fbd8577e 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 c22a92bf716..46110c9fb9e 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 42231043987..51cf6c415fa 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 dfcdc059952..a2312414eab 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 77286369818..83e5588c74b 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 e7e7ea0bd02..c2e460b95a8 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 f5fe7411fac..c5d6034423c 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 ceb24c877cd..0684d2098da 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 ceb24c877cd..0684d2098da 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 8b6e3e233ab..72d5eee4aaa 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 640e4840d34..9b0c57b4313 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 1f8a4eff787..569d6026651 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 deb96928636..c6f6e32888c 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 56861f149ae..8b9b737d66d 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 1252226d1ca..54df0936d3f 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 bd3ded9fdec..c0533b01340 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 005bebbe200..18fcc02f9cb 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 81800bcd2dc..90cebfd2745 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 711a3975d11..f73d4cac7eb 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 1c0e445dfac..d22521bb9fb 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 461373d76bb..44cb6d2bfc4 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 52dda933489..a3b348ca3da 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 4128863555c..445a93d613d 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 411f7e32795..fb641c2d327 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 0d6a1351594..63f8d9ec60d 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 255fbd94a18..272b9485151 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 857771a0aaa..7bc0a83b18a 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 86c07c3ac7c..26543829063 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 b34df344be4..ac9b800ec85 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 e5176802abb..4fa672e7675 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 f1e5b1f58fc..805d7f1f6f1 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 52e6671ddc1..2935b801e55 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 a0c8244265e..fb487fb0714 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 698e975ef71..c371d592710 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 5bc9b6ce3b2..e33dae49156 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 98cec87dc63..de4072a1aaf 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 8d7009f91cc..e0915649984 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 6d1a270c82e..8636fbe17f4 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 0d9894683a1..576118ffd63 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 71dbf9af4a5..9ba754b5829 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 8f911659778..b5a7432e2d8 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 e79a2fd6d6d..dcdb1bcbaaa 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 3a9a0d47df6..80fb28ee61f 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 0fb6c0f035a..b46a038fad9 100644 --- a/ext/tidy/README +++ b/ext/tidy/README @@ -1,4 +1,3 @@ - README FOR ext/tidy by John Coggeshall diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index 654c1590c98..44b2abeacc4 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 1cae9b7d9a8..571e0366fb1 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 dd3b89e7789..226ca8e234a 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 6b36ab0e39f..c9062ff4ff9 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 a34c36ec911..48b78d1aec1 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 cca068a95ce..7fb1f8494be 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 6b0cac12250..5d9f31fee09 100644 --- a/ext/xmlreader/examples/relaxNG.xml +++ b/ext/xmlreader/examples/relaxNG.xml @@ -1 +1 @@ -hello \ No newline at end of file +hello diff --git a/ext/xmlreader/examples/xmlreader_relaxNG.php b/ext/xmlreader/examples/xmlreader_relaxNG.php index e56739a2fb2..09f14be8cd6 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 520a61ee30d..b5508b61691 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 68ee25ddb88..0f90a69cf02 100644 --- a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml index 9a59e0c9782..7d8ef1fad32 100644 --- a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index 35fbf261811..49acc247f6b 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 323edfa6718..4835cd68e9f 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 6a0c8ef6fc8..f0272b43567 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 5777152ea87..477077f777e 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 ff5e651fd0d..31f4156a5d2 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 fa3fc279f2d..bea8779da92 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 63cc52d6b7b..0a391b8444d 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 64a9a6eaa56..cd0933fcbc4 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 309f0dce3d8..860cba3e36c 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 12b6c7a8ee4..c3b30cbea83 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 c554e73dc41..727d5636def 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 41a31c6f515..2f90fc0e3c2 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 5b231fe3446..1a5d9f79a97 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 e43f78ecfbf..7cda5c24be2 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 19df2ad6734..97e04eb2cac 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 2a95bfb8208..7bd8a4befa3 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 8f8eef9fa0a..61902c08f67 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 e4d013194e3..3ff61a38538 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 a3039cd1015..1c9dc175cd9 100644 --- a/ext/xsl/tests/53965/collection.xml +++ b/ext/xsl/tests/53965/collection.xml @@ -10,4 +10,4 @@ Jimi Hendrix 1997 - \ No newline at end of file + diff --git a/ext/xsl/tests/area_name.xml b/ext/xsl/tests/area_name.xml index 76cea58511e..fbe3b202124 100644 --- a/ext/xsl/tests/area_name.xml +++ b/ext/xsl/tests/area_name.xml @@ -7,6 +7,3 @@ m."Avtovo" - - - diff --git a/ext/xsl/tests/exslt.xml b/ext/xsl/tests/exslt.xml index 562e08e8216..06110aabd49 100644 --- a/ext/xsl/tests/exslt.xml +++ b/ext/xsl/tests/exslt.xml @@ -12,4 +12,3 @@ - diff --git a/ext/zend_test/config.w32 b/ext/zend_test/config.w32 index 9b1574ef4e4..76a0f1ae5ba 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 1765efe7cba..0ad566a025d 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 790312b4d58..3c432f0be5f 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 a1a9b122914..41efaa5eb73 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 69888170a9b..9ef7dd84975 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 32357f3c08f..80de5d052a4 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 5bd302e6da4..bec4240246d 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 3721434054d..b664e91c2ba 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 a6f45e8294e..b439939e64d 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 820025aa7ff..668b95ad6d5 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 441199ff08a..bee4e51d9ad 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -1,4 +1,3 @@ - \ No newline at end of file +?> diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc index e431afedbf3..7556f81e6a5 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 7d6723a8150..add04f74de8 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 ee71bb9c423..abe80bf69c1 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 89bdb29f1eb..dffc32d9f13 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. - - diff --git a/footer b/footer index 64d3768113f..42a6cd7005e 100644 --- a/footer +++ b/footer @@ -1,4 +1,3 @@ - /* * Local variables: * tab-width: 4 diff --git a/genfiles b/genfiles index 516b3316fb0..a561c3d8f1c 100755 --- a/genfiles +++ b/genfiles @@ -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 9c05bff66d3..5d2fa9f3523 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 2609f02817e..c72c7765f00 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 bbe8ec35135..528683ba1b5 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 01d223392e4..56767b62cb7 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 d624141c9f0..15ef022d24e 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 8ea1305d4fc..20a801ff9e2 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 75c72bf8b71..79e2afec254 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 8f4f400401c..aa1d642b9cd 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 7d0e5954ff8..c510e231d1e 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 2a21ba35d06..ff4eef0e129 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 5be7af48f4d..dcdb4d68aa2 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 e43eb5a86d6..2bd890b224c 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 4916140e174..5ac3ea91066 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 02846b7c014..6975ab21af4 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 662dd4726d5..7b17df6bc1b 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 4ee316ba1b9..bda85ef5a86 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 9c79f234e8f..a488b544fd9 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 260ddb32e76..dbab8ed7861 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 4d7cf391cb7..71639afe94c 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 66751b81bb8..b03531ff24d 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 6aab959e16d..7f62d0055f7 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 b93cd15fe72..42ee60b36cc 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 a0434b694d9..2f11953367f 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 856414a9202..78768ed214e 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 73affab236b..05815771151 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 bf472368da3..24ff84b6f05 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 2b8e8cf13ad..3917a9658cb 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 416ec6e728a..7e2c925345c 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 02f88681420..cdfec8c5e04 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 d85d368da5f..e3121777f02 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 11a5e25f249..dc81b702cee 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 a2f2138d23f..d0577e22f37 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 26583881af5..7480bd76484 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 af5e456acbb..3d9c81e472e 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 ca5a6f2e405..f99ec241c74 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 86a6ef0dfbb..8888f738a08 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 3f82a7d4f75..a4ace853104 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 d9e831d1009..1328b5de4e3 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 b2ce46356f9..7a65fcbeb71 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 f58a28737df..abce616d769 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 7986056793c..9a58e9d0063 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 bcb60998144..c9bfb4ee72d 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 68cb15379b6..0df119be386 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 eb80faecfdb..759a4e316ca 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 36a66544d78..727e2eb1322 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 98b40ff206d..020bb50134f 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 42d7d7bae08..1d78ebf849a 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 c6c27cd031c..37b2eed8f9e 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 76e8b324df6..7abd5b43a22 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 d3d61e46be2..f5c45e1f6f5 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 65db5455a0e..90250ffe3c9 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 95d12c97f2f..31b6a3d27ae 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 3ee62177170..e978a7c7be4 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 eae7fe9bbfc..6fc24d544dd 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 b4211722077..94cfafe2139 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 3b85e6a3435..ee4e33469e6 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 6a6155740bd..2f1fb5618f0 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 838c61867c4..37d340bbc37 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 44f8df31115..1539c07ba29 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 a79559f9e6a..1e30fc09c32 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 a0022915cdc..90e155975e4 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 6b2bc908dc7..68179d283d7 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 4884dca856b..27ab6e4d140 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 c2bf752b935..31a16fb88dd 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 a4d533c1972..8a541c08655 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 9888ec1b83f..24285bf560c 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 25910a8e05e..eec65a41122 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 5965f130eb2..39005de5686 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 c3b6c83e597..70c03ad70f1 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 e744030de74..3f5b7ad14f8 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 1cfd45ebbf0..b3c5f9fd3a0 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 4db8ff562d9..f6c0cb02312 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 685892e7081..a93cdc345d2 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 1fd3f56176a..ff27c9cd943 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 6ceed3fb8bc..1db123cc6d2 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 cc0186ef79f..02fc9b880a1 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 091b1e831c8..65377e608a6 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 e69ca455f79..9aca03dff6a 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 afc31a906ec..8d6ee8278ea 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 150647aa7eb..1f26f7983b4 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 d0b69d9b41e..deda272da2f 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 b86ea05da2f..3ca0ad8d376 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 081d864c5c9..dab0d27d85e 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 d3f8bb21368..06be3af28e1 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 18521638d3d..21f252522a3 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 ac6dc4434d2..f326230e5d4 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 69a4af72c13..fa007aab9c4 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 53db40d30b2..024690e757e 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 d116022fb8a..1b588a47e17 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 e3466d5a1a4..df6cefe76bd 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 a9577812056..c3d034d07bc 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 75c2b6cd521..7afd16f5f98 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 cdd28ae4359..0b2cd7c3b00 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 ff30235f076..5c34318c214 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 8fd5eb20fdb..0a90360dea6 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 28ee61bfae7..0b9b16e4ef6 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 a1d42376da5..3b194276cc3 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 8c18c179eb2..b215923f2c6 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 1c346b83ce3..2a359082f33 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 dc6543201a7..0e02fa55727 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 b2752ad637b..922374ede79 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 dc8438c3b5f..2db2bb7b0cb 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 9438e0f2ea1..6b26a56c5ed 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 8cbd1650d4d..c0eb469550a 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 5bff5e01a0a..e3c2f35afb0 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 c4843240d70..b51482b00da 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 b1068e46004..f12ff8728a4 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 6c6de183456..e59c7a0be4a 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 294b41e9f2c..137325bf04b 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 88f9b36205c..286699cfb80 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 edd7a1cbae6..a16cf81e4da 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 f70af881ec0..b78c1530f71 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 ebc0a68f576..153efa52762 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 a39bab453ef..545612ddf1e 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 ed91c2ca3b5..a5be4f1a0ce 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 92560c86311..ff22dd3ee1f 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 c0fc9eb61f5..62acab3f376 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 d009d5038ae..74a2414f86b 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 82f955cf467..dbf9a665fde 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 fcba6d798c4..e966fff708d 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 fa1c8ca3f19..a0a96cfc74a 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 f445d9e7f4d..260cba4113e 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 b6a3aa473cd..8ac9300a497 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 0d24337b3b0..68f3a838954 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 e868b80795e..67d8533976c 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php @@ -1,4 +1,3 @@ - \ 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 45cbe2046cc..3545e5c2728 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 db923f078ac..51160f47f84 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 b497682cb7d..3c80875698c 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 1f11a3a1bac..5745d49aef1 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 e83ddbb5c23..054f5807a01 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 b0a47ca8b9c..4d56d95f20d 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 2e76978a529..fa2164a30a7 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 8cc9eaeda66..3f932a730cc 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 fa80c0766da..33a5cb65dfb 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 18768b62943..8a4a23fe50a 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 6d4d5861c31..ca87320224a 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 1bf32b46086..a034aeca4c5 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 c6399168be3..0146266a730 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 894a5515971..5c9dbfbb30f 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 5afcd950d46..f8b17680d41 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 b9f2410b5d5..4494415dea2 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 a60f77ef377..d86945e85cc 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 bc7cf9412d7..858e803e8c9 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 507ca232db5..2a18e50fc50 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 07a7038dccd..d0193c4fffb 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 0f1b349f4d5..4519b0e2176 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 430161ee1c2..8057d6655b6 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 541dbdf2ddb..4352e68abe7 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 83178b21e78..6d3a3ad5461 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 a074fcceeb3..b5c4d64f6ac 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 645a5e8e982..ca01ffe1cbf 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 71820809399..3bd9eeaa708 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 5e4a85ea2e2..760cbecc8bb 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 70cb1156843..ba60e74a510 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 d229f8497fd..d30f2f83848 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 6f16f72cc25..5f3cf67f921 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 ef13733edc9..108f47db250 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash echo ' ' >> "./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 68fa579b5f4..ed4ff3eed72 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 517db128bd1..37c449a059e 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 2fbbdad93cc..5cbc945d134 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 4f7a4634422..e90dae0b813 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 812d28faf5e..f43ebeb6a64 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 70625a43d42..d17d4ae67b6 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 b216659ebf9..371d586ef8a 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 794b9cb7106..a79885f0088 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 01d4d3a86bf..f326abf7d97 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 2010e0ca4cb..34861d148b3 100644 --- a/win32/cp_enc_map_gen.c +++ b/win32/cp_enc_map_gen.c @@ -1,4 +1,3 @@ - #include #include diff --git a/win32/param.h b/win32/param.h index 1601a3cc16b..552323c5b18 100644 --- a/win32/param.h +++ b/win32/param.h @@ -1,4 +1,3 @@ - /***************************************************************************** * * * sys/param.c * From 1c850bfcca97e0456a716a1889b5cf6c5e477cd8 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Oct 2018 12:55:24 +0200 Subject: [PATCH 3/3] 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-' ' characters plus a terminating '' 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 --- .appveyor.yml | 2 -- Makefile.frag | 1 - Makefile.gcov | 1 - README.EXT_SKEL | 1 - README.RELEASE_PROCESS | 1 - README.SELF-CONTAINED-EXTENSIONS | 1 - README.WIN32-BUILD-SYSTEM | 1 - README.md | 1 - TSRM/acinclude.m4 | 2 -- TSRM/config.w32 | 1 - UPGRADING | 1 - UPGRADING.INTERNALS | 1 - Zend/Makefile.am | 1 - Zend/buildconf | 1 - Zend/tests/bug40236.inc | 2 +- Zend/tests/methods-on-non-objects-nested.inc | 2 +- Zend/tests/nowdoc.inc | 1 - Zend/tests/return_types/classes.php.inc | 1 - Zend/zend_highlight.c | 1 - Zend/zend_vm_execute.skl | 1 - appveyor/build.bat | 1 - appveyor/build_task.bat | 1 - appveyor/test.bat | 1 - appveyor/test_task.bat | 1 - build/build2.mk | 1 - build/genif.sh | 2 -- buildconf.bat | 2 +- ext/bcmath/libbcmath/AUTHORS | 2 -- ext/bcmath/libbcmath/COPYING.LIB | 3 --- ext/bcmath/libbcmath/ChangeLog | 1 - ext/bcmath/libbcmath/FAQ | 1 - ext/bcmath/libbcmath/src/add.c | 1 - ext/bcmath/libbcmath/src/compare.c | 1 - ext/bcmath/libbcmath/src/div.c | 1 - ext/bcmath/libbcmath/src/divmod.c | 1 - ext/bcmath/libbcmath/src/doaddsub.c | 1 - ext/bcmath/libbcmath/src/int2num.c | 1 - ext/bcmath/libbcmath/src/nearzero.c | 1 - ext/bcmath/libbcmath/src/neg.c | 1 - ext/bcmath/libbcmath/src/num2long.c | 1 - ext/bcmath/libbcmath/src/raise.c | 1 - ext/bcmath/libbcmath/src/rmzero.c | 1 - ext/bcmath/libbcmath/src/sqrt.c | 1 - ext/bcmath/libbcmath/src/str2num.c | 1 - ext/bcmath/libbcmath/src/sub.c | 1 - ext/bcmath/libbcmath/src/zero.c | 1 - ext/calendar/dow.c | 1 - ext/com_dotnet/com_iterator.c | 1 - ext/com_dotnet/com_saproxy.c | 1 - ext/com_dotnet/com_typeinfo.c | 2 -- ext/com_dotnet/com_variant.c | 1 - ext/com_dotnet/com_wrapper.c | 2 -- ext/ctype/ctype.xml | 1 - ext/curl/tests/server.inc | 1 - ext/dba/CREDITS | 2 +- ext/dba/README | 2 +- ext/dba/tests/dba_handler.inc | 2 +- ext/dom/tests/bug67081_0.xml | 1 - ext/dom/tests/bug67081_1.xml | 1 - ext/dom/tests/bug67081_2.xml | 1 - ext/dom/tests/dom.xml | 2 +- ext/dom/tests/nsdoc.xml | 2 +- ext/dom/tests/skipif.inc | 2 +- ext/enchant/php_enchant.h | 1 - ext/exif/config.w32 | 2 +- ext/fileinfo/Makefile.frag | 1 - ext/gd/gd_compat.c | 1 - ext/hash/config.w32 | 1 - ext/hash/hash.c | 1 - ext/iconv/config.w32 | 1 - ext/iconv/tests/test.inc | 2 +- ext/imap/tests/README | 5 ----- ext/imap/tests/clean.inc | 2 +- ext/intl/common/common_date.cpp | 1 - ext/intl/common/common_date.h | 1 - ext/intl/dateformat/dateformat_attrcpp.cpp | 1 - ext/intl/dateformat/dateformat_attrcpp.h | 1 - ext/intl/dateformat/dateformat_format.c | 1 - ext/intl/dateformat/dateformat_helpers.h | 1 - ext/intl/dateformat/dateformat_parse.c | 1 - ext/intl/grapheme/grapheme_string.c | 1 - ext/intl/grapheme/grapheme_util.c | 1 - ext/intl/tests/resourcebundle.build | 2 +- ext/intl/tests/resourcebundle.inc | 1 - ext/intl/uchar/uchar.c | 1 - ext/json/Makefile.frag.w32 | 1 - ext/json/config.w32 | 1 - ext/json/json_scanner.re | 1 - ext/json/php_json_parser.h | 1 - ext/json/php_json_scanner.h | 1 - ext/ldap/config.w32 | 1 - ext/mbstring/libmbfl/DISCLAIMER | 1 - ext/mbstring/libmbfl/NEWS | 1 - ext/mbstring/libmbfl/filters/emoji2uni.h | 1 - ext/mbstring/libmbfl/filters/html_entities.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_7bit.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_ascii.h | 2 -- ext/mbstring/libmbfl/filters/mbfilter_base64.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_big5.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_byte2.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_byte4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1251.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1251.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_cp1252.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp1254.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_cp51932.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp850.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp866.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_cp932.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_gb18030.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_jis.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_qprint.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_sjis.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c | 2 -- .../libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_ucs2.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_ucs4.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_uhc.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf16.c | 3 --- ext/mbstring/libmbfl/filters/mbfilter_utf32.h | 1 - ext/mbstring/libmbfl/filters/mbfilter_utf7.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c | 1 - ext/mbstring/libmbfl/filters/mbfilter_uuencode.c | 2 -- ext/mbstring/libmbfl/filters/mbfilter_uuencode.h | 1 - ext/mbstring/libmbfl/filters/sjis_mac2uni.h | 2 -- ext/mbstring/libmbfl/filters/unicode_prop.h | 1 - ext/mbstring/libmbfl/filters/unicode_table_jis2004.h | 1 - ext/mbstring/libmbfl/filters/unicode_table_koi8u.h | 1 - ext/mbstring/libmbfl/mbfl/mbfilter_pass.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_allocators.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_convert.c | 2 -- ext/mbstring/libmbfl/mbfl/mbfl_language.c | 1 - ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h | 1 - ext/mbstring/libmbfl/mbfl/mbfl_string.c | 2 -- ext/mbstring/libmbfl/nls/nls_de.c | 1 - ext/mbstring/libmbfl/nls/nls_en.c | 1 - ext/mbstring/libmbfl/nls/nls_kr.c | 1 - ext/mbstring/libmbfl/nls/nls_neutral.c | 1 - ext/mbstring/libmbfl/nls/nls_tr.c | 1 - ext/mbstring/libmbfl/nls/nls_uni.c | 1 - ext/mbstring/libmbfl/nls/nls_zh.c | 1 - .../tests/conv_encoding.tests/cp51932_cp50220raw.exp | 1 - ext/mbstring/mb_gpc.c | 1 - ext/mbstring/php_mbregex.h | 1 - ext/mbstring/php_unicode.h | 3 --- ext/mbstring/ucgendat/OPENLDAP_LICENSE | 2 +- ext/mbstring/ucgendat/README | 3 --- ext/mysqli/mysqli_fe.h | 1 - ext/mysqli/mysqli_libmysql.h | 1 - ext/mysqli/tests/clean_table.inc | 2 +- ext/mysqli/tests/reflection_tools.inc | 2 +- ext/mysqli/tests/skipif.inc | 2 +- ext/mysqli/tests/skipifemb.inc | 2 +- ext/mysqli/tests/skipifnotemb.inc | 2 +- ext/odbc/tests/config.inc | 1 - ext/opcache/config.w32 | 1 - ext/opcache/tests/php_cli_server.inc | 1 - ext/openssl/config.w32 | 2 -- ext/pcntl/README | 5 ----- ext/pcre/config.w32 | 1 - ext/pcre/config0.m4 | 1 - ext/pcre/php_pcre.def | 1 - ext/pdo/CREDITS | 1 - ext/pdo/Makefile.frag | 1 - ext/pdo/Makefile.frag.w32 | 2 -- ext/pdo/README | 2 -- ext/pdo/config.m4 | 1 - ext/pdo/pdo_sqlstate.c | 1 - ext/pdo_dblib/config.w32 | 1 - ext/pdo_mysql/CREDITS | 1 - ext/pdo_mysql/tests/table.inc | 2 +- ext/pdo_oci/config.m4 | 1 - ext/pdo_odbc/config.w32 | 2 -- ext/pdo_sqlite/php_pdo_sqlite.h | 1 - ext/pgsql/README | 1 - ext/pgsql/config.m4 | 2 -- ext/pgsql/tests/nonblocking.inc | 1 - ext/phar/Makefile.frag | 1 - ext/phar/Makefile.frag.w32 | 2 -- ext/phar/func_interceptors.c | 1 - ext/phar/gdbhelp | 2 +- ext/phar/phar/directorygraphiterator.inc | 2 +- ext/phar/phar/directorytreeiterator.inc | 2 +- ext/phar/phar/invertedregexiterator.inc | 2 +- ext/phar/phar/phar.inc | 2 +- ext/phar/phar/phar.php | 2 +- ext/phar/tests/cache_list/files/frontcontroller13.phar.inc | 2 +- ext/phar/tests/cache_list/files/nophar.phar.inc | 2 +- ext/phar/tests/cache_list/files/phar_oo_test.inc | 2 +- ext/phar/tests/cache_list/files/phar_test.inc | 2 +- ext/phar/tests/files/frontcontroller13.phar.inc | 2 +- ext/phar/tests/files/nophar.phar.inc | 2 +- ext/phar/tests/files/phar_oo_test.inc | 2 +- ext/phar/tests/files/stuboflength1041.phar.inc | 2 +- ext/phar/tests/tar/files/corrupt_tarmaker.php.inc | 2 +- ext/phar/tests/tar/files/make.dangerous.tar.php.inc | 2 +- ext/phar/tests/tar/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/tar/files/tarmaker.php.inc | 2 +- ext/phar/tests/zip/files/corrupt_zipmaker.php.inc | 2 +- ext/phar/tests/zip/files/make_invalid_tar.php.inc | 2 +- ext/phar/tests/zip/files/zipmaker.php.inc | 2 +- ext/pspell/README | 2 +- ext/pspell/config.w32 | 1 - ext/readline/config.w32 | 1 - ext/readline/php_readline.h | 1 - ext/readline/readline_cli.h | 2 -- ext/reflection/tests/included4.inc | 2 +- ext/session/tests/save_handler.inc | 1 - ext/shmop/README | 2 -- ext/simplexml/tests/000.xml | 2 +- ext/simplexml/tests/bug24392.xml | 2 +- ext/simplexml/tests/sxe.xml | 2 +- ext/simplexml/tests/sxe私はガラスを食べられます.xml | 2 +- ext/skeleton/config.w32.in | 2 +- ext/skeleton/php_skeleton.h | 2 +- ext/skeleton/skeleton.c | 2 +- ext/snmp/config.w32 | 1 - ext/snmp/tests/skipif.inc | 1 - ext/soap/interop/test.utility.php | 2 +- ext/soap/php_sdl.c | 1 - ext/soap/tests/interop/Round2/Base/round2_base.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_doclit.inc | 2 +- .../interop/Round3/GroupD/round3_groupD_doclitparams.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_emptysa.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import1.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import2.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_import3.inc | 2 +- .../tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc | 2 +- .../tests/interop/Round3/GroupE/round3_groupE_list.inc | 2 +- ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc | 2 +- .../tests/interop/Round3/GroupF/round3_groupF_headers.inc | 2 +- ext/sockets/config.w32 | 1 - ext/sockets/php_sockets.h | 1 - ext/sodium/README.md | 1 - ext/spl/examples/autoload.inc | 2 +- ext/spl/examples/cachingrecursiveiterator.inc | 2 +- ext/spl/examples/callbackfilteriterator.inc | 2 +- ext/spl/examples/class_tree.php | 2 +- ext/spl/examples/dba_array.php | 2 +- ext/spl/examples/dba_dump.php | 2 +- ext/spl/examples/dbareader.inc | 2 +- ext/spl/examples/directorygraphiterator.inc | 2 +- ext/spl/examples/directorytree.inc | 2 +- ext/spl/examples/directorytree.php | 2 +- ext/spl/examples/directorytreeiterator.inc | 2 +- ext/spl/examples/findfile.inc | 2 +- ext/spl/examples/findfile.php | 2 +- ext/spl/examples/findregex.php | 2 +- ext/spl/examples/ini_groups.php | 2 +- ext/spl/examples/inigroups.inc | 2 +- ext/spl/examples/keyfilter.inc | 2 +- ext/spl/examples/nocvsdir.php | 2 +- ext/spl/examples/phar_from_dir.php | 2 +- ext/spl/examples/regexfindfile.inc | 2 +- ext/spl/examples/searchiterator.inc | 2 +- ext/spl/examples/tests/examples.inc | 2 +- ext/spl/internal/emptyiterator.inc | 2 +- ext/spl/internal/filteriterator.inc | 2 +- ext/spl/internal/infiniteiterator.inc | 2 +- ext/spl/internal/limititerator.inc | 2 +- ext/spl/internal/norewinditerator.inc | 2 +- ext/spl/internal/outeriterator.inc | 2 +- ext/spl/internal/parentiterator.inc | 2 +- ext/spl/internal/recursivearrayiterator.inc | 2 +- ext/spl/internal/recursivecachingiterator.inc | 2 +- ext/spl/internal/recursivefilteriterator.inc | 2 +- ext/spl/internal/recursiveiterator.inc | 2 +- ext/spl/internal/recursiveiteratoriterator.inc | 2 +- ext/spl/internal/recursiveregexiterator.inc | 2 +- ext/spl/internal/recursivetreeiterator.inc | 2 +- ext/spl/internal/seekableiterator.inc | 2 +- ext/spl/spl_heap.c | 1 - ext/spl/tests/testclass.class.inc | 2 +- ext/spl/tests/testclass.inc | 2 +- ext/spl/tests/testclass.php.inc | 2 +- ext/standard/Makefile.frag | 1 - ext/standard/Makefile.frag.w32 | 2 -- ext/standard/assert.c | 1 - ext/standard/cyr_convert.h | 3 --- ext/standard/file.h | 1 - ext/standard/hrtime.c | 1 - ext/standard/html_tables/ents_html401.txt | 2 +- ext/standard/html_tables/ents_html5.txt | 2 +- ext/standard/html_tables/ents_xhtml.txt | 2 +- ext/standard/http.c | 1 - ext/standard/info.h | 1 - ext/standard/mt_rand.c | 1 - ext/standard/php_crypt_r.c | 1 - ext/standard/php_http.h | 1 - ext/standard/php_mt_rand.h | 1 - ext/standard/php_smart_string.h | 1 - ext/standard/php_smart_string_public.h | 1 - ext/standard/proc_open.h | 1 - ext/standard/streamsfuncs.h | 1 - ext/standard/tests/array/compare_function.inc | 2 +- ext/standard/tests/class_object/AutoInterface.inc | 2 +- ext/standard/tests/class_object/AutoLoaded.inc | 2 +- ext/standard/tests/class_object/AutoTest.inc | 2 +- ext/standard/tests/class_object/AutoTrait.inc | 2 +- ext/standard/tests/file/fopen_include_path.inc | 2 +- ext/standard/tests/file/windows_mb_path/util.inc | 1 - ext/standard/tests/file/windows_mb_path/util_utf8.inc | 1 - ext/standard/tests/filters/filter_errors.inc | 1 - ext/standard/tests/general_functions/proc_open_pipes.inc | 1 - ext/standard/tests/ini_info/scandir/0.ini | 2 +- ext/standard/tests/math/allowed_rounding_error.inc | 2 +- ext/standard/tests/misc/browscap_lite_2016_12_06.ini | 1 - ext/standard/tests/streams/bug64433_srv.inc | 2 +- ext/sysvshm/config.w32 | 2 +- ext/tidy/config.w32 | 1 - ext/tokenizer/config.w32 | 2 -- ext/tokenizer/tokenizer_data.c | 1 - ext/wddx/config.w32 | 2 -- ext/xmlreader/config.w32 | 1 - ext/xmlreader/tests/XMLReaderBad_bug71805.xml | 2 +- ext/xmlreader/tests/XMLReaderGood_bug71805.xml | 2 +- ext/xmlrpc/config.w32 | 1 - ext/xmlrpc/libxmlrpc/README | 5 ----- ext/xmlrpc/libxmlrpc/base64.h | 1 - ext/xmlrpc/libxmlrpc/encodings.c | 1 - ext/xmlrpc/libxmlrpc/system_methods.c | 3 --- ext/xmlrpc/libxmlrpc/system_methods_private.h | 4 ---- ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c | 1 - ext/xmlrpc/libxmlrpc/xml_to_soap.c | 1 - ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c | 1 - ext/xmlrpc/libxmlrpc/xmlrpc.h | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h | 3 --- ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h | 4 ---- ext/xmlrpc/libxmlrpc/xmlrpc_private.h | 1 - ext/xmlwriter/config.w32 | 1 - ext/xsl/tests/53965/collection.xml | 2 +- ext/xsl/tests/area_name.xml | 3 --- ext/xsl/tests/exslt.xml | 1 - ext/zend_test/config.w32 | 1 - ext/zend_test/test.c | 1 - ext/zip/examples/addglob.php | 1 - ext/zip/examples/addpattern.php | 1 - ext/zip/examples/encryption.php | 1 - ext/zip/examples/fopen.php | 2 -- ext/zip/examples/get_set_comments.php | 1 - ext/zip/examples/im.php | 1 - ext/zip/tests/bug38943.inc | 1 - ext/zlib/config.w32 | 2 -- ext/zlib/tests/data.inc | 3 +-- ext/zlib/tests/func.inc | 1 - ext/zlib/tests/gzopen_include_path.inc | 2 +- ext/zlib/tests/reading_include_path.inc | 2 +- ext/zlib/zlib_win32_howto.txt | 2 -- footer | 1 - genfiles | 1 - main/streams/php_streams_int.h | 1 - main/streams/userspace.c | 2 -- pear/Makefile.frag | 1 - pear/fetch.php | 2 -- sapi/apache2handler/README | 1 - sapi/apache2handler/config.w32 | 1 - sapi/cgi/Makefile.frag | 1 - sapi/cli/Makefile.frag | 1 - sapi/cli/config.w32 | 1 - sapi/cli/tests/php_cli_server.inc | 1 - sapi/embed/config.m4 | 1 - sapi/fpm/fpm/fpm.c | 2 -- sapi/fpm/fpm/fpm.h | 1 - sapi/fpm/fpm/fpm_arrays.h | 1 - sapi/fpm/fpm/fpm_atomic.h | 2 -- sapi/fpm/fpm/fpm_children.c | 2 -- sapi/fpm/fpm/fpm_children.h | 1 - sapi/fpm/fpm/fpm_cleanup.c | 2 -- sapi/fpm/fpm/fpm_cleanup.h | 2 -- sapi/fpm/fpm/fpm_clock.c | 1 - sapi/fpm/fpm/fpm_clock.h | 1 - sapi/fpm/fpm/fpm_conf.c | 1 - sapi/fpm/fpm/fpm_conf.h | 2 -- sapi/fpm/fpm/fpm_config.h | 1 - sapi/fpm/fpm/fpm_env.c | 2 -- sapi/fpm/fpm/fpm_env.h | 2 -- sapi/fpm/fpm/fpm_events.c | 2 -- sapi/fpm/fpm/fpm_events.h | 1 - sapi/fpm/fpm/fpm_log.c | 1 - sapi/fpm/fpm/fpm_log.h | 1 - sapi/fpm/fpm/fpm_php.c | 2 -- sapi/fpm/fpm/fpm_php.h | 2 -- sapi/fpm/fpm/fpm_php_trace.c | 2 -- sapi/fpm/fpm/fpm_php_trace.h | 2 -- sapi/fpm/fpm/fpm_process_ctl.c | 2 -- sapi/fpm/fpm/fpm_process_ctl.h | 2 -- sapi/fpm/fpm/fpm_request.c | 1 - sapi/fpm/fpm/fpm_request.h | 1 - sapi/fpm/fpm/fpm_scoreboard.c | 2 -- sapi/fpm/fpm/fpm_scoreboard.h | 1 - sapi/fpm/fpm/fpm_shm.c | 1 - sapi/fpm/fpm/fpm_shm.h | 2 -- sapi/fpm/fpm/fpm_signals.c | 2 -- sapi/fpm/fpm/fpm_signals.h | 1 - sapi/fpm/fpm/fpm_sockets.c | 1 - sapi/fpm/fpm/fpm_sockets.h | 1 - sapi/fpm/fpm/fpm_status.c | 1 - sapi/fpm/fpm/fpm_status.h | 1 - sapi/fpm/fpm/fpm_stdio.c | 2 -- sapi/fpm/fpm/fpm_stdio.h | 2 -- sapi/fpm/fpm/fpm_str.h | 1 - sapi/fpm/fpm/fpm_systemd.c | 1 - sapi/fpm/fpm/fpm_systemd.h | 1 - sapi/fpm/fpm/fpm_trace.c | 3 --- sapi/fpm/fpm/fpm_trace.h | 2 -- sapi/fpm/fpm/fpm_trace_mach.c | 3 --- sapi/fpm/fpm/fpm_trace_pread.c | 2 -- sapi/fpm/fpm/fpm_trace_ptrace.c | 2 -- sapi/fpm/fpm/fpm_unix.c | 2 -- sapi/fpm/fpm/fpm_unix.h | 2 -- sapi/fpm/fpm/fpm_worker_pool.c | 1 - sapi/fpm/fpm/fpm_worker_pool.h | 2 -- sapi/fpm/fpm/zlog.c | 1 - sapi/fpm/fpm/zlog.h | 1 - sapi/fpm/php-fpm.service.in | 1 - sapi/fpm/tests/response.inc | 2 +- sapi/fpm/tests/skipif.inc | 2 +- sapi/fpm/tests/status.inc | 2 +- sapi/fpm/tests/tester.inc | 2 +- sapi/litespeed/README.md | 4 ---- sapi/litespeed/lsapidef.h | 1 - sapi/litespeed/lsapilib.c | 2 -- sapi/litespeed/lsapilib.h | 7 ------- sapi/litespeed/lscriu.h | 2 +- sapi/phpdbg/Makefile.frag | 1 - sapi/phpdbg/config.w32 | 1 - sapi/phpdbg/phpdbg_eol.h | 1 - sapi/phpdbg/phpdbg_io.c | 1 - sapi/phpdbg/phpdbg_io.h | 1 - sapi/phpdbg/phpdbg_sigio_win32.c | 1 - sapi/phpdbg/phpdbg_sigsafe.c | 1 - scripts/Makefile.frag | 1 - scripts/dev/find_tested.php | 1 - scripts/dev/gen_verify_stub | 1 - server-tests-config.php | 2 +- tests/basic/timeout_config.inc | 1 - tests/lang/bug73172.inc | 1 - tests/quicktester.inc | 1 - tests/security/open_basedir.inc | 1 - travis/ext/pdo_pgsql/setup.sh | 2 +- travis/ext/pgsql/setup.sh | 2 +- win32/build/Makefile | 1 - win32/build/Makefile.phpize | 1 - win32/build/buildconf.js | 1 - win32/build/config.w32 | 1 - win32/build/config.w32.h.in | 1 - win32/build/config.w32.phpize.in | 1 - win32/build/configure.tail | 1 - win32/build/confutils.js | 1 - win32/build/phpize.bat | 1 - win32/build/wsyslog.mc | 1 - win32/cp_enc_map_gen.c | 1 - win32/param.h | 1 - 476 files changed, 129 insertions(+), 623 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6d04b51f603..901145010f1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,3 @@ - version: "{branch}.build.{build}" image: Visual Studio 2017 @@ -50,4 +49,3 @@ build_script: test_script: - appveyor\test.bat - diff --git a/Makefile.frag b/Makefile.frag index cbea640966d..7c65cfab3c7 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,4 +1,3 @@ - # # Zend # diff --git a/Makefile.gcov b/Makefile.gcov index b290d777d8c..671fedab40a 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -1,4 +1,3 @@ - # # LCOV # diff --git a/README.EXT_SKEL b/README.EXT_SKEL index 1b4dc12ba3d..ea450c045ab 100644 --- a/README.EXT_SKEL +++ b/README.EXT_SKEL @@ -41,4 +41,3 @@ SOURCE AND HEADER FILE NAME OTHER OPTIONS Run php ext_skel.php --help to see the available options. - diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index dda28b156ff..456b9d4fc1e 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -370,4 +370,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 6fb89746b31..0cc097f90c0 100644 --- a/README.SELF-CONTAINED-EXTENSIONS +++ b/README.SELF-CONTAINED-EXTENSIONS @@ -164,4 +164,3 @@ PECL SITE CONFORMITY This macros has to be used within your foo_module_entry to indicate the extension version. - diff --git a/README.WIN32-BUILD-SYSTEM b/README.WIN32-BUILD-SYSTEM index bc113a03408..e46d0e4210f 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 - diff --git a/README.md b/README.md index 18087fa3bcc..4e59318e5bb 100644 --- a/README.md +++ b/README.md @@ -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 fcf97fd352e..f886570c773 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 03a21b30ccc..c65a91cc975 100644 --- a/TSRM/config.w32 +++ b/TSRM/config.w32 @@ -2,4 +2,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/UPGRADING b/UPGRADING index 6a7eeba05cf..a43857ea987 100644 --- a/UPGRADING +++ b/UPGRADING @@ -634,4 +634,3 @@ Standard: ======================================== 13. Other Changes ======================================== - diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 2f229dfd9d8..d869a6c79f4 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -206,4 +206,3 @@ PHP 7.3 INTERNALS UPGRADE NOTES ======================== 3. Module changes ======================== - diff --git a/Zend/Makefile.am b/Zend/Makefile.am index dc62bf681c4..537deb26f98 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/buildconf b/Zend/buildconf index fe8dee6f767..b2e0a2958c2 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 fc03349f7e0..a8b97e691e1 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 8511414b82c..63d1c0d0da4 100755 --- a/Zend/tests/methods-on-non-objects-nested.inc +++ b/Zend/tests/methods-on-non-objects-nested.inc @@ -1,4 +1,4 @@ d = 4; } }; $d = new d; ?> - diff --git a/Zend/tests/return_types/classes.php.inc b/Zend/tests/return_types/classes.php.inc index e4b691e3537..34abd8490a4 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 fb489b6e7ae..e3c6d0acace 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -238,4 +238,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 dfe25bce708..30f0017cbdd 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -120,4 +120,3 @@ ZEND_API int zend_vm_kind(void) { return ZEND_VM_KIND; } - diff --git a/appveyor/build.bat b/appveyor/build.bat index 36e8fbdd4e8..0beee511ee1 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 913a4ccef45..00703936948 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -69,4 +69,3 @@ nmake /NOLOGO if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/test.bat b/appveyor/test.bat index eb61bece665..6d4c5fa408f 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 49a0b2dcfea..12aff530313 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -98,4 +98,3 @@ set EXIT_CODE=%errorlevel% powershell -Command "$wc = New-Object 'System.Net.WebClient'; $wc.UploadFile('https://ci.appveyor.com/api/testresults/junit/%APPVEYOR_JOB_ID%', 'c:\junit.out.xml')" exit /b %EXIT_CODE% - diff --git a/build/build2.mk b/build/build2.mk index a5e4d6578dc..7b86f3de1a1 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -49,4 +49,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 40024322a95..1df7c931646 100644 --- a/build/genif.sh +++ b/build/genif.sh @@ -37,5 +37,3 @@ cat $infile | \ -e "s'@EXT_MODULE_PTRS@'$module_ptrs'" \ -e 's/@NEWLINE@/\ /g' - - diff --git a/buildconf.bat b/buildconf.bat index 27a4bcb2d1b..698d80a823f 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 982db9dc405..f2d831cf652 100644 --- a/ext/bcmath/libbcmath/AUTHORS +++ b/ext/bcmath/libbcmath/AUTHORS @@ -1,3 +1 @@ Phil Nelson wrote bcmath library. - - diff --git a/ext/bcmath/libbcmath/COPYING.LIB b/ext/bcmath/libbcmath/COPYING.LIB index c4792dd27a3..aa4f4aca85c 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 b8d459a2bbf..eea6b016e2b 100644 --- a/ext/bcmath/libbcmath/ChangeLog +++ b/ext/bcmath/libbcmath/ChangeLog @@ -7,4 +7,3 @@ Wed Jun 7 09:39:02 2000 Phil Nelson 2000-05-21 Phil Nelson * Initial setup of bcmath library., calling it version 0.1. - diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 1b06b301ba1..423600ac76f 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/src/add.c b/ext/bcmath/libbcmath/src/add.c index ade5b5969a0..150f27c53c7 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 6217ef1af33..cb7d04e0714 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 df5de299190..b326ea12501 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 08c2f8a2a2d..848a4cc8506 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 cef0fdbf1ba..991c294e990 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 a8965f6040e..79a6e19075b 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 1f2f0708ccf..933e501108b 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 619a59bb05c..65081dbef6c 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 be84986d236..81e82a6fac9 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 c7838be5975..81ee03aeed2 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 1b81601b201..93cc26d12d7 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 265d75b5fba..a7c4d732a6b 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 62544de80ec..f38d341570f 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 b63f1bc90ac..2278b0f14f5 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 ffb54975468..d732dddfcdc 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 466fb3be926..2e47bb352d4 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 ed1deb96910..e0d217b3954 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -242,4 +242,3 @@ fail: } return NULL; } - diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 68c814f4b4a..bde19869921 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -562,4 +562,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 cde987bb8b5..0ba344fd9ec 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -601,5 +601,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 170f15b6e72..f4f7d5a9dde 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -1121,4 +1121,3 @@ PHP_FUNCTION(variant_cast) VariantClear(&vres); } /* }}} */ - diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index 13366aa3c44..437c7c814f4 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -643,5 +643,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 312c195e05d..ac5934d7848 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 124e0f898cc..b7c1570195e 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 370b3ea2710..e7748197eac 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 3d23fb914c8..ec0610b71f6 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 9792f008299..51f27050ca8 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/tests/bug67081_0.xml b/ext/dom/tests/bug67081_0.xml index 604eea57b16..160e9d31c3d 100644 --- a/ext/dom/tests/bug67081_0.xml +++ b/ext/dom/tests/bug67081_0.xml @@ -3,4 +3,3 @@ ]> - diff --git a/ext/dom/tests/bug67081_1.xml b/ext/dom/tests/bug67081_1.xml index 7ae542e977d..f699805f648 100644 --- a/ext/dom/tests/bug67081_1.xml +++ b/ext/dom/tests/bug67081_1.xml @@ -4,4 +4,3 @@ ]> - diff --git a/ext/dom/tests/bug67081_2.xml b/ext/dom/tests/bug67081_2.xml index c10af0966ce..baa98702121 100644 --- a/ext/dom/tests/bug67081_2.xml +++ b/ext/dom/tests/bug67081_2.xml @@ -2,4 +2,3 @@ - diff --git a/ext/dom/tests/dom.xml b/ext/dom/tests/dom.xml index 09ac674e55d..c7bbc55413d 100644 --- a/ext/dom/tests/dom.xml +++ b/ext/dom/tests/dom.xml @@ -5,4 +5,4 @@ ]> - \ No newline at end of file + diff --git a/ext/dom/tests/nsdoc.xml b/ext/dom/tests/nsdoc.xml index 9503fd8c5b1..9153729d1a7 100644 --- a/ext/dom/tests/nsdoc.xml +++ b/ext/dom/tests/nsdoc.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ext/dom/tests/skipif.inc b/ext/dom/tests/skipif.inc index 08fd695d97e..16ab73febb0 100644 --- a/ext/dom/tests/skipif.inc +++ b/ext/dom/tests/skipif.inc @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h index 449fae2d0d2..a12ea8ddfa2 100644 --- a/ext/enchant/php_enchant.h +++ b/ext/enchant/php_enchant.h @@ -77,4 +77,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 6ba816793b5..0fe93cdb562 100644 --- a/ext/exif/config.w32 +++ b/ext/exif/config.w32 @@ -10,4 +10,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/fileinfo/Makefile.frag b/ext/fileinfo/Makefile.frag index 5af690a9b4c..ba84e9a9f55 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/gd/gd_compat.c b/ext/gd/gd_compat.c index 2ea1bc4d0c8..8ca3c30b40b 100644 --- a/ext/gd/gd_compat.c +++ b/ext/gd/gd_compat.c @@ -58,4 +58,3 @@ int overflow2(int a, int b) } return 0; } - diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 index 85ade5f30d7..1bf39d14d27 100644 --- a/ext/hash/config.w32 +++ b/ext/hash/config.w32 @@ -31,4 +31,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 4d7f4958caf..300fd824674 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 9161ca91ade..3714ea2ed69 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -24,4 +24,3 @@ if (PHP_ICONV != "no") { PHP_ICONV = "no"; } } - diff --git a/ext/iconv/tests/test.inc b/ext/iconv/tests/test.inc index 78f180462f7..68d2a3e10cc 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/tests/README b/ext/imap/tests/README index 0e554e94c05..99424b3995a 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 2557489ba15..4f381bf893b 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 ea881d9dfa7..ca73269e48d 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -244,4 +244,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 a1c08e434eb..acb8e68e9ab 100644 --- a/ext/intl/common/common_date.h +++ b/ext/intl/common/common_date.h @@ -39,4 +39,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 858cbf5d4da..fec8eb1a67f 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 c8e4e5b702c..ab699145405 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 2d1e78b512b..5e51796cad3 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 fd73e81d89c..7489effc180 100644 --- a/ext/intl/dateformat/dateformat_helpers.h +++ b/ext/intl/dateformat/dateformat_helpers.h @@ -41,4 +41,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 5f0c497e445..a04ef1105ec 100644 --- a/ext/intl/dateformat/dateformat_parse.c +++ b/ext/intl/dateformat/dateformat_parse.c @@ -210,4 +210,3 @@ PHP_FUNCTION(datefmt_localtime) } } /* }}} */ - diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 72ecbd5074f..a02fb7acd90 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -911,4 +911,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 36b225a06cc..2e47b17933e 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -406,4 +406,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 560dc8fb450..273e4407b7a 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 2ec138bb7d3..a7727a3ec83 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 54d2082533d..c4a1c76278a 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -779,4 +779,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 ceaf2595cbd..1463eda70b7 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) $(RE2C_FLAGS) -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 b82b29e7642..82e470f2eec 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -20,4 +20,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 3fda1df5ad7..cf45b90ea05 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 5378e50104d..d8af613878c 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 b707e230ebc..4fd5f217fd4 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 936c37c3d43..a16a4fcd653 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/libmbfl/DISCLAIMER b/ext/mbstring/libmbfl/DISCLAIMER index 97fe77c33c0..21b7a91d55a 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/NEWS b/ext/mbstring/libmbfl/NEWS index 82a763b6955..75ea1c5117f 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 adce0b75d48..198b2354d3b 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 6833fd81055..be2cf904435 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 382c87437cb..0a4169a2d8f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -80,5 +80,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 99b48153870..3c8aead9efc 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 661e1a4a5bc..f79a3eb8e96 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -212,5 +212,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 6b845f2bf9d..c2cb9a1005b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -351,5 +351,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 9be0fb9ae86..572b9fab84f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -137,5 +137,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 46ca04bb71d..ed09bb3fdec 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -159,5 +159,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 e28da316e16..13a2b222ed2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -150,5 +150,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 becae48c191..b76cc9f6806 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 6479023428f..7c628da2f34 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -145,5 +145,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 b01b19fb061..ae63aed6e1c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -155,5 +155,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 81b655d55f8..c6012ff682b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -1301,6 +1301,3 @@ retry: return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index 057d6c6f917..8b931ba6d0d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -343,5 +343,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 25ec247c780..9f47664fbe9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -145,5 +145,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 95b681243b5..c4668dcd572 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -149,5 +149,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 e6cbd5fc43b..d4936d9dcda 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -348,5 +348,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 7fd3d7c315e..08be6f32986 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -242,5 +242,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 ba794934b0a..1d988739764 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -328,6 +328,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 2fe24e0f57c..f8ae8fc6f7c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -77,4 +77,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 912ae735043..20e06515548 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -432,5 +432,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 bc780c99ee6..9b28556dee6 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 b7687b6c31a..6369542e2e4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -471,5 +471,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 c1fe9f12224..cc0e3653f2e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -357,5 +357,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 17355bf87bc..9077d5708bf 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -166,5 +166,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 239d74e381b..9279fe87134 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -98,5 +98,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 0fb6bc88cb7..f6c6297151f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -136,5 +136,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 2b2494baa50..fc039892e09 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -136,5 +136,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 eb008b8f042..db16cd6a7b8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -136,5 +136,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 ec1b2bc1720..dcc05a00d17 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -137,5 +137,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 f3905ac46ed..61fbde6f4c8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -137,5 +137,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 19e105a6b8c..f5a8aa73078 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -135,5 +135,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 ac3b2d20892..629caa1081e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -137,5 +137,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 c5bbdd7eec8..d3f5f559f28 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -137,5 +137,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 98ffade2e75..a11d1f57fff 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -137,5 +137,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 3d65ce630a3..fb4020a4ad5 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -136,4 +136,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 8a730ae43e4..1e368ba5b6a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -136,5 +136,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 88395cb09ef..8985456d722 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -663,5 +663,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index b72724f4f18..0d10ea49f81 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -241,6 +241,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 33b1e1f6fe5..5dab2bcbb65 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -297,4 +297,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 ff08cf3daef..a1cfa725213 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -699,4 +699,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 c7acf214097..3dd2e213c6d 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. @@ -930,4 +929,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 17e78793d81..fcf29531086 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -348,5 +348,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 637e69074c8..b99c658e4de 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 08cbf6ddb1d..76886695dd7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -239,6 +239,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 011c93fcdac..0b85a6f3395 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -277,5 +277,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 1603793e6a0..1c1db5f42a0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -265,5 +265,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 a4864cd3aca..8772d8d5be4 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -317,6 +317,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 aa0883fff45..14b9fa48232 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 f31da86b6c0..5c13e45b8ef 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -463,5 +463,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 d95c5dbaa9b..c4d2b5c42d1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c @@ -370,5 +370,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 7132d9ccd65..060cd90860f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -346,4 +346,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 5464fac4339..590ecda9976 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -150,5 +150,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 c02d21f878d..9d4bd5fd6bc 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 7853d96ba44..c50caba29dd 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 bbb92b98e7f..6eaefbc2e39 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 327e2a1278f..01afcc1f2d9 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 2674e0c9b85..e59c685fe85 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 a9c6fd42048..cd582217530 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -64,4 +64,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 aa468da2528..a2db06932d3 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 b42d69b0a39..841e18844a8 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -498,5 +498,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 9ca2d591839..7ac3920f0d0 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 985e2511582..d85a10fb280 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h @@ -74,4 +74,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 b26226500b7..6b3dcacf321 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -76,5 +76,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 b559e2dee30..f84cbe74ed2 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 0700e4f2c4e..7fa23d4f536 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 afff43af489..aba4be5b8c4 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 87a6a194c34..ab747472194 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 c7044ff293f..950a610e0db 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 6a0100105b0..cf76000cd9e 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 d9a49931eaf..1434481b34b 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 0e63ef11b76..740bcfd881e 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 a4c97b2335e..08b6e2b0a59 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -397,4 +397,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 20fbb38a504..5ada93fcc59 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -104,4 +104,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 68dff61da44..10c3a7d46d3 100644 --- a/ext/mbstring/php_unicode.h +++ b/ext/mbstring/php_unicode.h @@ -197,6 +197,3 @@ static inline int php_unicode_is_upper(unsigned long code) { #endif /* PHP_UNICODE_H */ - - - diff --git a/ext/mbstring/ucgendat/OPENLDAP_LICENSE b/ext/mbstring/ucgendat/OPENLDAP_LICENSE index 6295703c0a3..05ad7571e44 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 b5af1b83193..39fd7b2f6b4 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: php ucgendat.php UnicodeData.txt - - - diff --git a/ext/mysqli/mysqli_fe.h b/ext/mysqli/mysqli_fe.h index dab9b18861d..9dc038355fc 100644 --- a/ext/mysqli/mysqli_fe.h +++ b/ext/mysqli/mysqli_fe.h @@ -137,4 +137,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 6759d8a1c22..a4ba66e15b4 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 716cc84416b..86e5fcb3796 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 c8338bfa24b..6648526ed05 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 a7581fb4806..5562aab84ba 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 254a4ccece7..ad143a42a46 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 d73d185bc4c..fa5fb9f0a34 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 dcc4cbb3bff..d9da63d0b70 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 14cb7ca5939..1d78f7e5487 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 ca781b7cd76..70ef14e5858 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 bd1f2d15895..6e5a4e549dc 100644 --- a/ext/openssl/config.w32 +++ b/ext/openssl/config.w32 @@ -21,5 +21,3 @@ if (PHP_OPENSSL != "no") { } } } - - diff --git a/ext/pcntl/README b/ext/pcntl/README index 34313b2040c..ab1dfa1f2d2 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 b0b1e0ce7c8..2aef554e0d3 100644 --- a/ext/pcre/config.w32 +++ b/ext/pcre/config.w32 @@ -17,4 +17,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 3f7f04d4fc6..753071340da 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -116,4 +116,3 @@ PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR fi fi fi - diff --git a/ext/pcre/php_pcre.def b/ext/pcre/php_pcre.def index aa229d5c3d8..30b528e4eac 100644 --- a/ext/pcre/php_pcre.def +++ b/ext/pcre/php_pcre.def @@ -67,4 +67,3 @@ php_pcre2_substring_nametable_scan php_pcre2_substring_number_from_name php_pcre2_set_recursion_limit php_pcre2_set_recursion_memory_management - diff --git a/ext/pdo/CREDITS b/ext/pdo/CREDITS index 5971cdb0dd6..a9899d230fd 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 698699be759..8d6c57095bf 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 3958f95a9f0..b4f2ec9f8c6 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) $(RE2C_FLAGS) --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 2b833714ae8..cb7b4297d43 100755 --- a/ext/pdo/README +++ b/ext/pdo/README @@ -50,5 +50,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 a42b6a3a888..91c977a7a95 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -51,4 +51,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 6723e0d0343..36ea9d494cc 100644 --- a/ext/pdo/pdo_sqlstate.c +++ b/ext/pdo/pdo_sqlstate.c @@ -331,4 +331,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 5ff4d7b80b4..9ceed49205a 100755 --- a/ext/pdo_dblib/config.w32 +++ b/ext/pdo_dblib/config.w32 @@ -38,4 +38,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 0423cccd64f..eb11169bd93 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 c7bb9cc5ee4..54bf14f07d5 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 75f133cdb44..ea85fc15566 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -234,4 +234,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/config.w32 b/ext/pdo_odbc/config.w32 index ea511a55df6..6a94da7f795 100755 --- a/ext/pdo_odbc/config.w32 +++ b/ext/pdo_odbc/config.w32 @@ -15,5 +15,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 1af7ba870e9..6e5f26bf2c2 100644 --- a/ext/pdo_sqlite/php_pdo_sqlite.h +++ b/ext/pdo_sqlite/php_pdo_sqlite.h @@ -52,4 +52,3 @@ ZEND_END_MODULE_GLOBALS(pdo_sqlite) #endif #endif /* PHP_PDO_SQLITE_H */ - diff --git a/ext/pgsql/README b/ext/pgsql/README index 26f7aad02d4..11f112dfc02 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 953678a3762..44860ee9937 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -105,5 +105,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 4cf7c09a513..c121c62413f 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 e1dda157238..b27a1017e94 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 29906a3723f..4b361169029 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) $(RE2C_FLAGS) --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 d9d8b048368..e411d8be6e7 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -1164,4 +1164,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 14ff89c56be..bd4150e3efb 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 5a658ddabce..34579678a77 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 9ed2e1a1bf5..2c681632fb7 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 aec87e6ab14..8f82f41f2aa 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 c28de0aa7a6..129a0c43bf8 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 f6f26c23f28..13538777a56 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 0bfef468530..df74c138805 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'] = 'setStub('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 9863e8da937..0691e4dc804 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 f82471d13b4..b1bb6d0e384 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 0bfef468530..df74c138805 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'] = 'setStub('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 45421568dee..3883d494c15 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 28ce8427f34..9d51a750dfe 100644 --- a/ext/phar/tests/files/stuboflength1041.phar.inc +++ b/ext/phar/tests/files/stuboflength1041.phar.inc @@ -18,4 +18,4 @@ $phar->setStub('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 52f5a235073..641dda56f59 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 413dd7bd1bd..895977bf2fb 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 0df7ee99335..5860bf84d31 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 79bade6aaef..15ae3a926f5 100644 --- a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc +++ b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc @@ -328,4 +328,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 cec8ef77939..4f4758bbb64 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 ad16fda6592..c9eebad7edc 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 58806289db4..9fc884c65b0 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 8ea7fe763cf..d88ea1d30c5 100644 --- a/ext/pspell/config.w32 +++ b/ext/pspell/config.w32 @@ -12,4 +12,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 1a524e15356..4e9e89c9642 100644 --- a/ext/readline/config.w32 +++ b/ext/readline/config.w32 @@ -12,4 +12,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 eebd50b6e40..8d7e5511b12 100644 --- a/ext/readline/php_readline.h +++ b/ext/readline/php_readline.h @@ -39,4 +39,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 69bf12c3a38..0448a8f3c87 100644 --- a/ext/readline/readline_cli.h +++ b/ext/readline/readline_cli.h @@ -37,5 +37,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 88947251cd4..313fc5feca7 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 15ad29029f6..56b3505284b 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 cb7b502f92a..80f957a2391 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 b0f2785463f..86a22ba0fac 100755 --- a/ext/simplexml/tests/000.xml +++ b/ext/simplexml/tests/000.xml @@ -13,4 +13,4 @@ Here is some more - \ No newline at end of file + diff --git a/ext/simplexml/tests/bug24392.xml b/ext/simplexml/tests/bug24392.xml index d669f1df418..2cb5106eea6 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/"> http://slashdot.org/search.pl - \ No newline at end of file + diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 413be72087d..0a730ae8094 100755 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ext/simplexml/tests/sxe私はガラスを食べられます.xml b/ext/simplexml/tests/sxe私はガラスを食べられます.xml index 413be72087d..0a730ae8094 100644 --- a/ext/simplexml/tests/sxe私はガラスを食べられます.xml +++ b/ext/simplexml/tests/sxe私はガラスを食べられます.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ext/skeleton/config.w32.in b/ext/skeleton/config.w32.in index 41592624965..ea5064b7e2e 100644 --- a/ext/skeleton/config.w32.in +++ b/ext/skeleton/config.w32.in @@ -4,4 +4,4 @@ if (PHP_%EXTNAMECAPS% != 'no') { AC_DEFINE('HAVE_%EXTNAMECAPS%', 1, '%EXTNAME% support enabled'); EXTENSION('%EXTNAME%', '%EXTNAME%.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); -} \ No newline at end of file +} diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index 542bc915482..35e094d6611 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -13,4 +13,4 @@ ZEND_TSRMLS_CACHE_EXTERN() # endif #endif /* PHP_%EXTNAMECAPS%_H */ -%FOOTER% \ No newline at end of file +%FOOTER% diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index 04b07ecf29d..a93fd57f537 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -100,4 +100,4 @@ ZEND_TSRMLS_CACHE_DEFINE() # endif ZEND_GET_MODULE(%EXTNAME%) #endif -%FOOTER% \ No newline at end of file +%FOOTER% diff --git a/ext/snmp/config.w32 b/ext/snmp/config.w32 index 449c762543b..33c6ca2a706 100644 --- a/ext/snmp/config.w32 +++ b/ext/snmp/config.w32 @@ -16,4 +16,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 72423251fda..d8ee31d0c49 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 5b1f699c9be..e581772bbb5 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 1c04a90568b..2f0fd60f891 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -3660,4 +3660,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 48eaf40f896..b5d6ced74c6 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 a9da5653e37..727def1ee6b 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 b65da2782c3..8ecf366824b 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 ee38a121369..0b97f8bac9d 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 ecde53e1559..8981c0e6ba4 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 5957c374a1d..3eea780899c 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 3a3df9791bf..c96dcbb6438 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 e88df3312b9..8b4804db147 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 19a769c001f..7b918c0afbb 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 e90586efdb2..d2af69e4be5 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 b7e67b0f527..0940d1c3995 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 6a1a2907eda..aeb419c4f06 100644 --- a/ext/sockets/config.w32 +++ b/ext/sockets/config.w32 @@ -13,4 +13,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 6c843d733dc..d0e51815daf 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -124,4 +124,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 104570a2412..64b575956b8 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 2ccd0d1be8b..0dc423199e4 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 4fa6b235c31..f0e060a0a7a 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 51757012ec8..4d49a52807c 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 fc021d5c01c..a5d2d7b1ca4 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 f217c345467..7930348f7c4 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 7ea8e762552..4c080729b2d 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 01de37e990c..095c5c29d51 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 3f0bb263e2a..65a4dd7a389 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 7bd9c2c597d..20a15c815fa 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 dc26d6cc22e..38759837f50 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 8454d9e3056..52a4e114ed3 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 02ab7924335..afafa8124df 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 60146cbffd0..7a850feddb0 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 288c0924b14..284f985943b 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 4c6c89bd70d..540fc68c9cf 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 cb2bb04a57d..d33f169c4b8 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 abc925ec432..21bb79a2d1d 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 6993268945c..d8e4362ab60 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 d75788e840d..23fcfc97772 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 d5dd7225360..395624b8de9 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 ff4963bc72c..451ae08fd27 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 feeba7db243..75025146598 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 ac80e795812..c7a05717a6f 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 e11e467a10e..27cb9c064f0 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 04d78271827..ffd728cf09d 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 00c41228723..78c96d1049c 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 8747a6116ec..6b61dbba028 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 f26d29da56a..c2684ae51c9 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 69a223444d9..e3c5605f832 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 2059b97c1c6..418fb0d9e13 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 3ae127ad94b..fcbbda70424 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 87d98da8852..2c0d9ef998b 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 6e6c023486d..a89fbd8577e 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 c22a92bf716..46110c9fb9e 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 42231043987..51cf6c415fa 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 dfcdc059952..a2312414eab 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 77286369818..83e5588c74b 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 5751cf97cdf..4c170dd8d46 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -1245,4 +1245,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 f5fe7411fac..c5d6034423c 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 ceb24c877cd..0684d2098da 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 ceb24c877cd..0684d2098da 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 2cc75ca93f6..16d8a202854 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) $(RE2C_FLAGS) --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 15ad0789fd3..7815c7c97d0 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) $(RE2C_FLAGS) --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) $(RE2C_FLAGS) --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 893e2219ad2..005fda4b564 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -387,4 +387,3 @@ PHP_FUNCTION(assert_options) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h index c3127d2f871..a3b7b93cf3a 100644 --- a/ext/standard/cyr_convert.h +++ b/ext/standard/cyr_convert.h @@ -22,6 +22,3 @@ PHP_FUNCTION(convert_cyr_string); #endif /* CYR_CONVERT_H */ - - - diff --git a/ext/standard/file.h b/ext/standard/file.h index 9edd5bef6cf..b4e564f1c38 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -142,4 +142,3 @@ extern PHPAPI php_file_globals file_globals; #endif /* FILE_H */ - diff --git a/ext/standard/hrtime.c b/ext/standard/hrtime.c index eea60f5d237..04b237e075b 100644 --- a/ext/standard/hrtime.c +++ b/ext/standard/hrtime.c @@ -201,4 +201,3 @@ PHPAPI php_hrtime_t php_hrtime_current(void) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/html_tables/ents_html401.txt b/ext/standard/html_tables/ents_html401.txt index bd3ded9fdec..c0533b01340 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 005bebbe200..18fcc02f9cb 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 81800bcd2dc..90cebfd2745 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 293258b1aaf..27ceafe0ae0 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -269,4 +269,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 a810c97083a..5b458bf8466 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -83,4 +83,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 814f602855a..bf945b181fe 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -367,4 +367,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 d680393efb9..7af5636c080 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -424,4 +424,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 c1cc0934332..f5d91ce61b4 100644 --- a/ext/standard/php_http.h +++ b/ext/standard/php_http.h @@ -41,4 +41,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 6dcfbdbaa55..04d8842638d 100644 --- a/ext/standard/php_mt_rand.h +++ b/ext/standard/php_mt_rand.h @@ -40,4 +40,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 0d6a1351594..63f8d9ec60d 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 255fbd94a18..272b9485151 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 5963007567e..f3f89616739 100644 --- a/ext/standard/proc_open.h +++ b/ext/standard/proc_open.h @@ -46,4 +46,3 @@ struct php_process_handle { int is_persistent; php_process_env_t env; }; - diff --git a/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h index bbcd18f8153..ef43220335a 100644 --- a/ext/standard/streamsfuncs.h +++ b/ext/standard/streamsfuncs.h @@ -76,4 +76,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 e5176802abb..4fa672e7675 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 f1e5b1f58fc..805d7f1f6f1 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 52e6671ddc1..2935b801e55 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 a0c8244265e..fb487fb0714 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 698e975ef71..c371d592710 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 5bc9b6ce3b2..e33dae49156 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 98cec87dc63..de4072a1aaf 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 8d7009f91cc..e0915649984 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 6d1a270c82e..8636fbe17f4 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 0d9894683a1..576118ffd63 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/ini_info/scandir/0.ini b/ext/standard/tests/ini_info/scandir/0.ini index ecc77af06e8..fac6473265a 100644 --- a/ext/standard/tests/ini_info/scandir/0.ini +++ b/ext/standard/tests/ini_info/scandir/0.ini @@ -1,4 +1,4 @@ ; This file is named 0.ini so it should be the first line of ; any scanned ini output -date.timezone = Antarctica/McMurdo \ No newline at end of file +date.timezone = Antarctica/McMurdo diff --git a/ext/standard/tests/math/allowed_rounding_error.inc b/ext/standard/tests/math/allowed_rounding_error.inc index 71dbf9af4a5..9ba754b5829 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 8f911659778..b5a7432e2d8 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 e79a2fd6d6d..dcdb1bcbaaa 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 3a9a0d47df6..80fb28ee61f 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/config.w32 b/ext/tidy/config.w32 index bfb738264e0..9b20441a1ab 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -26,4 +26,3 @@ if (PHP_TIDY != "no") { WARNING("tidy not enabled; libraries and headers not found"); } } - diff --git a/ext/tokenizer/config.w32 b/ext/tokenizer/config.w32 index 41fadc62dae..ee98c0cc138 100644 --- a/ext/tokenizer/config.w32 +++ b/ext/tokenizer/config.w32 @@ -6,5 +6,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 11ee044a59f..3ffef8a55d7 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -304,4 +304,3 @@ char *get_token_type_name(int token_type) } return "UNKNOWN"; } - diff --git a/ext/wddx/config.w32 b/ext/wddx/config.w32 index afa7279220a..d5d4e80e5ee 100644 --- a/ext/wddx/config.w32 +++ b/ext/wddx/config.w32 @@ -21,5 +21,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 2c41200fce0..b9ab7dbe030 100644 --- a/ext/xmlreader/config.w32 +++ b/ext/xmlreader/config.w32 @@ -15,4 +15,3 @@ if (PHP_XMLREADER == "yes" && ADD_EXTENSION_DEP('xmlreader', 'libxml'); ADD_EXTENSION_DEP('xmlreader', 'dom'); } - diff --git a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml index 68ee25ddb88..0f90a69cf02 100644 --- a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml index 9a59e0c9782..7d8ef1fad32 100644 --- a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index 1d7d57cae45..87f4412a92e 100644 --- a/ext/xmlrpc/config.w32 +++ b/ext/xmlrpc/config.w32 @@ -18,4 +18,3 @@ if (PHP_XMLRPC != "no") { PHP_XMLRPC = "no"; } } - diff --git a/ext/xmlrpc/libxmlrpc/README b/ext/xmlrpc/libxmlrpc/README index 323edfa6718..4835cd68e9f 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 6a0c8ef6fc8..f0272b43567 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 77b5cc15a66..fb75dbb9dc2 100644 --- a/ext/xmlrpc/libxmlrpc/encodings.c +++ b/ext/xmlrpc/libxmlrpc/encodings.c @@ -110,4 +110,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 ff5e651fd0d..31f4156a5d2 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 fa3fc279f2d..bea8779da92 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 63cc52d6b7b..0a391b8444d 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 64a9a6eaa56..cd0933fcbc4 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 309f0dce3d8..860cba3e36c 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 12b6c7a8ee4..c3b30cbea83 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.h b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h index 41a31c6f515..2f90fc0e3c2 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 5b231fe3446..1a5d9f79a97 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 e43f78ecfbf..7cda5c24be2 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/xmlwriter/config.w32 b/ext/xmlwriter/config.w32 index 75c76ead88d..1a787917bfd 100644 --- a/ext/xmlwriter/config.w32 +++ b/ext/xmlwriter/config.w32 @@ -14,4 +14,3 @@ if (PHP_XMLWRITER == "yes" && PHP_LIBXML == "yes") { WARNING('Could not find xmlwriter.h'); } } - diff --git a/ext/xsl/tests/53965/collection.xml b/ext/xsl/tests/53965/collection.xml index a3039cd1015..1c9dc175cd9 100644 --- a/ext/xsl/tests/53965/collection.xml +++ b/ext/xsl/tests/53965/collection.xml @@ -10,4 +10,4 @@ Jimi Hendrix 1997 - \ No newline at end of file + diff --git a/ext/xsl/tests/area_name.xml b/ext/xsl/tests/area_name.xml index 76cea58511e..fbe3b202124 100644 --- a/ext/xsl/tests/area_name.xml +++ b/ext/xsl/tests/area_name.xml @@ -7,6 +7,3 @@ m."Avtovo" - - - diff --git a/ext/xsl/tests/exslt.xml b/ext/xsl/tests/exslt.xml index 562e08e8216..06110aabd49 100644 --- a/ext/xsl/tests/exslt.xml +++ b/ext/xsl/tests/exslt.xml @@ -12,4 +12,3 @@ - diff --git a/ext/zend_test/config.w32 b/ext/zend_test/config.w32 index 9b1574ef4e4..76a0f1ae5ba 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 da83a9fa1de..31455daab86 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -274,4 +274,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 790312b4d58..3c432f0be5f 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 a1a9b122914..41efaa5eb73 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 69888170a9b..9ef7dd84975 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 32357f3c08f..80de5d052a4 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 5bd302e6da4..bec4240246d 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 e954576ad68..6a35e312423 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 a6f45e8294e..b439939e64d 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 985999f762f..70bd1a74fab 100644 --- a/ext/zlib/config.w32 +++ b/ext/zlib/config.w32 @@ -17,5 +17,3 @@ if (PHP_ZLIB == "yes") { PHP_ZLIB = "no" } } - - diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc index 441199ff08a..bee4e51d9ad 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -1,4 +1,3 @@ - \ No newline at end of file +?> diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc index e431afedbf3..7556f81e6a5 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 7d6723a8150..add04f74de8 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 ee71bb9c423..abe80bf69c1 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 89bdb29f1eb..dffc32d9f13 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. - - diff --git a/footer b/footer index 64d3768113f..42a6cd7005e 100644 --- a/footer +++ b/footer @@ -1,4 +1,3 @@ - /* * Local variables: * tab-width: 4 diff --git a/genfiles b/genfiles index 516b3316fb0..a561c3d8f1c 100755 --- a/genfiles +++ b/genfiles @@ -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 e0ffccec384..addaf0ce7b1 100644 --- a/main/streams/php_streams_int.h +++ b/main/streams/php_streams_int.h @@ -65,4 +65,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 e69db525dad..37479a48e9e 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -1558,5 +1558,3 @@ const php_stream_ops php_stream_userspace_dir_ops = { NULL, /* stat */ NULL /* set_option */ }; - - diff --git a/pear/Makefile.frag b/pear/Makefile.frag index bbe8ec35135..528683ba1b5 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 01d223392e4..56767b62cb7 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 d624141c9f0..15ef022d24e 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 5166135b0a0..45d6353d28f 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -54,4 +54,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 75c72bf8b71..79e2afec254 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 8f4f400401c..aa1d642b9cd 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 ba55be22182..155b2ce838f 100644 --- a/sapi/cli/config.w32 +++ b/sapi/cli/config.w32 @@ -23,4 +23,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 2a21ba35d06..ff4eef0e129 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 d396a070e82..78e2d15775d 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -28,4 +28,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 4febc2cf6bc..30cb9da010b 100644 --- a/sapi/fpm/fpm/fpm.c +++ b/sapi/fpm/fpm/fpm.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -121,4 +120,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 8e3a472a41f..f0610ca46dc 100644 --- a/sapi/fpm/fpm/fpm.h +++ b/sapi/fpm/fpm/fpm.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_H diff --git a/sapi/fpm/fpm/fpm_arrays.h b/sapi/fpm/fpm/fpm_arrays.h index 13ace02916d..82c7cbc09e1 100644 --- a/sapi/fpm/fpm/fpm_arrays.h +++ b/sapi/fpm/fpm/fpm_arrays.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_ARRAYS_H diff --git a/sapi/fpm/fpm/fpm_atomic.h b/sapi/fpm/fpm/fpm_atomic.h index cd52d1561ae..ec9e4f197d5 100644 --- a/sapi/fpm/fpm/fpm_atomic.h +++ b/sapi/fpm/fpm/fpm_atomic.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_ATOMIC_H @@ -164,4 +163,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 ca2ff7dec34..df848acf86d 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -481,4 +480,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 04c857bec73..9d9c1fa7cb3 100644 --- a/sapi/fpm/fpm/fpm_children.h +++ b/sapi/fpm/fpm/fpm_children.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CHILDREN_H diff --git a/sapi/fpm/fpm/fpm_cleanup.c b/sapi/fpm/fpm/fpm_cleanup.c index ae5e66f41b9..7c900974a9c 100644 --- a/sapi/fpm/fpm/fpm_cleanup.c +++ b/sapi/fpm/fpm/fpm_cleanup.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -48,4 +47,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 0985b484800..8583143fa20 100644 --- a/sapi/fpm/fpm/fpm_cleanup.h +++ b/sapi/fpm/fpm/fpm_cleanup.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CLEANUP_H @@ -17,4 +16,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_clock.c b/sapi/fpm/fpm/fpm_clock.c index ce4d9bac93a..8568d7928f0 100644 --- a/sapi/fpm/fpm/fpm_clock.c +++ b/sapi/fpm/fpm/fpm_clock.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_clock.h b/sapi/fpm/fpm/fpm_clock.h index 0c51709798f..cf92521dcc3 100644 --- a/sapi/fpm/fpm/fpm_clock.h +++ b/sapi/fpm/fpm/fpm_clock.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CLOCK_H diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 5c9791436ac..1389b802fcf 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h index 8491888aa76..44de1f3b032 100644 --- a/sapi/fpm/fpm/fpm_conf.h +++ b/sapi/fpm/fpm/fpm_conf.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CONF_H @@ -121,4 +120,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 954d1a52c0d..548202fe3a5 100644 --- a/sapi/fpm/fpm/fpm_config.h +++ b/sapi/fpm/fpm/fpm_config.h @@ -75,4 +75,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 99c7cc1ba10..ef7c980efb2 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -276,4 +275,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 d720307348f..d767608740e 100644 --- a/sapi/fpm/fpm/fpm_env.h +++ b/sapi/fpm/fpm/fpm_env.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_ENV_H @@ -23,4 +22,3 @@ void clearenv(); #endif #endif - diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c index 818d7a7ac93..1750fab103a 100644 --- a/sapi/fpm/fpm/fpm_events.c +++ b/sapi/fpm/fpm/fpm_events.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -536,4 +535,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 9b241e7262d..e97ede08249 100644 --- a/sapi/fpm/fpm/fpm_events.h +++ b/sapi/fpm/fpm/fpm_events.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_EVENTS_H diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index 38574d3c6da..a09e80a4906 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #include "php.h" diff --git a/sapi/fpm/fpm/fpm_log.h b/sapi/fpm/fpm/fpm_log.h index 7a2b679060d..edad81de216 100644 --- a/sapi/fpm/fpm/fpm_log.h +++ b/sapi/fpm/fpm/fpm_log.h @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #ifndef FPM_LOG_H diff --git a/sapi/fpm/fpm/fpm_php.c b/sapi/fpm/fpm/fpm_php.c index 72a23f717ce..ab3c5af18e9 100644 --- a/sapi/fpm/fpm/fpm_php.c +++ b/sapi/fpm/fpm/fpm_php.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -285,4 +284,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 72af62a7235..978f3209d53 100644 --- a/sapi/fpm/fpm/fpm_php.h +++ b/sapi/fpm/fpm/fpm_php.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_PHP_H @@ -46,4 +45,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 20386e979ec..3174eef2fbe 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -231,4 +230,3 @@ done0: /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.h b/sapi/fpm/fpm/fpm_php_trace.h index 4fb1fb5e4e1..6a83cff127b 100644 --- a/sapi/fpm/fpm/fpm_php_trace.h +++ b/sapi/fpm/fpm/fpm_php_trace.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_PHP_TRACE_H @@ -9,4 +8,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 7deb3beef42..771335551ee 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.c +++ b/sapi/fpm/fpm/fpm_process_ctl.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -535,4 +534,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 eb1f237e88c..f39a489f617 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.h +++ b/sapi/fpm/fpm/fpm_process_ctl.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_PROCESS_CTL_H @@ -49,4 +48,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 56d2a5244f6..65f9c4ae441 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifdef HAVE_TIMES #include diff --git a/sapi/fpm/fpm/fpm_request.h b/sapi/fpm/fpm/fpm_request.h index bccf0dd8c30..782d02dc21c 100644 --- a/sapi/fpm/fpm/fpm_request.h +++ b/sapi/fpm/fpm/fpm_request.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_REQUEST_H diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c index 4de910a67a7..328f999f0c9 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.c +++ b/sapi/fpm/fpm/fpm_scoreboard.c @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #include "php.h" @@ -335,4 +334,3 @@ float fpm_scoreboard_get_tick() /* {{{ */ } /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h index d71b7ad8573..1fecde1d0fe 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.h +++ b/sapi/fpm/fpm/fpm_scoreboard.h @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #ifndef FPM_SCOREBOARD_H diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c index b7b57707308..52ae60ed28b 100644 --- a/sapi/fpm/fpm/fpm_shm.c +++ b/sapi/fpm/fpm/fpm_shm.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin, Jerome Loyet */ #include diff --git a/sapi/fpm/fpm/fpm_shm.h b/sapi/fpm/fpm/fpm_shm.h index 249c0d68a60..4382aac29bf 100644 --- a/sapi/fpm/fpm/fpm_shm.h +++ b/sapi/fpm/fpm/fpm_shm.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_SHM_H @@ -9,4 +8,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 a244eb173a8..1b97025ea7e 100644 --- a/sapi/fpm/fpm/fpm_signals.c +++ b/sapi/fpm/fpm/fpm_signals.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -251,4 +250,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 768f0ae2a2a..72028162188 100644 --- a/sapi/fpm/fpm/fpm_signals.h +++ b/sapi/fpm/fpm/fpm_signals.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_SIGNALS_H diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index a79c552b4f8..aaa16cc89e8 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index f7fcba16d7d..9d899c07576 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_MISC_H diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c index b104288ff41..36d22406358 100644 --- a/sapi/fpm/fpm/fpm_status.c +++ b/sapi/fpm/fpm/fpm_status.c @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #include "php.h" diff --git a/sapi/fpm/fpm/fpm_status.h b/sapi/fpm/fpm/fpm_status.h index 8d91b44a06c..bc90c6a9df6 100644 --- a/sapi/fpm/fpm/fpm_status.h +++ b/sapi/fpm/fpm/fpm_status.h @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #ifndef FPM_STATUS_H diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c index f5768cc5069..ba8f6d82130 100644 --- a/sapi/fpm/fpm/fpm_stdio.c +++ b/sapi/fpm/fpm/fpm_stdio.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -339,4 +338,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 1e16ec09568..7ebe80e66e7 100644 --- a/sapi/fpm/fpm/fpm_stdio.h +++ b/sapi/fpm/fpm/fpm_stdio.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_STDIO_H @@ -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 4927b02644c..efd05507c4d 100644 --- a/sapi/fpm/fpm/fpm_str.h +++ b/sapi/fpm/fpm/fpm_str.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_STR_H diff --git a/sapi/fpm/fpm/fpm_systemd.c b/sapi/fpm/fpm/fpm_systemd.c index 95d12c97f2f..31b6a3d27ae 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 3ee62177170..e978a7c7be4 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 b76dc88022e..3d0b9de98a0 100644 --- a/sapi/fpm/fpm/fpm_trace.c +++ b/sapi/fpm/fpm/fpm_trace.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -32,5 +31,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 269278eb93b..4ee021229db 100644 --- a/sapi/fpm/fpm/fpm_trace.h +++ b/sapi/fpm/fpm/fpm_trace.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_TRACE_H @@ -13,4 +12,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 7a8a4348294..1ecee23d261 100644 --- a/sapi/fpm/fpm/fpm_trace_mach.c +++ b/sapi/fpm/fpm/fpm_trace_mach.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -94,5 +93,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 e8e32e4719a..604882eff3a 100644 --- a/sapi/fpm/fpm/fpm_trace_pread.c +++ b/sapi/fpm/fpm/fpm_trace_pread.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #define _GNU_SOURCE @@ -63,4 +62,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 875170f6de3..a2a3d25e30e 100644 --- a/sapi/fpm/fpm/fpm_trace_ptrace.c +++ b/sapi/fpm/fpm/fpm_trace_ptrace.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -78,4 +77,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 ea5cdad6e29..6490a7b5baa 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -578,4 +577,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 cd7faf9d737..c65791f7ed4 100644 --- a/sapi/fpm/fpm/fpm_unix.h +++ b/sapi/fpm/fpm/fpm_unix.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_UNIX_H @@ -16,4 +15,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 472a684e935..e4ad73169d4 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.c +++ b/sapi/fpm/fpm/fpm_worker_pool.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_worker_pool.h b/sapi/fpm/fpm/fpm_worker_pool.h index b78afe65a5c..37f4e519949 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.h +++ b/sapi/fpm/fpm/fpm_worker_pool.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_WORKER_POOL_H @@ -54,4 +53,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 c507e931e52..09193fd5ac8 100644 --- a/sapi/fpm/fpm/zlog.c +++ b/sapi/fpm/fpm/zlog.c @@ -1,4 +1,3 @@ - /* (c) 2004-2007 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/zlog.h b/sapi/fpm/fpm/zlog.h index 4b9f732cdf6..6e96048d09c 100644 --- a/sapi/fpm/fpm/zlog.h +++ b/sapi/fpm/fpm/zlog.h @@ -1,4 +1,3 @@ - /* (c) 2004-2007 Andrei Nigmatulin */ #ifndef ZLOG_H diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in index a4d533c1972..8a541c08655 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 2ca9b1e5bc8..54f85bcfb60 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 25910a8e05e..eec65a41122 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 5965f130eb2..39005de5686 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 c3b6c83e597..70c03ad70f1 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 e744030de74..3f5b7ad14f8 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/lsapidef.h b/sapi/litespeed/lsapidef.h index 4db8ff562d9..f6c0cb02312 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 685892e7081..a93cdc345d2 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 1fd3f56176a..ff27c9cd943 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.h b/sapi/litespeed/lscriu.h index cc0186ef79f..02fc9b880a1 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 091b1e831c8..65377e608a6 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 e69ca455f79..9aca03dff6a 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 afc31a906ec..8d6ee8278ea 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 150647aa7eb..1f26f7983b4 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 d0b69d9b41e..deda272da2f 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 b86ea05da2f..3ca0ad8d376 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 081d864c5c9..dab0d27d85e 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 8a358008301..05659d81bfc 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 24e49d092c4..7331bd26c4f 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 ac6dc4434d2..f326230e5d4 100755 --- a/scripts/dev/gen_verify_stub +++ b/scripts/dev/gen_verify_stub @@ -48,4 +48,3 @@ do done exit 0 - diff --git a/server-tests-config.php b/server-tests-config.php index 645a5e8e982..ca01ffe1cbf 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 71820809399..3bd9eeaa708 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 5e4a85ea2e2..760cbecc8bb 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 70cb1156843..ba60e74a510 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 d229f8497fd..d30f2f83848 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 6f16f72cc25..5f3cf67f921 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 ef13733edc9..108f47db250 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash echo ' ' >> "./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 29ec59d9b6d..d52f3ef5b0d 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -265,4 +265,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 517db128bd1..37c449a059e 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 ff8025362ab..e76aff00008 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -259,4 +259,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 b49218b0f0c..523b024c064 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -351,4 +351,3 @@ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations might not work properly, if the chosen instruction sets are not available on the target \ processor.", "no"); toolset_setup_intrinsic_cflags(); - diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index ef72e6814da..b641c39f5f6 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -181,4 +181,3 @@ #ifdef __clang__ #define HAVE_FUNC_ATTRIBUTE_TARGET 1 #endif - diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 6acbfdfb865..72205fac34e 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -135,4 +135,3 @@ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations might not work properly, if the optimizations are not available on the target \ processor.", "no"); toolset_setup_intrinsic_cflags(); - diff --git a/win32/build/configure.tail b/win32/build/configure.tail index c06b03d3620..a836053444b 100644 --- a/win32/build/configure.tail +++ b/win32/build/configure.tail @@ -7,4 +7,3 @@ if (!MODE_PHPIZE && sapi_enabled.length < 1) { } generate_files(); - diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 0d64e68fa49..e85ed65642e 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3680,4 +3680,3 @@ function setup_verbosity() CMD_MOD2 = "@"; } } - diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index 794b9cb7106..a79885f0088 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 01d4d3a86bf..f326abf7d97 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 2010e0ca4cb..34861d148b3 100644 --- a/win32/cp_enc_map_gen.c +++ b/win32/cp_enc_map_gen.c @@ -1,4 +1,3 @@ - #include #include diff --git a/win32/param.h b/win32/param.h index 1601a3cc16b..552323c5b18 100644 --- a/win32/param.h +++ b/win32/param.h @@ -1,4 +1,3 @@ - /***************************************************************************** * * * sys/param.c *