diff options
459 files changed, 4810 insertions, 4812 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 085389f638..3e0efe8b67 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,7 +14,7 @@ cache: - c:\build-cache environment: - PHP_BUILD_CACHE_BASE_DIR: c:\build-cache + PHP_BUILD_CACHE_BASE_DIR: c:\build-cache PHP_BUILD_OBJ_DIR: c:\obj PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk PHP_BUILD_SDK_BRANCH: php-sdk-2.1.9beta1 @@ -5,7 +5,7 @@ end document set_ts set the ts resource, it is impossible for gdb to call ts_resource_ex while no process is running, - but we could get the resource from the argument + but we could get the resource from the argument of frame info. end @@ -153,7 +153,7 @@ end define printzv set $ind = 1 - ____printzv $arg0 0 + ____printzv $arg0 0 end document printzv @@ -190,7 +190,7 @@ define ____printzv_contents if $type == 6 printf "string: %s", $zvalue->value.str->val end - if $type == 7 + if $type == 7 printf "array: " if ! $arg1 set $ind = $ind + 1 @@ -287,7 +287,7 @@ define ____printzv if $arg1 ____printzv_contents $zcontents $arg1 else - ____printzv_contents $zcontents 0 + ____printzv_contents $zcontents 0 end end @@ -340,7 +340,7 @@ define ____print_ht set $n = $n - 1 end printf "[%d] ", $i - if $p->key + if $p->key printf "%s => ", $p->key->val else printf "%d => ", $p->h @@ -389,7 +389,7 @@ document print_htptr end define print_htstr - set $ind = 0 + set $ind = 0 ____print_ht $arg0 2 end @@ -543,10 +543,10 @@ define printzn if $znode->op_type == 1 set $optype = "IS_CONST" end - if $znode->op_type == 2 + if $znode->op_type == 2 set $optype = "IS_TMP_VAR" end - if $znode->op_type == 4 + if $znode->op_type == 4 set $optype = "IS_VAR" end if $znode->op_type == 8 @@ -576,11 +576,11 @@ end document printzn print type and content of znode. - usage: printzn &opline->op1 + usage: printzn &opline->op1 end define printzops - printf "op1 => " + printf "op1 => " printzn &execute_data->opline.op1 printf "op2 => " printzn &execute_data->opline.op2 diff --git a/.travis.yml b/.travis.yml index f1594bdc7b..8f04f0464f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ addons: - libt1-dev notifications: - email: + email: on_failure: change irc: template: @@ -61,7 +61,7 @@ before_script: - . ./travis/ext/pgsql/setup.sh - . ./travis/ext/pdo_pgsql/setup.sh -# Run PHPs run-tests.php +# Run PHPs run-tests.php script: - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 diff --git a/CODING_STANDARDS b/CODING_STANDARDS index 38e501339c..18c3be6058 100644 --- a/CODING_STANDARDS +++ b/CODING_STANDARDS @@ -113,7 +113,7 @@ User Functions/Methods Naming Conventions of ``parent_*``:: A family of 'foo' functions, for example: - + Good: 'foo_select_bar' 'foo_insert_baz' @@ -1,7 +1,7 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2018 The PHP Group. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions @@ -9,22 +9,22 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group@php.net. - + 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group@php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" - + 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -41,27 +41,27 @@ are met: "This product includes PHP software, freely available from <http://www.php.net/software/>". -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- +-------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group@php.net. -For more information on the PHP Group and the PHP project, +For more information on the PHP Group and the PHP project, please see <http://www.php.net>. PHP includes the Zend Engine, freely available at diff --git a/Makefile.gcov b/Makefile.gcov index e7c9c7054a..b290d777d8 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -62,7 +62,7 @@ php_lcov.info: lcov-test rm -rf lcov_data/$$dir ; \ fi; \ done - @echo + @echo @echo "Generating $@" @$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@ @@ -71,7 +71,7 @@ PHP NEWS - Standard: . Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open data connection). (Ville Hukkamäki) - . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with + . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with stream_socket_client). (Ville Hukkamäki) . Fixed bug #75533 (array_reduce is slow when $carry is large array). (Manabu Matsui) @@ -102,7 +102,7 @@ PHP NEWS . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji) - iconv: - . Fixed bug #68180 (iconv_mime_decode can return extra characters in a + . Fixed bug #68180 (iconv_mime_decode can return extra characters in a header). (cmb) . Fixed bug #63839 (iconv_mime_decode_headers function is skipping headers). (cmb) @@ -346,7 +346,7 @@ PHP NEWS . Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite). (Laruence) - SPL: - . Fixed bug #76131 (mismatch arginfo for splarray constructor). + . Fixed bug #76131 (mismatch arginfo for splarray constructor). (carusogabriel) - standard: @@ -428,7 +428,7 @@ PHP NEWS - Phar: . Fixed bug #54289 (Phar::extractTo() does not accept specific directories to be extracted). (bishop) - . Fixed bug #65414 (deal with leading slash while adding files correctly). + . Fixed bug #65414 (deal with leading slash while adding files correctly). (bishopb) . Fixed bug #65414 (deal with leading slash when adding files correctly). (bishopb) @@ -504,7 +504,7 @@ PHP NEWS . Fixed bug #75502 (Segmentation fault in zend_string_release). (Nikita) - SPL: - . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by + . Fixed bug #75717 (RecursiveArrayIterator does not traverse arrays by reference). (Nikita) . Fixed bug #75242 (RecursiveArrayIterator doesn't have constants from parent class). (Nikita) @@ -568,7 +568,7 @@ PHP NEWS (Remi) . Fixed bug #75535 (Inappropriately parsing HTTP response leads to PHP segment fault). (Nikita) - . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator + . Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator that getrandom() is missing). (sarciszewski) . Fixed bug #73124 (php_ini_scanned_files() not reporting correctly). (John Stevenson) @@ -623,7 +623,7 @@ PHP NEWS (Anatol) . Implemented minor optimization in array_keys/array_values(). (Sara) . Added PHP_OS_FAMILY constant to determine on which OS we are. (Jan Altensen) - . Fixed bug #73987 (Method compatibility check looks to original + . Fixed bug #73987 (Method compatibility check looks to original definition and not parent). (pmmaga) . Fixed bug #73991 (JSON_OBJECT_AS_ARRAY not respected). (Sara) . Fixed bug #74053 (Corrupted class entries on shutdown when a destructor @@ -653,7 +653,7 @@ PHP NEWS . Added new VM instuctions ISSET_ISEMPTY_CV and UNSET_CV. Previously they were implemented as ISSET_ISEMPTY_VAR and UNSET_VAR variants with ZEND_QUICK_SET flag. (Nikita, Dmitry) - . Fixed bug #49649 (unserialize() doesn't handle changes in property + . Fixed bug #49649 (unserialize() doesn't handle changes in property visibility). (pmmaga) . Fixed #74866 (extension_dir = "./ext" now use current directory for base). (Francois Laupretre) @@ -686,7 +686,7 @@ PHP NEWS - EXIF: . Added support for vendor specific tags for the following formats: - Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, AGFA, + Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, AGFA, Kyocera, Ricoh & Epson. (Kalle) . Fixed bug #72682 (exif_read_data() fails to read all data for some images). (Kalle) @@ -698,15 +698,15 @@ PHP NEWS reached for some cameras). (Kalle) . Fixed Redhat bug #1362571 (PHP not returning full results for exif_read_data function). (Kalle) - . Implemented #65187 (exif_read_data/thumbnail: add support for stream + . Implemented #65187 (exif_read_data/thumbnail: add support for stream resource). (Kalle) . Deprecated the read_exif_data() alias. (Kalle) - . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with + . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with correct exif format). (bradpiccho at gmail dot com, Kalle) . Fixed bug #72819 (EXIF thumbnails not read anymore). (Kalle) - . Fixed bug #62523 (php crashes with segfault when exif_read_data called). + . Fixed bug #62523 (php crashes with segfault when exif_read_data called). (Kalle) - . Fixed bug #50660 (exif_read_data(): Illegal IFD offset (works fine with + . Fixed bug #50660 (exif_read_data(): Illegal IFD offset (works fine with other exif readers). (skinny dot bravo at gmail dot com, Kalle) - Fileinfo: @@ -736,7 +736,7 @@ PHP NEWS . Fixed Bug #75284 (sha3 is not supported on bigendian machine). (Remi) - IMAP: - . Fixed bug #72324 (imap_mailboxmsginfo() return wrong size). + . Fixed bug #72324 (imap_mailboxmsginfo() return wrong size). (ronaldpoon at udomain dot com dot hk, Kalle) - Intl: @@ -841,7 +841,7 @@ PHP NEWS read-only/getter mode). (Yasuo) . Fixed bug #74936 (session_cache_expire/cache_limiter/save_path() trigger a warning in read mode). (morozov) - . Fixed bug #74941 (session fails to start after having headers sent). + . Fixed bug #74941 (session fails to start after having headers sent). (morozov) - Sodium: @@ -924,7 +924,7 @@ PHP NEWS . Fixed bug #75437 (Wrong reflection on imagewebp). (Fabien Villepinte) - intl: - . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead + . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead of destination). (andrewnester) - interbase: @@ -962,7 +962,7 @@ PHP NEWS . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea) . Fixed bug #75252 (Incorrect token formatting on two parse errors in one request). (Nikita) - . Fixed bug #75220 (Segfault when calling is_callable on parent). + . Fixed bug #75220 (Segfault when calling is_callable on parent). (andrewnester) . Fixed bug #75290 (debug info of Closures of internal functions contain garbage argument names). (Andrea) @@ -982,7 +982,7 @@ PHP NEWS optional). (cmb) - litespeed: - . Fixed bug #75248 (Binary directory doesn't get created when building + . Fixed bug #75248 (Binary directory doesn't get created when building only litespeed SAPI). (petk) . Fixed bug #75251 (Missing program prefix and suffix). (petk) @@ -1109,7 +1109,7 @@ PHP NEWS . Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results). (Laruence) . Fixed bug #74669 (Unserialize ArrayIterator broken). (Andrew Nester) - . Fixed bug #74977 (Appending AppendIterator leads to segfault). + . Fixed bug #74977 (Appending AppendIterator leads to segfault). (Andrew Nester) . Fixed bug #75015 (Crash in recursive iterator destructors). (Julien) @@ -1130,9 +1130,9 @@ PHP NEWS 03 Aug 2017, PHP 7.1.8 - Core: - . Fixed bug #74832 (Loading PHP extension with already registered function + . Fixed bug #74832 (Loading PHP extension with already registered function name leads to a crash). (jpauli) - . Fixed bug #74780 (parse_url() broken when query string contains colon). + . Fixed bug #74780 (parse_url() broken when query string contains colon). (jhdxr) . Fixed bug #74761 (Unary operator expected error on some systems). (petk) . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic) @@ -1141,7 +1141,7 @@ PHP NEWS . Fixed bug #74906 (fixed incorrect errno.h include). (petk) - Date: - . Fixed bug #74852 (property_exists returns true on unknown DateInterval + . Fixed bug #74852 (property_exists returns true on unknown DateInterval property). (jhdxr) - OCI8: @@ -1352,7 +1352,7 @@ PHP NEWS (Jakub Zelenka) - phar: - . Fixed bug #74383 (phar method parameters reflection correction). + . Fixed bug #74383 (phar method parameters reflection correction). (mhagstrand) - Readline: @@ -1524,7 +1524,7 @@ PHP NEWS . Fixed bug #72898 (PHP_FCGI_CHILDREN is not included in phpinfo()). (Anatol) - FPM: - . Fixed bug #69865 (php-fpm does not close stderr when using syslog). + . Fixed bug #69865 (php-fpm does not close stderr when using syslog). (m6w6) - GD: @@ -1532,7 +1532,7 @@ PHP NEWS - GMP: . Fixed bug #69993 (test for gmp.h needs to test machine includes). - (Jordan Gigov) + (Jordan Gigov) - Hash: . Added hash_hkdf() function. (Andrey Andreev) @@ -1566,7 +1566,7 @@ PHP NEWS . Implemented FR #72583 (All data are fetched as strings). (Dorin Marcoci) - PDO_PgSQL: - . Fixed bug #73959 (lastInsertId fails to throw an exception for wrong + . Fixed bug #73959 (lastInsertId fails to throw an exception for wrong sequence name). (andrewnester) - Phar: @@ -1630,7 +1630,7 @@ PHP NEWS - Mysqlnd: . Optimized handling of BIT fields - less memory copies and lower memory usage. (Andrey) - . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE). + . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE). (vanviegen) - Opcache: @@ -2136,7 +2136,7 @@ PHP NEWS - PCRE: . Fixed bug #73483 (Segmentation fault on pcre_replace_callback). (Laruence) . Fixed bug #73612 (preg_*() may leak memory). (cmb) - . Fixed bug #73392 (A use-after-free in zend allocator management). + . Fixed bug #73392 (A use-after-free in zend allocator management). (Laruence) . Fixed bug #73121 (Bundled PCRE doesn't compile because JIT isn't supported on s390). (Anatol) @@ -2232,7 +2232,7 @@ PHP NEWS . Implemented RFC: Session ID without hashing. (Yasuo) https://wiki.php.net/rfc/session-id-without-hashing . Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow). (Laruence) - . Custom session handlers that do not return strings for session IDs will + . Custom session handlers that do not return strings for session IDs will now throw an instance of Error instead of resulting in a fatal error when a function is called that must generate a session ID. (Aaron Piotrowski) @@ -2268,7 +2268,7 @@ PHP NEWS unserialize()). (Stas) - Soap: - . Fixed bug #73538 (SoapClient::__setSoapHeaders doesn't overwrite SOAP + . Fixed bug #73538 (SoapClient::__setSoapHeaders doesn't overwrite SOAP headers). (duncan3dc) . Fixed bug #73452 (Segfault (Regression for #69152)). (Dmitry) . Fixed bug #73037 (SoapServer reports Bad Request when gzipped). (Anatol) @@ -2276,7 +2276,7 @@ PHP NEWS (Keith Smiley) . Fixed bug #69137 (Peer verification fails when using a proxy with SoapClient) (Keith Smiley) - . Fixed bug #71711 (Soap Server Member variables reference bug). (Nikita) + . Fixed bug #71711 (Soap Server Member variables reference bug). (Nikita) . Fixed bug #71996 (Using references in arrays doesn't work like expected). (Nikita) diff --git a/README.EXT_SKEL b/README.EXT_SKEL index 5ac48ec4fa..7ec3f8e194 100644 --- a/README.EXT_SKEL +++ b/README.EXT_SKEL @@ -1,6 +1,6 @@ (NOTE: you may also want to take a look at the pear package PECL_Gen, a PHP-only alternative for this script that - supports way more extension writing tasks and is + supports way more extension writing tasks and is supposed to replace ext_skel completely in the long run ...) WHAT IT IS @@ -17,16 +17,16 @@ HOW TO USE IT ./ext_skel --extname=module_name - and everything you need is placed in directory module_name. + and everything you need is placed in directory module_name. - [ Note that GNU awk is likely required for this script to work. Debian - systems seem to default to using mawk, so you may need to change the + [ Note that GNU awk is likely required for this script to work. Debian + systems seem to default to using mawk, so you may need to change the #! line in skeleton/create_stubs and the cat $proto | awk line in ext_skel to use gawk explicitly. ] - If you don't need to test the existence of any external header files, - libraries or functions in them, the module is already almost ready to be - compiled in PHP. Just remove 3 comments in your_module_name/config.m4, + If you don't need to test the existence of any external header files, + libraries or functions in them, the module is already almost ready to be + compiled in PHP. Just remove 3 comments in your_module_name/config.m4, change back up to PHP sources top directory, and do ./buildconf; ./configure --enable-module_name; make @@ -83,7 +83,7 @@ FORMAT OF FUNCTION DEFINITIONS FILE ']'s as there where '['s. Currently, it does not harm if you forget to do it or there is a wrong amount of ']'s, but this may change in the future. - An additional short description may be added after the parameters. + An additional short description may be added after the parameters. If present it will be filled into the 'proto' header comments in the stubs code and the <refpurpose> tag in the XML documentation. @@ -135,7 +135,7 @@ CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES handled. For other types you must write the code yourself. And for type mixed, it wouldn't even be possible to write anything, because only you know what to expect. - + It can't handle correctly, and probably never will, variable list of of arguments. (void foo(int bar [, ...]) diff --git a/README.GIT-RULES b/README.GIT-RULES index d7143e6b9d..e34fc134f2 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -44,7 +44,7 @@ Having said that, here are the organizational rules:: Currently we have the following branches in use:: - master The active development branch. + master The active development branch. PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease version. @@ -110,7 +110,7 @@ The format of the commit messages is pretty simple. An Example from the git project (commit 2b34e486bc): pack-objects: Fix compilation with NO_PTHREDS - + It looks like commit 99fb6e04 (pack-objects: convert to use parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but hasn't noticed that the 'arg' variable no longer is available. diff --git a/README.NEW-OUTPUT-API b/README.NEW-OUTPUT-API index 2ba8ef0586..362f1671b9 100644 --- a/README.NEW-OUTPUT-API +++ b/README.NEW-OUTPUT-API @@ -3,7 +3,7 @@ $Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $ API adjustment to the old output control code: - Everything now resides beneath the php_output namespace, + Everything now resides beneath the php_output namespace, and there's an API call for every output handler op. Checking output control layers status: @@ -134,7 +134,7 @@ Output handler hooks Open questions Should the userland API be adjusted and unified? - + Many bits of the manual (and very first implementation) do not comply with the behaviour of the current (to be obsoleted) code, thus should the manual or the behaviour be adjusted? diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API index 7f3da76f80..95eaac6033 100644 --- a/README.PARAMETER_PARSING_API +++ b/README.PARAMETER_PARSING_API @@ -42,11 +42,11 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse Type specifiers --------------- - The following list shows the type specifier, its meaning and the parameter + The following list shows the type specifier, its meaning and the parameter types that need to be passed by address. All passed parameters are set - if the PHP parameter is non optional and untouched if optional and the + if the PHP parameter is non optional and untouched if optional and the parameter is not present. The only exception is O where the zend_class_entry* - has to be provided on input and is used to verify the PHP parameter is an + has to be provided on input and is used to verify the PHP parameter is an instance of that class. a - array (zval*) @@ -54,7 +54,7 @@ Type specifiers b - boolean (zend_bool) C - class (zend_class_entry*) d - double (double) - f - function or array containing php method call info (returned as + f - function or array containing php method call info (returned as zend_fcall_info and zend_fcall_info_cache) h - array (returned as HashTable*) H - array or HASH_OF(object) (returned as HashTable*) @@ -88,9 +88,9 @@ Type specifiers Note on 64bit compatibility --------------------------- -Please note that since version 7 PHP uses zend_long as integer type and -zend_string with size_t as length, so make sure you pass zend_longs to "l" -and size_t to strings length (i.e. for "s" you need to pass char * and size_t), +Please note that since version 7 PHP uses zend_long as integer type and +zend_string with size_t as length, so make sure you pass zend_longs to "l" +and size_t to strings length (i.e. for "s" you need to pass char * and size_t), not the other way round! Both mistakes might cause memory corruptions and segfaults: @@ -103,7 +103,7 @@ Both mistakes might cause memory corruptions and segfaults: int num; /* XXX THIS IS WRONG!! Use zend_long instead. */ zend_parse_parameters(ZEND_NUM_ARGS(), "l", &num) -If you're in doubt, use check_parameters.php script to the parameters +If you're in doubt, use check_parameters.php script to the parameters and their types (it can be found in ./scripts/dev/ directory of PHP sources): # php ./scripts/dev/check_parameters.php /path/to/your/sources/ @@ -152,7 +152,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!", /* Get either a set of 3 longs or a string. */ zend_long l1, l2, l3; char *s; -/* +/* * The function expects a pointer to a size_t in this case, not a long * or any other type. If you specify a type which is larger * than a 'size_t', the upper bits might not be initialized diff --git a/README.REDIST.BINS b/README.REDIST.BINS index 9779827534..b2536d05bc 100644 --- a/README.REDIST.BINS +++ b/README.REDIST.BINS @@ -46,7 +46,7 @@ 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. - + 6. ext/standard crypt's blowfish implementation @@ -92,7 +92,7 @@ http://www.usenix.org/events/usenix99/provos.html Some of the tricks in BF_ROUND might be inspired by Eric Young's Blowfish library (I can't be sure if I would think of something if I hadn't seen his code). - + 7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite @@ -126,7 +126,7 @@ Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30. Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, Copyright (C) 2000 - 2003, Richard J. Wagner -All rights reserved. +All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -139,8 +139,8 @@ are met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. The names of its contributors may not be used to endorse or promote - products derived from this software without specific prior written +3. The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -261,26 +261,26 @@ SUCH DAMAGE. 12. libxmlrpc ext/xmlrpc -Copyright 2000 Epinions, Inc. +Copyright 2000 Epinions, Inc. -Subject to the following 3 conditions, Epinions, Inc. permits you, free -of charge, to (a) use, copy, distribute, modify, perform and display this -software and associated documentation files (the "Software"), and (b) -permit others to whom the Software is furnished to do so as well. +Subject to the following 3 conditions, Epinions, Inc. permits you, free +of charge, to (a) use, copy, distribute, modify, perform and display this +software and associated documentation files (the "Software"), and (b) +permit others to whom the Software is furnished to do so as well. -1) The above copyright notice and this permission notice shall be included -without modification in all copies or substantial portions of the -Software. +1) The above copyright notice and this permission notice shall be included +without modification in all copies or substantial portions of the +Software. -2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF -ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY -IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE OR NONINFRINGEMENT. +2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF +ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY +IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE OR NONINFRINGEMENT. -3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT -OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING -NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH +3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING +NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES. 13. libzip ext/zip diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 112d5036c2..df6a9f514e 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -32,7 +32,7 @@ team (Bjori) on hand. 6. Verify the tags to be extra sure everything was tagged properly. 7. Moving extensions from/to PECL requires write access to the destination. -Most developers should have this. +Most developers should have this. Moving extensions from php-src to PECL - Checkout the pecl directory, most likely you want a sparse-root checkout @@ -125,7 +125,7 @@ Getting the non stable release (alpha/beta/RC) announced b. ``$PHP_x_RC_DATE`` = "06 September 2007" -3. Add a short notice to phpweb stating that there is a new release, and +3. Add a short notice to phpweb stating that there is a new release, and highlight the major important things (security fixes) and when it is important to upgrade. @@ -140,7 +140,7 @@ to upgrade. *Wait for web and qa sites to update with new information before sending announce* -5. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` +5. Send an email **To** ``internals@lists.php.net`` and ``php-general@lists.php.net`` lists pointing out "the location of the release" and "the possible release date of either the next RC, or the final release". Include in this information the verification information output by ``gen_verify_stub``. @@ -193,7 +193,7 @@ Check if the pear files are updated (phar). ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx`` 11. Commit and push all the tarballs and signature files to web/php-distributions.git, - then update the git submodule reference in web/php.git: + then update the git submodule reference in web/php.git: ``git submodule init; git submodule update; cd distributions; @@ -263,7 +263,7 @@ f.e. ``ChangeLog-5.php`` from the NEWS file IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/`` V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/`` - + e. You may want to try php-web/bin/news2html to automate this task 6. Add a short notice to phpweb stating that there is a new release, and @@ -338,7 +338,7 @@ New Release Manager Checklist one or more of the previous RMs sign your key. Publish your public key to pgp.mit.edu with: `gpg --keyserver pgp.mit.edu --send-keys $KEYID` -3. Request karma to eding main/php_version.h. Possibly karma for other restricted parts of +3. Request karma to eding main/php_version.h. Possibly karma for other restricted parts of php-src might come in question. 4. Request karma for web/qa.git and web/php.git for publishing release announcements. diff --git a/README.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS index 5287230e1a..0baf808604 100644 --- a/README.SELF-CONTAINED-EXTENSIONS +++ b/README.SELF-CONTAINED-EXTENSIONS @@ -23,7 +23,7 @@ PREPARING YOUR SYSTEM GNU libtool GNU m4 - All of these are available from + All of these are available from ftp://ftp.gnu.org/pub/gnu/ @@ -33,7 +33,7 @@ CONVERTING AN EXISTING EXTENSION extension, we will convert an embedded extension into a self-contained one. Install PHP and execute the following commands. - + $ mkdir /tmp/newext $ cd /tmp/newext @@ -56,7 +56,7 @@ CONVERTING AN EXISTING EXTENSION [--with-mysql=MYSQL-DIR] $ make install - The MySQL module will either use the embedded MySQL client + The MySQL module will either use the embedded MySQL client library or the MySQL installation in MYSQL-DIR. @@ -67,8 +67,8 @@ DEFINING THE NEW EXTENSION It consists of two source files "foo.c" and "bar.c" (and any arbitrary amount of header files, but that is not important here). - - The demo extension does not reference any external + + The demo extension does not reference any external libraries (that is important, because the user does not need to specify anything). @@ -78,7 +78,7 @@ DEFINING THE NEW EXTENSION CREATING THE M4 CONFIGURATION FILE - The m4 configuration can perform additional checks. For a + The m4 configuration can perform additional checks. For a self-contained extension, you do not need more than a few macro calls. @@ -97,7 +97,7 @@ fi The first argument of PHP_NEW_EXTENSION describes the name of the extension. The second names the source-code files. The third passes $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION. - + Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not plan to distribute your module with PHP, these facilities allow you to integrate your module easily into the main PHP module framework. @@ -138,7 +138,7 @@ INSTALLING A SELF-CONTAINED EXTENSION ADDING SHARED MODULE SUPPORT TO A MODULE In order to be useful, a self-contained extension must be loadable - as a shared module. I will explain now how you can add shared module + as a shared module. I will explain now how you can add shared module support to an existing module called foo. 1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will diff --git a/README.STREAMS b/README.STREAMS index e95950bde0..99779d60a4 100644 --- a/README.STREAMS +++ b/README.STREAMS @@ -28,7 +28,7 @@ The main functions are: PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count); PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t count); -PHPAPI size_t php_stream_printf(php_stream * stream, +PHPAPI size_t php_stream_printf(php_stream * stream, const char * fmt, ...); PHPAPI int php_stream_eof(php_stream * stream); PHPAPI int php_stream_getc(php_stream * stream); @@ -63,7 +63,7 @@ Where: file/URL, use this option to arrange for the stream to be copied (if needed) into a stream that can be seek()ed. - + opened_path is used to return the path of the actual file opened, but if you used STREAM_MUST_SEEK, may not be valid. You are responsible for efree()ing opened_path. opened_path may be (and usually @@ -95,7 +95,7 @@ PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short po PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent, struct timeval *timeout); Open a UNIX domain socket. - + Stream Utilities ================ @@ -246,7 +246,7 @@ PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode) { FILE * fp = fopen(filename, mode); php_stream * ret; - + if (fp) { ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode); if (ret) @@ -347,7 +347,7 @@ static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count) else return 0; } - + /* pull out some data from the stream and put it in buf */ ... mysql_fetch_row(state->result) ... /* we could do something strange, like format the data as XML here, diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH index bdd46a22f8..be14a97bc3 100644 --- a/README.SUBMITTING_PATCH +++ b/README.SUBMITTING_PATCH @@ -128,7 +128,7 @@ How to create your PHP, PHP Documentation or PECL patch ------------------------------------------------------- PHP and most PECL packages use Git for revision control. Some PECL packages use Subversion (SVN) Read http://www.php.net/git.php for help -on using Git to get and build PHP source code. We recommend to look +on using Git to get and build PHP source code. We recommend to look at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ https://wiki.php.net/vcs/gitfaq. diff --git a/README.TESTING b/README.TESTING index 719105daba..fb0118bfe3 100644 --- a/README.TESTING +++ b/README.TESTING @@ -9,7 +9,7 @@ it failed on your system without providing substantial backup information on *why* the test failed on your special setup. Thank you :-) -[Testing Basics] +[Testing Basics] ---------------- The easiest way to test your PHP build is to run "make test" from the command line after successfully compiling. This will run the complete @@ -36,7 +36,7 @@ If you are running the run-tests.php script from the command line (as above) you must set the TEST_PHP_EXECUTABLE environment variable to explicitly select the PHP executable that is to be tested, that is, used to run the test scripts. -If you run the tests using make test, the PHP CLI and CGI executables are +If you run the tests using make test, the PHP CLI and CGI executables are automatically set for you. "make test" executes "run-tests.php" script with the CLI binary. Some test scripts such as session must be executed by CGI SAPI. Therefore, you must build PHP with CGI SAPI to perform all tests. @@ -62,7 +62,7 @@ from the source root and any subdirectories below. If there are files, which have a "phpt" extension, "run-tests.php" looks at the sections in these files, determines whether it should run it, by evaluating the 'SKIP' section. If the test is eligible for execution, the 'FILE' -section is extracted into a ".php" file (with the same name besides +section is extracted into a ".php" file (with the same name besides the extension) and gets executed. When an argument is given or TESTS environment variable is set, the GLOB is expanded by the shell and any file with extension "*.phpt" is @@ -77,9 +77,9 @@ Examples: [Test results] -------------- - Test results are printed to standard output. If there is a failed test, + Test results are printed to standard output. If there is a failed test, the "run-tests.php" script saves the result, the expected result and the -code executed to the test script directory. For example, if +code executed to the test script directory. For example, if ext/myext/tests/myext.phpt fails to pass, the following files are created: ext/myext/tests/myext.php - actual test file executed @@ -151,20 +151,20 @@ advised to test for non-zero, rather then a specific value. [Creating new test files] ------------------------- - Writing test file is very easy if you are used to PHP. + Writing test file is very easy if you are used to PHP. See the HOWTO at http://qa.php.net/write-test.php [How to help us] ---------------- - If you find bug in PHP, you can submit bug report AND test script + If you find bug in PHP, you can submit bug report AND test script for us. You don't have to write complete script, just give us test script with following format. Please test the script and make sure you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you submit. <?php -/* +/* Bug #12345 substr() bug. Do not return expected string. diff --git a/README.TESTING2 b/README.TESTING2 index 34f7e83327..88a6e4c985 100644 --- a/README.TESTING2 +++ b/README.TESTING2 @@ -1,13 +1,13 @@ [IMPORTANT NOTICE] ------------------ -This is an addendum to README.TESTING with additional information +This is an addendum to README.TESTING with additional information specific to server-tests.php. server-tests.php is backward compatible with tests developed for the original run-tests.php script. server-tests is *not* used by 'make test'. server-tests was developed to provide support for testing PHP under it's primary environment, HTTP, and can run the -PHP tests under any of the SAPI modules that are direct executables, +PHP tests under any of the SAPI modules that are direct executables, or are accessible via HTTP. [New features] @@ -25,7 +25,7 @@ or are accessible via HTTP. can be configured to run test scripts through an HTTP server running on localhost. localhost is required since either the web server must alias a directory to the php source directory, or the test scripts - must be copied to a directory under the web server + must be copied to a directory under the web server (see config options TEST_WEB_BASE_URL, TEST_BASE_PATH, and TEST_WEB_EXT) * New sections supported for test files (see below) @@ -49,7 +49,7 @@ Some (but not all!) examples of usage: 4. run tests over http, php sources have been aliased in web server php server-tests.php -w -u http://localhost/test - + 5. run tests using configuration file php server-tests.php -c /path/to/server-tests-config.php @@ -59,10 +59,10 @@ Some (but not all!) examples of usage: NOTE: configuration as described in README.TESTING still works. -[New Test Sections] +[New Test Sections] ---------------- -In addition to the traditional test sections -(see http://qa.php.net/write-test.php), several new sections are available +In addition to the traditional test sections +(see http://qa.php.net/write-test.php), several new sections are available under server-tests. --POST-- @@ -78,7 +78,7 @@ in the test file. Not used for anything, just a section for documenting the test --ENV-- -This section get's eval()'d to help build an environment for the +This section get's eval()'d to help build an environment for the execution of the test. This can be used to change environment vars that are used for CGI emulation, or simply to set env vars for cli testing. A full example looks like: diff --git a/README.input_filter b/README.input_filter index be260013ac..adbfc70e5b 100644 --- a/README.input_filter +++ b/README.input_filter @@ -12,7 +12,7 @@ enforced. It is implemented as a SAPI hook and is called from the treat_data and post handler functions. To implement your own security policy you will need to write a standard PHP extension. There is also a powerful standard implementation in ext/filter that should suit most -peoples' needs. However, if you want to implement your own security +peoples' needs. However, if you want to implement your own security policy, read on. A simple implementation might look like the following. This stores the diff --git a/TSRM/build.mk b/TSRM/build.mk index f98109fa06..70ef4b8cc3 100644 --- a/TSRM/build.mk +++ b/TSRM/build.mk @@ -5,7 +5,7 @@ # # Written by Sascha Schumann # -# $Id$ +# $Id$ LT_TARGETS = ltmain.sh ltconfig @@ -34,7 +34,7 @@ aclocal.m4: configure.ac acinclude.m4 aclocal $(config_h_in): configure.ac -# explicitly remove target since autoheader does not seem to work +# explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader diff --git a/TSRM/configure.ac b/TSRM/configure.ac index 8bf35d33b0..0f6d53dc8d 100644 --- a/TSRM/configure.ac +++ b/TSRM/configure.ac @@ -12,10 +12,10 @@ AH_TOP([ ]) sinclude(tsrm.m4) - + TSRM_BASIC_CHECKS TSRM_THREADS_CHECKS - + AM_PROG_LIBTOOL if test "$enable_debug" != "yes"; then AM_SET_LIBTOOL_VARIABLE([--silent]) diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 index 57b46f251a..95b51e48d8 100644 --- a/TSRM/threads.m4 +++ b/TSRM/threads.m4 @@ -1,17 +1,17 @@ dnl Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved. -dnl +dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted provided that the following conditions dnl are met: -dnl +dnl dnl 1. Redistributions of source code must retain the above copyright dnl notice, this list of conditions and the following disclaimer. -dnl +dnl dnl 2. Redistributions in binary form must reproduce the above copyright dnl notice, this list of conditions and the following disclaimer in dnl the documentation and/or other materials provided with the dnl distribution. -dnl +dnl dnl THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY dnl EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -97,7 +97,7 @@ dnl -Kthread UDK cc (UnixWare) dnl -mt WorkShop cc (Solaris) dnl -mthreads gcc (AIX) dnl -pthread gcc (Linux, FreeBSD, NetBSD, OpenBSD) -dnl -pthreads gcc (Solaris) +dnl -pthreads gcc (Solaris) dnl -qthreaded AIX cc V5 dnl -threads gcc (HP-UX) dnl @@ -117,7 +117,7 @@ else AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[ ac_cv_pthreads_cflags= if test "$pthreads_working" != "yes"; then - for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do + for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do ac_save=$CFLAGS CFLAGS="$CFLAGS $flag" PTHREADS_CHECK_COMPILE diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 98aa2b8c91..27caf1bab9 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -1,6 +1,6 @@ m4_include([TSRM/m4/gethostbyname.m4]) -dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND) +dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND) AC_DEFUN([TSRM_CHECK_GCC_ARG],[ gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_) AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [ @@ -75,12 +75,12 @@ AC_DEFUN([TSRM_CHECK_ST],[ sinclude(threads.m4) AC_DEFUN([TSRM_CHECK_PTHREADS],[ - + PTHREADS_CHECK -if test "$beos_threads" = "1"; then +if test "$beos_threads" = "1"; then AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads) -else +else if test "$pthreads_working" != "yes"; then AC_MSG_ERROR(Your system seems to lack POSIX threads.) fi @@ -180,7 +180,7 @@ PHP 8.0. . The each() function has been deprecated, use a foreach loop instead. . The $errcontext error handler argument has been deprecated. However, using it does not trigger a deprecation warning for technical reasons. - + - EXIF: . The read_exif_data() alias has been deprecated, use exif_read_data() instead. @@ -210,14 +210,14 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2 ======================================== - Standard: - . password_hash() can generate Argon2i hashes when the algorithm is set to PASSWORD_ARGON2I. - When using PASSWORD_ARGON2I, the following cost factors may be set: 'memory_cost', 'time_cost', - and 'threads'. These cost factors will default to 'PASSWORD_ARGON2_DEFAULT_MEMORY_COST', + . password_hash() can generate Argon2i hashes when the algorithm is set to PASSWORD_ARGON2I. + When using PASSWORD_ARGON2I, the following cost factors may be set: 'memory_cost', 'time_cost', + and 'threads'. These cost factors will default to 'PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 'PASSWORD_ARGON2_DEFAULT_TIME_COST', and 'PASSWORD_ARGON2_DEFAULT_THREADS' respectively if not set. . password_verify() can verify Argon2i hashes. . password_get_info() and password_needs_rehash() can accept Argon2i hashes. . mail()/mb_send_mail() accept array $extra_header. Array parameter is checked against RFC 2822. - Array format is + Array format is $extra_headers = [ 'Header-Name' => 'Header value', 'Multiple' => ['One header', 'Another header'], @@ -290,10 +290,10 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2 ======================================== - EXIF: - . Added extended exif tag support for the following formats: - Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, + . Added extended exif tag support for the following formats: + Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, AGFA, Kyocera, Ricoh & Epson. - . exif_read_data() and exif_thumbnail() now supports a passed streams as their + . exif_read_data() and exif_thumbnail() now supports a passed streams as their first parameter. - GD: diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 0772009bbe..2d613f7d61 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -31,7 +31,7 @@ PHP 7.2 INTERNALS UPGRADE NOTES The internal randomness source on Windows switched to use CNG API. c. nice() now have a Windows alternative that is implemented in win32/nice.c, using - SetPriorityClass(). See the implementation for more in-depth details. This also + SetPriorityClass(). See the implementation for more in-depth details. This also defines HAVE_NICE. d. ZEND_ACC_CLONE is removed, but was not used in previous versions diff --git a/Zend/LICENSE b/Zend/LICENSE index 8acb9af4f8..51f5cccde9 100644 --- a/Zend/LICENSE +++ b/Zend/LICENSE @@ -1,25 +1,25 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The Zend Engine License, Version 2.00 Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The names "Zend" and "Zend Engine" must not be used to endorse or promote products derived from this software without prior permission from Zend Technologies Ltd. For written permission, - please contact license@zend.com. - + please contact license@zend.com. + 4. Zend Technologies Ltd. may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -40,9 +40,9 @@ are met: software must display the following acknowledgment: "The Zend Engine is freely available at http://www.zend.com" -THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZEND TECHNOLOGIES LTD. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT @@ -53,4 +53,4 @@ 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/Zend/README.ZEND_VM b/Zend/README.ZEND_VM index de66110d64..bf5f57cffc 100644 --- a/Zend/README.ZEND_VM +++ b/Zend/README.ZEND_VM @@ -21,7 +21,7 @@ ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>) <OPCODE-NUMBER> is a opcode number (0, 1, ...) <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :) <OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer -will generate code only for defined combination of types. You can use any +will generate code only for defined combination of types. You can use any combination of the following op_types UNUSED, CONST, VAR, TMP and CV also you can use ANY mask to disable specialization according operand's op_type. <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the @@ -34,9 +34,9 @@ EXECUTE_DATA execute_data ZEND_VM_DISPATCH_TO_HANDLER(<OP>) return <OP>_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) -ZEND_VM_DISPATCH_TO_HELPER(<NAME>) +ZEND_VM_DISPATCH_TO_HELPER(<NAME>) return <NAME>(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) -ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) +ZEND_VM_DISPATCH_TO_HELPER_EX(<NAME>,<PARAM>,<VAL>) return <NAME>(<VAL>, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) ZEND_VM_CONTINUE() return 0 @@ -72,7 +72,7 @@ FREE_OP<X>_VAR_PTR() FREE_VAR_PTR(free_op<X>) -Executor's helpers can be defined without parameters or with one parameter. +Executor's helpers can be defined without parameters or with one parameter. This is done with the following constructs: ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>) @@ -86,13 +86,13 @@ ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>) } Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h -and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and -zend_vm_execute.h. The first file is a list of opcode definitions. It is +and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and +zend_vm_execute.h. The first file is a list of opcode definitions. It is included from zend_compile.h. The second one is an executor code itself. It is included from zend_execute.c. -zend_vm_gen.php can produce different kind of executors. You can select -different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can +zend_vm_gen.php can produce different kind of executors. You can select +different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can disable opcode specialization using --without-specializer. You can include or exclude old executor together with specialized one using --without-old-executor. At last you can debug executor using original zend_vm_def.h or generated file diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 7a01c0b036..cd55e600ab 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -7,10 +7,10 @@ dnl AC_DEFUN([LIBZEND_CHECK_INT_TYPE],[ AC_MSG_CHECKING(for $1) AC_TRY_COMPILE([ -#if HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#if HAVE_INTTYPES_H +#if HAVE_INTTYPES_H #include <inttypes.h> #elif HAVE_STDINT_H #include <stdint.h> @@ -137,7 +137,7 @@ int main() ], [ AC_MSG_RESULT(no) ]) - + ]) AC_DEFUN([LIBZEND_ENABLE_DEBUG],[ @@ -147,7 +147,7 @@ AC_ARG_ENABLE(debug, ZEND_DEBUG=$enableval ],[ ZEND_DEBUG=no -]) +]) ]) @@ -158,10 +158,10 @@ AC_ARG_ENABLE(maintainer-zts, ZEND_MAINTAINER_ZTS=$enableval ],[ ZEND_MAINTAINER_ZTS=no -]) +]) AC_ARG_ENABLE(inline-optimization, -[ --disable-inline-optimization +[ --disable-inline-optimization If building zend_execute.lo fails, try this switch],[ ZEND_INLINE_OPTIMIZATION=$enableval ],[ @@ -196,7 +196,7 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then AC_DEFINE(ZTS,1,[ ]) CFLAGS="$CFLAGS -DZTS" LIBZEND_CPLUSPLUS_CHECKS -fi +fi changequote({,}) if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then @@ -249,7 +249,7 @@ int main() } fp = fopen("conftest.zend", "w"); - fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros); + fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros); fclose(fp); exit(0); @@ -258,7 +258,7 @@ int main() LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2` AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT, $LIBZEND_MM_ALIGN, [ ]) - AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) + AC_DEFINE_UNQUOTED(ZEND_MM_ALIGNMENT_LOG2, $LIBZEND_MM_ALIGN_LOG2, [ ]) ], [], [ dnl cross-compile needs something here LIBZEND_MM_ALIGN=8 @@ -374,7 +374,7 @@ AC_ARG_ENABLE(zend-signals, ZEND_SIGNALS=$enableval ],[ ZEND_SIGNALS=yes -]) +]) AC_CHECK_FUNC(sigaction, [ AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available]) @@ -395,24 +395,24 @@ AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[ ]) -AC_MSG_CHECKING(whether /dev/urandom exists) -if test -r "/dev/urandom" && test -c "/dev/urandom"; then +AC_MSG_CHECKING(whether /dev/urandom exists) +if test -r "/dev/urandom" && test -c "/dev/urandom"; then AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(whether /dev/arandom exists) -if test -r "/dev/arandom" && test -c "/dev/arandom"; then +AC_MSG_CHECKING(whether /dev/arandom exists) +if test -r "/dev/arandom" && test -c "/dev/arandom"; then AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi AC_ARG_ENABLE(gcc-global-regs, -[ --disable-gcc-global-regs +[ --disable-gcc-global-regs whether to enable GCC global register variables],[ ZEND_GCC_GLOBAL_REGS=$enableval ],[ diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 index 32a39891c1..a8a4828e5a 100644 --- a/Zend/acinclude.m4 +++ b/Zend/acinclude.m4 @@ -7,7 +7,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[ # min: 2.4 (i.e. 204, major * 100 + minor for easier comparison) bison_version_min="204" # non-working versions, e.g. "3.0 3.2"; - # remove "none" when introducing the first incompatible bison version an + # remove "none" when introducing the first incompatible bison version an # separate any following additions by spaces bison_version_exclude="" @@ -139,7 +139,7 @@ AC_DEFUN([ZEND_CHECK_FLOAT_PRECISION],[ else AC_MSG_RESULT(no) fi - + AC_MSG_CHECKING([for usable fpsetprec]) AC_TRY_LINK([ #include <machine/ieeefp.h> diff --git a/Zend/bench.php b/Zend/bench.php index 5f771803cc..c694361870 100644 --- a/Zend/bench.php +++ b/Zend/bench.php @@ -5,18 +5,18 @@ if (function_exists("date_default_timezone_set")) { function simple() { $a = 0; - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) $a++; $thisisanotherlongname = 0; - for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) + for ($thisisalongname = 0; $thisisalongname < 1000000; $thisisalongname++) $thisisanotherlongname++; } /****/ function simplecall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) strlen("hallo"); } @@ -26,14 +26,14 @@ function hallo($a) { } function simpleucall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) hallo("hallo"); } /****/ function simpleudcall() { - for ($i = 0; $i < 1000000; $i++) + for ($i = 0; $i < 1000000; $i++) hallo2("hallo"); } diff --git a/Zend/build.mk b/Zend/build.mk index 702cb647e9..b3313a2de9 100644 --- a/Zend/build.mk +++ b/Zend/build.mk @@ -5,7 +5,7 @@ # # Written by Sascha Schumann # -# $Id$ +# $Id$ LT_TARGETS = ltmain.sh ltconfig @@ -34,7 +34,7 @@ aclocal.m4: configure.ac acinclude.m4 aclocal $(config_h_in): configure.ac -# explicitly remove target since autoheader does not seem to work +# explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader diff --git a/Zend/micro_bench.php b/Zend/micro_bench.php index 70525882eb..ef6dd4f7b2 100644 --- a/Zend/micro_bench.php +++ b/Zend/micro_bench.php @@ -4,12 +4,12 @@ function hallo() { } function simpleucall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) hallo(); } function simpleudcall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) hallo2(); } @@ -17,7 +17,7 @@ function hallo2() { } function simpleicall($n) { - for ($i = 0; $i < $n; $i++) + for ($i = 0; $i < $n; $i++) func_num_args(); } diff --git a/Zend/tests/closures/closure_from_callable.inc b/Zend/tests/closures/closure_from_callable.inc index 5f0f220974..22a1fa9930 100644 --- a/Zend/tests/closures/closure_from_callable.inc +++ b/Zend/tests/closures/closure_from_callable.inc @@ -26,7 +26,7 @@ class Foo { return $param1; } - + private static function privateStaticFunction($param1) { return $param1; @@ -41,18 +41,18 @@ class Foo { return $param1; } - + protected function protectedInstanceFunc($param1) { return $param1; } - - + + public function publicInstanceFunc($param1) { return $param1; } - + public function closePrivateValid() { return Closure::fromCallable([$this, 'privateInstanceFunc']); @@ -87,23 +87,23 @@ class Foo class SubFoo extends Foo { - + public function closePrivateStaticInvalid() { return Closure::fromCallable([__CLASS__, 'privateStaticFunction']); } - - + + public function closePrivateInvalid() { return Closure::fromCallable([$this, 'privateInstanceFunc']); } - + public function closeProtectedStaticMethod() { return Closure::fromCallable([__CLASS__, 'protectedStaticFunction']); } - + public function closeProtectedValid() { return Closure::fromCallable([$this, 'protectedInstanceFunc']); @@ -113,13 +113,13 @@ class SubFoo extends Foo { { return Closure::fromCallable('parent::publicInstanceFunc'); } - + public function getSelfColonParentPublicInstanceMethod() { return Closure::fromCallable('self::publicInstanceFunc'); } - - + + public function getSelfColonParentProtectedInstanceMethod() { return Closure::fromCallable('self::protectedInstanceFunc'); diff --git a/Zend/tests/list_keyed_evaluation_order.inc b/Zend/tests/list_keyed_evaluation_order.inc index 490a6d84fe..d4ee778b63 100644 --- a/Zend/tests/list_keyed_evaluation_order.inc +++ b/Zend/tests/list_keyed_evaluation_order.inc @@ -47,7 +47,7 @@ class IndexableRetrievable { private $label; private $indexable; - + public function __construct(string $label, Indexable $indexable) { $this->label = $label; $this->indexable = $indexable; diff --git a/Zend/zend.c b/Zend/zend.c index 6ee1a017b8..76f1b69447 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1356,7 +1356,7 @@ ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const c { va_list va; char *message = NULL; - + if (exception_ce) { if (!instanceof_function(exception_ce, zend_ce_error)) { zend_error(E_NOTICE, "Error exceptions must be derived from Error"); diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 7c4ae7a615..600520552c 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -239,7 +239,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(zend_boo zend_internal_argument_count_error( throw_ || ZEND_ARG_USES_STRICT_TYPES(), - "%s%s%s() expects %s %d parameter%s, %d given", + "%s%s%s() expects %s %d parameter%s, %d given", class_name, \ class_name[0] ? "::" : "", \ ZSTR_VAL(active_function->common.function_name), @@ -2293,7 +2293,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio } if (reg_function->common.arg_info && - (reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { + (reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { /* convert "const char*" class type names into "zend_string*" */ uint32_t i; uint32_t num_args = reg_function->common.num_args + 1; @@ -3134,7 +3134,7 @@ get_function_via_handler: (!fcc->function_handler->common.scope || !instanceof_function(ce_org, fcc->function_handler->common.scope))) { if (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { - if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && + if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && fcc->function_handler->common.function_name) { zend_string_release(fcc->function_handler->common.function_name); } @@ -3361,7 +3361,7 @@ again: ((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) { - if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && + if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && fcc->function_handler->common.function_name) { zend_string_release(fcc->function_handler->common.function_name); } @@ -3420,7 +3420,7 @@ again: ((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) { - if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && + if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION && fcc->function_handler->common.function_name) { zend_string_release(fcc->function_handler->common.function_name); } diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 93ec2f834e..e3ab221e1f 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -64,7 +64,7 @@ typedef struct _zend_mm_debug_info { } zend_mm_debug_info; # define ZEND_MM_OVERHEAD ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_debug_info)) -#else +#else # define ZEND_MM_OVERHEAD 0 #endif @@ -383,7 +383,7 @@ static void apc_init_heap(void) // Preallocate properly aligned SHM chunks (64MB) tmp_data.mem = shm_memalign(ZEND_MM_CHUNK_SIZE, ZEND_MM_CHUNK_SIZE * 32); - + // Initialize temporary storage data tmp_data.free_pages = 0; @@ -396,7 +396,7 @@ static void apc_init_heap(void) zend_hash_init(apc_ht, 64, NULL, ZVAL_PTR_DTOR, 0); zend_mm_set_heap(old_heap); } - + */ END_EXTERN_C() diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 8cd0207e46..9c5902b1bc 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -484,7 +484,7 @@ ZEND_FUNCTION(func_get_args) q = p; if (EXPECTED(Z_TYPE_INFO_P(q) != IS_UNDEF)) { ZVAL_DEREF(q); - if (Z_OPT_REFCOUNTED_P(q)) { + if (Z_OPT_REFCOUNTED_P(q)) { Z_ADDREF_P(q); } } else { @@ -500,7 +500,7 @@ ZEND_FUNCTION(func_get_args) q = p; if (EXPECTED(Z_TYPE_INFO_P(q) != IS_UNDEF)) { ZVAL_DEREF(q); - if (Z_OPT_REFCOUNTED_P(q)) { + if (Z_OPT_REFCOUNTED_P(q)) { Z_ADDREF_P(q); } } else { @@ -1279,7 +1279,7 @@ ZEND_FUNCTION(method_exists) Z_PARAM_ZVAL(klass) Z_PARAM_STR(method_name) ZEND_PARSE_PARAMETERS_END(); - + if (Z_TYPE_P(klass) == IS_OBJECT) { ce = Z_OBJCE_P(klass); } else if (Z_TYPE_P(klass) == IS_STRING) { diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 95d93903de..f1dd49a223 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1278,7 +1278,7 @@ static void zend_mark_function_as_generator() /* {{{ */ if (ZEND_TYPE_CODE(return_info.type) != IS_ITERABLE) { const char *msg = "Generators may only declare a return type of Generator, Iterator, Traversable, or iterable, %s is not permitted"; - + if (!ZEND_TYPE_IS_CLASS(return_info.type)) { zend_error_noreturn(E_COMPILE_ERROR, msg, zend_get_type_by_const(ZEND_TYPE_CODE(return_info.type))); } @@ -1947,7 +1947,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len) static void zend_adjust_for_fetch_type(zend_op *opline, uint32_t type) /* {{{ */ { zend_uchar factor = (opline->opcode == ZEND_FETCH_STATIC_PROP_R) ? 1 : 3; - + if (opline->opcode == ZEND_FETCH_THIS) { return; } @@ -2185,7 +2185,7 @@ static void zend_emit_tick(void) /* {{{ */ if (CG(active_op_array)->last && CG(active_op_array)->opcodes[CG(active_op_array)->last - 1].opcode == ZEND_TICKS) { return; } - + opline = get_next_op(CG(active_op_array)); opline->opcode = ZEND_TICKS; @@ -2612,7 +2612,7 @@ static zend_op *zend_compile_simple_var_no_cv(znode *result, zend_ast *ast, uint opline = zend_emit_op(result, ZEND_FETCH_R, &name_node, NULL); } - if (name_node.op_type == IS_CONST && + if (name_node.op_type == IS_CONST && zend_is_auto_global(Z_STR(name_node.u.constant))) { opline->extended_value = ZEND_FETCH_GLOBAL; @@ -4968,7 +4968,7 @@ void zend_compile_switch(zend_ast *ast) /* {{{ */ } else if (expr_node.op_type == IS_CONST && Z_TYPE(expr_node.u.constant) == IS_TRUE) { jmpnz_opnums[i] = zend_emit_cond_jump(ZEND_JMPNZ, &cond_node, 0); - } else { + } else { opline = zend_emit_op(NULL, ZEND_CASE, &expr_node, &cond_node); SET_NODE(opline->result, &case_node); if (opline->op1_type == IS_CONST) { @@ -4992,7 +4992,7 @@ void zend_compile_switch(zend_ast *ast) /* {{{ */ if (jumptable) { zval *cond_zv = zend_ast_get_zval(cond_ast); zval jmp_target; - ZVAL_LONG(&jmp_target, get_next_op_number(CG(active_op_array))); + ZVAL_LONG(&jmp_target, get_next_op_number(CG(active_op_array))); ZEND_ASSERT(Z_TYPE_P(cond_zv) == jumptable_type); if (Z_TYPE_P(cond_zv) == IS_LONG) { @@ -5166,7 +5166,7 @@ void zend_compile_try(zend_ast *ast) /* {{{ */ if (finally_ast) { zend_loop_var discard_exception; uint32_t opnum_jmp = get_next_op_number(CG(active_op_array)) + 1; - + /* Pop FAST_CALL from unwind stack */ zend_stack_del_top(&CG(loop_var_stack)); @@ -5417,7 +5417,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */ uint32_t i; zend_op_array *op_array = CG(active_op_array); zend_arg_info *arg_infos; - + if (return_type_ast) { zend_bool allow_null = 0; @@ -5560,7 +5560,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */ "with a float type can only be float, integer, or NULL"); } break; - + case IS_ITERABLE: if (Z_TYPE(default_node.u.constant) != IS_ARRAY) { zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters " @@ -5572,7 +5572,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */ zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters " "with an object type can only be NULL"); break; - + default: if (!ZEND_SAME_FAKE_TYPE(ZEND_TYPE_CODE(arg_info->type), Z_TYPE(default_node.u.constant))) { zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters " @@ -5605,7 +5605,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */ } else { opline->op2.num = -1; } - } + } } /* These are assigned at the end to avoid unitialized memory in case of an error */ @@ -7856,7 +7856,7 @@ static void zend_compile_encaps_list(znode *result, zend_ast *ast) /* {{{ */ i = ((j * sizeof(zend_string*)) + (sizeof(zval) - 1)) / sizeof(zval); while (i > 1) { get_temporary_variable(CG(active_op_array)); - i--; + i--; } zend_end_live_range(CG(active_op_array), range, opline - CG(active_op_array)->opcodes, diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 1101214e88..ad438f6dea 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -566,7 +566,7 @@ static inline zval *_get_zval_ptr_ptr(int op_type, znode_op node, zend_free_op * } static zend_always_inline zval *_get_obj_zval_ptr_unused(EXECUTE_DATA_D) -{ +{ return &EX(This); } @@ -944,7 +944,7 @@ static ZEND_COLD void zend_verify_return_error( zend_verify_type_error_common( zf, arg_info, ce, value, - &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); + &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); zend_type_error("Return value of %s%s%s() must %s%s%s, %s%s returned", fclass, fsep, fname, need_msg, need_kind, need_or_null, given_msg, given_kind); @@ -960,7 +960,7 @@ static ZEND_COLD void zend_verify_internal_return_error( zend_verify_type_error_common( zf, arg_info, ce, value, - &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); + &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); zend_error_noreturn(E_CORE_ERROR, "Return value of %s%s%s() must %s%s%s, %s%s returned", fclass, fsep, fname, need_msg, need_kind, need_or_null, given_msg, given_kind); @@ -1011,7 +1011,7 @@ static zend_always_inline void zend_verify_return_type(zend_function *zf, zval * { zend_arg_info *ret_info = zf->common.arg_info - 1; zend_class_entry *ce = NULL; - + if (UNEXPECTED(!zend_check_type(ret_info->type, ret, &ce, cache_slot, NULL, NULL, 1))) { zend_verify_return_error(zf, ce, ret); } @@ -1360,7 +1360,7 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) { zval *z, *zptr, obj; - + ZVAL_OBJ(&obj, Z_OBJ_P(object)); Z_ADDREF(obj); zptr = z = Z_OBJ_HT(obj)->read_property(&obj, property, BP_VAR_R, cache_slot, &rv); @@ -1570,7 +1570,7 @@ str_index: switch (Z_TYPE_P(dim)) { case IS_UNDEF: zval_undefined_cv(EX(opline)->op2.var EXECUTE_DATA_CC); - /* break missing intentionally */ + /* break missing intentionally */ case IS_NULL: offset_key = ZSTR_EMPTY_ALLOC(); goto str_index; @@ -1947,7 +1947,7 @@ use_read_property: ZVAL_INDIRECT(result, ptr); } } else if (EXPECTED(Z_OBJ_HT_P(container)->read_property)) { - goto use_read_property; + goto use_read_property; } else { zend_error(E_WARNING, "This object doesn't support property references"); ZVAL_ERROR(result); @@ -2353,7 +2353,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o zend_op *opline = EX(func)->op_array.opcodes + op_num; int level; int do_exit; - + if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL || opline->opcode == ZEND_INIT_FCALL_BY_NAME || opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 4ce3a57458..9f10843b6b 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -812,7 +812,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / ZEND_ADD_CALL_FLAG(call, call_info); } - if (func->type == ZEND_USER_FUNCTION) { + if (func->type == ZEND_USER_FUNCTION) { int call_via_handler = (func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) != 0; const zend_op *current_opline_before_exception = EG(opline_before_exception); diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h index 2de3a1d947..98513c3a3d 100644 --- a/Zend/zend_generators.h +++ b/Zend/zend_generators.h @@ -30,7 +30,7 @@ extern ZEND_API zend_class_entry *zend_ce_ClosedGeneratorException; typedef struct _zend_generator_node zend_generator_node; typedef struct _zend_generator zend_generator; -/* The concept of `yield from` exposes problems when accessed at different levels of the chain of delegated generators. We need to be able to reference the currently executed Generator in all cases and still being able to access the return values of finished Generators. +/* The concept of `yield from` exposes problems when accessed at different levels of the chain of delegated generators. We need to be able to reference the currently executed Generator in all cases and still being able to access the return values of finished Generators. * The solution to this problem is a doubly-linked tree, which all Generators referenced in maintain a reference to. It should be impossible to avoid walking the tree in all cases. This way, we only need tree walks from leaf to root in case where some part of the `yield from` chain is passed to another `yield from`. (Update of leaf node pointer and list of multi-children nodes needed when leaf gets a child in direct path from leaf to root node.) But only in that case, which should be a fairly rare case (which is then possible, but not totally cheap). * The root of the tree is then the currently executed Generator. The subnodes of the tree (all except the root node) are all Generators which do `yield from`. Each node of the tree knows a pointer to one leaf descendant node. Each node with multiple children needs a list of all leaf descendant nodes paired with pointers to their respective child node. (The stack is determined by leaf node pointers) Nodes with only one child just don't need a list, there it is enough to just have a pointer to the child node. Further, leaf nodes store a pointer to the root node. * That way, when we advance any generator, we just need to look up a leaf node (which all have a reference to a root node). Then we can see at the root node whether current Generator is finished. If it isn't, all is fine and we can just continue. If the Generator finished, there will be two cases. Either it is a simple node with just one child, then go down to child node. Or it has multiple children and we now will remove the current leaf node from the list of nodes (unnecessary, is microoptimization) and go down to the child node whose reference was paired with current leaf node. Child node is then removed its parent reference and becomes new top node. Or the current node references the Generator we're currently executing, then we can continue from the YIELD_FROM opcode. When a node referenced as root node in a leaf node has a parent, then we go the way up until we find a root node without parent. diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 64f28ea221..386248d171 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -312,7 +312,7 @@ static zend_always_inline zval *zend_hash_find_ind(const HashTable *ht, zend_str zval *zv; zv = zend_hash_find(ht, key); - return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ? + return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ? ((Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF) ? Z_INDIRECT_P(zv) : NULL) : zv; } @@ -332,7 +332,7 @@ static zend_always_inline zval *zend_hash_str_find_ind(const HashTable *ht, cons zval *zv; zv = zend_hash_str_find(ht, str, len); - return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ? + return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ? ((Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF) ? Z_INDIRECT_P(zv) : NULL) : zv; } @@ -1024,7 +1024,7 @@ static zend_always_inline zval *_zend_hash_append(HashTable *ht, zend_string *ke if (!ZSTR_IS_INTERNED(key)) { ht->u.flags &= ~HASH_FLAG_STATIC_KEYS; zend_string_addref(key); - zend_string_hash_val(key); + zend_string_hash_val(key); } p->key = key; p->h = ZSTR_H(key); @@ -1046,7 +1046,7 @@ static zend_always_inline zval *_zend_hash_append_ptr(HashTable *ht, zend_string if (!ZSTR_IS_INTERNED(key)) { ht->u.flags &= ~HASH_FLAG_STATIC_KEYS; zend_string_addref(key); - zend_string_hash_val(key); + zend_string_hash_val(key); } p->key = key; p->h = ZSTR_H(key); @@ -1068,7 +1068,7 @@ static zend_always_inline void _zend_hash_append_ind(HashTable *ht, zend_string if (!ZSTR_IS_INTERNED(key)) { ht->u.flags &= ~HASH_FLAG_STATIC_KEYS; zend_string_addref(key); - zend_string_hash_val(key); + zend_string_hash_val(key); } p->key = key; p->h = ZSTR_H(key); diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index b224994214..768486cba4 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -129,7 +129,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) } } op1_len = (int)Z_STRLEN_P(op1); - + if (Z_TYPE_P(op2) != IS_STRING) { convert_to_string(op2); } diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 86e75c3ffe..1d4ee75a64 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -89,7 +89,7 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */ zobj->properties->u.v.flags |= HASH_FLAG_HAS_EMPTY_IND; } - _zend_hash_append_ind(zobj->properties, prop_info->name, + _zend_hash_append_ind(zobj->properties, prop_info->name, OBJ_PROP(zobj, prop_info->offset)); } } ZEND_HASH_FOREACH_END(); @@ -616,7 +616,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ *guard |= IN_ISSET; zend_std_call_issetter(&tmp_object, member, &tmp_result); *guard &= ~IN_ISSET; - + if (!zend_is_true(&tmp_result)) { retval = &EG(uninitialized_zval); zval_ptr_dtor(&tmp_object); diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index ea8fa0917d..0972742dde 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -112,7 +112,7 @@ ZEND_API void destroy_zend_function(zend_function *function) zend_string_release(function->common.function_name); if (function->common.arg_info && - (function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { + (function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { uint32_t i; uint32_t num_args = function->common.num_args + 1; zend_arg_info *arg_info = function->common.arg_info - 1; diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index d006b646d1..7f1e426e83 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -3001,7 +3001,7 @@ process_double: } /* }}} */ -/* +/* * String matching - Sunday algorithm * http://www.iti.fh-flensburg.de/lang/algorithmen/pattern/sundayen.htm */ @@ -3085,7 +3085,7 @@ ZEND_API const char* ZEND_FASTCALL zend_memnrstr_ex(const char *haystack, const if (i == needle_len) { return (const char *)p; } - + if (UNEXPECTED(p == haystack)) { return NULL; } diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index 646cc50f81..3f1f85561f 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -184,7 +184,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context) if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { p_sig.flags = 0; p_sig.handler = SIG_DFL; - } else + } else #endif p_sig = SIGG(handlers)[signo-1]; diff --git a/Zend/zend_sort.c b/Zend/zend_sort.c index 16295febbd..f9932abecd 100644 --- a/Zend/zend_sort.c +++ b/Zend/zend_sort.c @@ -231,58 +231,58 @@ ZEND_API void zend_insert_sort(void *base, size_t nmemb, size_t siz, compare_fun } /* }}} */ -/* {{{ ZEND_API void zend_sort(void *base, size_t nmemb, size_t siz, compare_func_t cmp, swap_func_t swp) +/* {{{ ZEND_API void zend_sort(void *base, size_t nmemb, size_t siz, compare_func_t cmp, swap_func_t swp) * * Derived from LLVM's libc++ implementation of std::sort. * * =========================================================================== * libc++ License * =========================================================================== - * + * * The libc++ library is dual licensed under both the University of Illinois * "BSD-Like" license and the MIT license. As a user of this code you may * choose to use it under either license. As a contributor, you agree to allow * your code to be used under both. - * + * * Full text of the relevant licenses is included below. - * + * * =========================================================================== - * + * * University of Illinois/NCSA * Open Source License - * + * * Copyright (c) 2009-2012 by the contributors listed at * http://llvm.org/svn/llvm-project/libcxx/trunk/CREDITS.TXT - * + * * All rights reserved. - * + * * Developed by: - * + * * LLVM Team - * + * * University of Illinois at Urbana-Champaign - * + * * http://llvm.org - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal with the Software without restriction, including without limitation the * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or * sell copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimers. - * + * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimers in the * documentation and/or other materials provided with the distribution. - * + * * * Neither the names of the LLVM Team, University of Illinois at * Urbana-Champaign, nor the names of its contributors may be used to * endorse or promote products derived from this Software without * specific prior written permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -290,22 +290,22 @@ ZEND_API void zend_insert_sort(void *base, size_t nmemb, size_t siz, compare_fun * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * WITH THE SOFTWARE. - * + * * =========================================================================== - * + * * Copyright (c) 2009-2012 by the contributors listed at * http://llvm.org/svn/llvm-project/libcxx/trunk/CREDITS.TXT - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or * sell copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/Zend/zend_string.c b/Zend/zend_string.c index e4edc92e47..2fdc51dfa8 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -27,7 +27,7 @@ static zend_string *zend_new_interned_string_permanent(zend_string *str); static zend_string *zend_new_interned_string_request(zend_string *str); /* Any strings interned in the startup phase. Common to all the threads, - won't be free'd until process exit. If we want an ability to + won't be free'd until process exit. If we want an ability to add permanent strings even after startup, it would be still possible on costs of locking in the thread safe builds. */ static HashTable interned_strings_permanent; diff --git a/Zend/zend_strtod_int.h b/Zend/zend_strtod_int.h index ca4049ee33..f3fc6ea90a 100644 --- a/Zend/zend_strtod_int.h +++ b/Zend/zend_strtod_int.h @@ -34,7 +34,7 @@ #endif /* TODO check to undef this option, this might - make more perf. destroy_freelist() + make more perf. destroy_freelist() should be adapted then. */ #define Omit_Private_Memory 1 @@ -140,7 +140,7 @@ typedef unsigned long int uint32_t; } else if (1 == x) { \ tsrm_mutex_unlock(pow5mult_mutex); \ } - + #endif diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 4c104b8e61..d0d8df37be 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -988,7 +988,7 @@ ZEND_VM_INLINE_HELPER(zend_binary_assign_op_helper, VAR|UNUSED|THIS|CV, CONST|TM ZEND_VM_DISPATCH_TO_HELPER(zend_binary_assign_op_dim_helper, binary_op, binary_op); } # endif - + ZEND_VM_DISPATCH_TO_HELPER(zend_binary_assign_op_obj_helper, binary_op, binary_op); #endif } @@ -1555,7 +1555,7 @@ ZEND_VM_HELPER(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|VAR, varname = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R); retval = zend_fetch_static_property_address(varname, OP1_TYPE, opline->op2, OP2_TYPE, type EXECUTE_DATA_CC); - + if (UNEXPECTED(retval == NULL)) { if (EG(exception)) { FREE_OP1(); @@ -2490,7 +2490,7 @@ ZEND_VM_HOT_HANDLER(43, ZEND_JMPZ, CONST|TMPVAR|CV, JMP_ADDR) zval *val; val = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R); - + if (Z_TYPE_INFO_P(val) == IS_TRUE) { ZEND_VM_SET_NEXT_OPCODE(opline + 1); ZEND_VM_CONTINUE(); @@ -3213,7 +3213,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CLASS_FETCH|CONST|VAR, if (OP1_TYPE == IS_UNUSED) { /* previous opcode is ZEND_FETCH_CLASS */ - if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT || + if ((opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_PARENT || (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) { if (Z_TYPE(EX(This)) == IS_OBJECT) { ce = Z_OBJCE(EX(This)); @@ -3675,7 +3675,7 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL)) } else { zend_execute_internal(call, ret); } - + #if ZEND_DEBUG if (!EG(exception) && call->func) { ZEND_ASSERT(!(call->func->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) || @@ -6322,7 +6322,7 @@ ZEND_VM_HANDLER(180, ZEND_ISSET_ISEMPTY_STATIC_PROP, CONST|TMPVAR|CV, UNUSED|CLA if (OP1_TYPE == IS_CONST && value) { CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, value); - } + } if (OP1_TYPE != IS_CONST && Z_TYPE(tmp) != IS_UNDEF) { zend_string_release(Z_STR(tmp)); diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 995eafc856..d6dbf8393f 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1221,7 +1221,7 @@ function gen_labels($f, $spec, $kind, $prolog, &$specs, $switch_labels = array() $label++; return; } - + // Emit pointer to specialized handler $spec_name = $dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2].extra_spec_name($extra_spec); switch ($kind) { @@ -1884,7 +1884,7 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name) "# endif\n" . $m[1]."return;\n" . "#else\n" . - $m[1]."if (EXPECTED(ret > 0)) {\n" . + $m[1]."if (EXPECTED(ret > 0)) {\n" . $m[1]."\texecute_data = EG(current_execute_data);\n". $m[1]."\tZEND_VM_LOOP_INTERRUPT_CHECK();\n". $m[1]."} else {\n" . @@ -2291,7 +2291,7 @@ function gen_vm($def, $skel) { fputs($f, "ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);\n"); fputs($f, "ZEND_API uint32_t zend_get_opcode_flags(zend_uchar opcode);\n\n"); fputs($f, "END_EXTERN_C()\n\n"); - + foreach ($opcodes as $code => $dsc) { $code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT); $op = str_pad($dsc["op"],$max_opcode_len); @@ -2315,13 +2315,13 @@ function gen_vm($def, $skel) { out($f, HEADER_TEXT); fputs($f,"#include <stdio.h>\n"); fputs($f,"#include <zend.h>\n\n"); - + fputs($f,"static const char *zend_vm_opcodes_names[".($max_opcode + 1)."] = {\n"); for ($i = 0; $i <= $max_opcode; $i++) { fputs($f,"\t".(isset($opcodes[$i]["op"])?'"'.$opcodes[$i]["op"].'"':"NULL").",\n"); } fputs($f, "};\n\n"); - + fputs($f,"static uint32_t zend_vm_opcodes_flags[".($max_opcode + 1)."] = {\n"); for ($i = 0; $i <= $max_opcode; $i++) { fprintf($f, "\t0x%08x,\n", isset($opcodes[$i]["flags"]) ? $opcodes[$i]["flags"] : 0); @@ -2335,7 +2335,7 @@ function gen_vm($def, $skel) { fputs($f, "ZEND_API uint32_t zend_get_opcode_flags(zend_uchar opcode) {\n"); fputs($f, "\treturn zend_vm_opcodes_flags[opcode];\n"); fputs($f, "}\n"); - + fclose($f); echo "zend_vm_opcodes.c generated successfully.\n"; @@ -2366,7 +2366,7 @@ function gen_vm($def, $skel) { out($f, "# pragma warning(once : 6326)\n"); } out($f, "#endif\n"); - + // Support for ZEND_USER_OPCODE out($f, "static user_opcode_handler_t zend_user_opcode_handlers[256] = {\n"); for ($i = 0; $i < 255; ++$i) { diff --git a/acinclude.m4 b/acinclude.m4 index 1a692b72f4..e2cee405a6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -12,7 +12,7 @@ dnl dnl PHP_HELP_SEPARATOR(title) dnl dnl Adds separator title into the configure --help display. -dnl +dnl AC_DEFUN([PHP_HELP_SEPARATOR],[ AC_ARG_ENABLE([],[ $1 @@ -148,7 +148,7 @@ $EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*>//'|xargs touch 2>/d dnl dnl PHP_GEN_GLOBAL_MAKEFILE -dnl +dnl dnl Generates the global makefile. dnl AC_DEFUN([PHP_GEN_GLOBAL_MAKEFILE],[ @@ -183,10 +183,10 @@ AC_DEFUN([PHP_ADD_MAKEFILE_FRAGMENT],[ dnl dnl PHP_ADD_SOURCES(source-path, sources [, special-flags [, type]]) dnl -dnl Adds sources which are located relative to source-path to the -dnl array of type type. Sources are processed with optional +dnl Adds sources which are located relative to source-path to the +dnl array of type type. Sources are processed with optional dnl special-flags which are passed to the compiler. Sources -dnl can be either written in C or C++ (filenames shall end in .c +dnl can be either written in C or C++ (filenames shall end in .c dnl or .cpp, respectively). dnl dnl Note: If source-path begins with a "/", the "/" is removed and @@ -227,7 +227,7 @@ dnl name of the array target-var directly, as well as whether dnl shared objects will be built from the sources. dnl dnl Should not be used directly. -dnl +dnl AC_DEFUN([PHP_ADD_SOURCES_X],[ dnl relative to source- or build-directory? dnl ac_srcdir/ac_bdir include trailing slash @@ -236,20 +236,20 @@ dnl ac_srcdir/ac_bdir include trailing slash /*[)] ac_srcdir=`echo "$1"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac - + dnl how to build .. shared or static? ifelse($5,yes,_PHP_ASSIGN_BUILD_VARS(shared),_PHP_ASSIGN_BUILD_VARS(php)) dnl iterate over the sources old_IFS=[$]IFS for ac_src in $2; do - + dnl remove the suffix IFS=. set $ac_src ac_obj=[$]1 IFS=$old_IFS - + dnl append to the array which has been dynamically chosen at m4 time $4="[$]$4 [$]ac_bdir[$]ac_obj.lo" @@ -364,7 +364,7 @@ AC_DEFUN([PHP_LIBGCC_LIBPATH],[ ]) dnl ------------------------------------------------------------------------- -dnl Macros to modify LIBS, INCLUDES, etc. variables +dnl Macros to modify LIBS, INCLUDES, etc. variables dnl ------------------------------------------------------------------------- dnl @@ -486,7 +486,7 @@ dnl cc-specific dnl dnl PHP_ADD_INCLUDE(path [,before]) dnl -dnl add an include path. +dnl add an include path. dnl if before is 1, add in the beginning of INCLUDES. dnl AC_DEFUN([PHP_ADD_INCLUDE],[ @@ -774,7 +774,7 @@ AC_DEFUN([PHP_BUILD_SHARED],[ PHP_BUILD_PROGRAM OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_sapi_module=shared - + php_c_pre=$shared_c_pre php_c_meta=$shared_c_meta php_c_post=$shared_c_post @@ -885,7 +885,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[ ]) else PHP_SAPI=$1 - fi + fi PHP_ADD_BUILD_DIR([sapi/$1]) @@ -942,7 +942,7 @@ dnl to build the extension. dnl "shared" can be set to "shared" or "yes" to build the extension as dnl a dynamically loadable library. Optional parameter "sapi_class" can dnl be set to "cli" to mark extension build only with CLI or CGI sapi's. -dnl "extra-cflags" are passed to the compiler, with +dnl "extra-cflags" are passed to the compiler, with dnl @ext_srcdir@ and @ext_builddir@ being substituted. dnl "cxx" can be used to indicate that a C++ shared module is desired. dnl "zend_ext" indicates a zend extension. @@ -988,7 +988,7 @@ dnl ---------------------------------------------- CLI static module PHP_ADD_BUILD_DIR($ext_builddir) dnl Set for phpize builds only -dnl --------------------------- +dnl --------------------------- if test "$ext_builddir" = "."; then PHP_PECL_EXTENSION=$1 PHP_SUBST(PHP_PECL_EXTENSION) @@ -1018,7 +1018,7 @@ dnl $3 = optional: if true, it's ok for $2 to have not been configured dnl default is false and should halt the build. dnl To be effective, this macro must be invoked *after* PHP_NEW_EXTENSION. dnl The extension on which it depends must also have been configured. -dnl See ADD_EXTENSION_DEP in win32 build +dnl See ADD_EXTENSION_DEP in win32 build dnl AC_DEFUN([PHP_ADD_EXTENSION_DEP], [ am_i_shared=$[PHP_]translit($1,a-z_-,A-Z__)[_SHARED] @@ -1180,7 +1180,7 @@ main() { struct tm t, *s; time_t old = 0; char buf[27], *p; - + s = gmtime_r(&old, &t); p = asctime_r(&t, buf, 26); if (p == buf && s == &t) return (0); @@ -1245,7 +1245,7 @@ AC_DEFUN([PHP_DOES_PREAD_WORK],[ #include <errno.h> $1 main() { - char buf[3]; + char buf[3]; int fd = open("conftest_in", O_RDONLY); if (fd < 0) exit(1); if (pread(fd, buf, 2, 0) != 2) exit(1); @@ -1282,7 +1282,7 @@ AC_DEFUN([PHP_PWRITE_TEST],[ if test "$ac_cv_pwrite" = "64"; then AC_DEFINE(PHP_PWRITE_64, 1, [whether pwrite64 is default]) fi - fi + fi ]) dnl @@ -1304,7 +1304,7 @@ AC_DEFUN([PHP_PREAD_TEST],[ if test "$ac_cv_pread" = "64"; then AC_DEFINE(PHP_PREAD_64, 1, [whether pread64 is default]) fi - fi + fi ]) dnl @@ -1342,7 +1342,7 @@ AC_DEFUN([PHP_MISSING_TIME_R_DECL],[ dnl dnl PHP_READDIR_R_TYPE -dnl +dnl AC_DEFUN([PHP_READDIR_R_TYPE],[ dnl HAVE_READDIR_R is also defined by libmysql AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no) @@ -1363,7 +1363,7 @@ main() { struct dirent *pentry = (struct dirent *) &entry; dir = opendir("/"); - if (!dir) + if (!dir) exit(1); if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) { close(dir); @@ -1400,7 +1400,7 @@ int readdir_r(DIR *, struct dirent *); dnl dnl PHP_TM_GMTOFF -dnl +dnl AC_DEFUN([PHP_TM_GMTOFF],[ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, [AC_TRY_COMPILE([#include <sys/types.h> @@ -1503,7 +1503,7 @@ AC_DEFUN([PHP_AC_BROKEN_SNPRINTF],[ main() { char buf[20]; int res = 0; - res = res || (snprintf(buf, 2, "marcus") != 6); + res = res || (snprintf(buf, 2, "marcus") != 6); res = res || (buf[1] != '\0'); /* Implementations may consider this as an encoding error */ snprintf(buf, 0, "boerger"); @@ -1511,7 +1511,7 @@ main() { res = res || (buf[0] != 'm'); res = res || (snprintf(NULL, 0, "boerger") != 7); res = res || (snprintf(buf, sizeof(buf), "%f", 0.12345678) != 8); - exit(res); + exit(res); } ],[ ac_cv_broken_snprintf=no @@ -1618,7 +1618,7 @@ AC_DEFUN([PHP_SOCKADDR_CHECKS], [ if test "$ac_cv_sockaddr_storage" = "yes"; then AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Whether you have struct sockaddr_storage]) fi - dnl Check if field sa_len exists in struct sockaddr + dnl Check if field sa_len exists in struct sockaddr AC_CACHE_CHECK([for field sa_len in struct sockaddr],ac_cv_sockaddr_sa_len,[ AC_TRY_COMPILE([#include <sys/types.h> #include <sys/socket.h>], @@ -1659,9 +1659,9 @@ dnl AC_DEFUN([PHP_EBCDIC], [ AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[ AC_TRY_RUN( [ -int main(void) { - return (unsigned char)'A' != (unsigned char)0xC1; -} +int main(void) { + return (unsigned char)'A' != (unsigned char)0xC1; +} ],[ ac_cv_ebcdic=yes ],[ @@ -1705,7 +1705,7 @@ int main(int argc, char *argv[]) FILE *fp; long position; char *filename = tmpnam(NULL); - + fp = fopen(filename, "w"); if (fp == NULL) { perror("fopen"); @@ -1799,7 +1799,7 @@ main() { ], [ cookie_io_functions_use_off64_t=no ]) - + else dnl older glibc versions (up to 2.1.2 ?) @@ -1836,7 +1836,7 @@ dnl AC_DEFUN([PHP_CHECK_LIBRARY], [ save_old_LDFLAGS=$LDFLAGS ac_stuff="$5" - + save_ext_shared=$ext_shared ext_shared=yes PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS) @@ -1926,11 +1926,11 @@ AC_DEFUN([PHP_CHECK_FUNC],[ unset ac_cv_func_$1 unset ac_cv_func___$1 unset found - + AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) case $found in - yes[)] + yes[)] PHP_DEF_HAVE($1) ac_cv_func_$1=yes ;; @@ -2001,7 +2001,7 @@ dnl dnl PHP_CHECK_64BIT([do if 32], [do if 64]) dnl dnl This macro is used to detect if we're at 64-bit platform or not. -dnl It could be useful for those external libs, that have different precompiled +dnl It could be useful for those external libs, that have different precompiled dnl versions in different directories. dnl AC_DEFUN([PHP_CHECK_64BIT],[ @@ -2071,9 +2071,9 @@ AC_DEFUN([PHP_PROG_AWK], [ *mawk) AC_MSG_WARN([mawk is known to have problems on some systems. You should install GNU awk]) ;; - *gawk) + *gawk) ;; - bork) + bork) AC_MSG_ERROR([Could not find awk; Install GNU awk]) ;; *) @@ -2108,7 +2108,7 @@ dnl AC_DEFUN([PHP_PROG_LEX], [ dnl we only support certain flex versions flex_version_list="2.5.4" - + AC_PROG_LEX if test "$LEX" = "flex"; then dnl AC_DECL_YYTEXT is obsolete since autoconf 2.50 and merged into AC_PROG_LEX @@ -2138,7 +2138,7 @@ dnl it should be removed once we drop support of autoconf 2.13 (if ever) else flex_version=none fi - + case $php_cv_flex_version in ""|invalid[)] if test -f "$abs_srcdir/Zend/zend_language_scanner.c" && test -f "$abs_srcdir/Zend/zend_ini_scanner.c"; then @@ -2172,7 +2172,7 @@ AC_DEFUN([PHP_PROG_RE2C],[ php_cv_re2c_version=invalid else php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2 2>/dev/null` (ok)" - fi + fi ]) fi case $php_cv_re2c_version in @@ -2301,7 +2301,7 @@ ifelse([$3],[],,[else $3]) fi ]) -dnl +dnl dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]]) dnl dnl Common setup macro for openssl @@ -2348,7 +2348,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ dnl If pkg-config fails for some reason, revert to the old method if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" fi @@ -2387,7 +2387,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ CPPFLAGS=$old_CPPFLAGS PHP_ADD_INCLUDE($OPENSSL_INCDIR) - + PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ PHP_ADD_LIBRARY(crypto,,$1) ],[ @@ -2422,7 +2422,7 @@ ifelse([$3],[],,[else $3]) fi ]) -dnl +dnl dnl PHP_SETUP_ICONV(shared-add [, action-found [, action-not-found]]) dnl dnl Common setup macro for iconv @@ -2486,7 +2486,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ if test -z "$ICONV_DIR"; then AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>]) fi - + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then @@ -2520,7 +2520,7 @@ ifelse([$3],[],,[else $3]) fi ]) -dnl +dnl dnl PHP_SETUP_LIBXML(shared-add [, action-found [, action-not-found]]) dnl dnl Common setup macro for libxml @@ -2602,7 +2602,7 @@ dnl ------------------------------------------------------------------------- dnl Misc. macros dnl ------------------------------------------------------------------------- -dnl +dnl dnl PHP_INSTALL_HEADERS(path [, file ...]) dnl dnl PHP header files to be installed @@ -2613,7 +2613,7 @@ AC_DEFUN([PHP_INSTALL_HEADERS],[ PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" ]) - done + done ], [ header_path=$1 for header_file in $2; do @@ -2621,7 +2621,7 @@ AC_DEFUN([PHP_INSTALL_HEADERS],[ PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" ]) - done + done ]) ]) @@ -2644,7 +2644,7 @@ IFS="- /. dnl dnl PHP_DEBUG_MACRO(filename) -dnl +dnl AC_DEFUN([PHP_DEBUG_MACRO],[ DEBUG_LOG=$1 cat >$1 <<X @@ -2706,7 +2706,7 @@ EOF echo "'[$]0' \\" >> $1 if test `expr " [$]0" : " '.*"` = 0; then CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" - else + else CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" fi CONFIGURE_ARGS="$clean_configure_args" @@ -2774,7 +2774,7 @@ AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[ if test "$PHP_MAJOR_VERSION" -lt "6"; then case $arg_name in enable-zend-multibyte[)] continue;; - esac + esac fi is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` @@ -2856,7 +2856,7 @@ AC_DEFUN([PHP_CRYPT_R_STYLE], ],[ CRYPTD buffer; crypt_r("passwd", "hash", &buffer); -], +], php_cv_crypt_r_style=cryptd) if test "$php_cv_crypt_r_style" = "none"; then @@ -2866,7 +2866,7 @@ php_cv_crypt_r_style=cryptd) ],[ struct crypt_data buffer; crypt_r("passwd", "hash", &buffer); -], +], php_cv_crypt_r_style=struct_crypt_data) fi @@ -2878,7 +2878,7 @@ php_cv_crypt_r_style=struct_crypt_data) ],[ struct crypt_data buffer; crypt_r("passwd", "hash", &buffer); -], +], php_cv_crypt_r_style=struct_crypt_data_gnu_source) fi ]) diff --git a/appveyor/build.bat b/appveyor/build.bat index dfef616164..36e8fbdd4e 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -20,7 +20,7 @@ if not exist "%SDK_RUNNER%" ( if not exist "%PHP_BUILD_CACHE_SDK_DIR%" ( echo Cloning remote SDK repository - git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 + git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 ) for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a @@ -30,7 +30,7 @@ if NOT "%GOT_SDK_VER%" == "%PHP_BUILD_SDK_BRANCH:~8%" ( echo Fetching remote SDK repository git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1 echo Checkout SDK repository branch - git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% + git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% ) if not exist "%SDK_RUNNER%" ( diff --git a/build/build2.mk b/build/build2.mk index ce61553fb8..8396d73e8c 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -14,7 +14,7 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id$ +# $Id$ # include generated_lists @@ -35,7 +35,7 @@ SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to all all: $(targets) $(config_h_in): configure -# explicitly remove target since autoheader does not seem to work +# explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @echo rebuilding $@ @rm -f $@ diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 70515b75b5..54881459a1 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -16,7 +16,7 @@ # | Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.37.2.2.2.1 2007-01-01 19:32:10 iliaa Exp $ +# $Id: buildcheck.sh,v 1.37.2.2.2.1 2007-01-01 19:32:10 iliaa Exp $ # echo "buildconf: checking installation..." diff --git a/build/mkdep.awk b/build/mkdep.awk index c1adefe612..eae800c863 100644 --- a/build/mkdep.awk +++ b/build/mkdep.awk @@ -35,16 +35,16 @@ } dif=i-1 - + for (; i <= NF; i++) filenames[i-dif]=$i - + no_files=NF-dif - + for(i = 1; i <= no_files; i++) { if (system("test -r " filenames[i]) != 0) continue - + target=filenames[i] sub(srcdir "/", "", target) target2=target @@ -53,7 +53,7 @@ for (e in used) delete used[e] - + cmdx=cmd " " filenames[i] done=0 while ((cmdx | getline) > 0) { @@ -66,10 +66,10 @@ done=1 printf(" \\\n\t" substr($3,2,length($3)-2)) used[$3] = 1; - } + } } } if (done == 1) print "\n" } -} +} diff --git a/build/order_by_dep.awk b/build/order_by_dep.awk index 281898ecee..ad3781101b 100644 --- a/build/order_by_dep.awk +++ b/build/order_by_dep.awk @@ -77,7 +77,7 @@ function count(arr, n, i) END { # order it correctly out_count = 0; - + while (count(mods)) { for (i = 0; i <= mod_count - 1; i++) { if (i in mods) { diff --git a/build/scan_makefile_in.awk b/build/scan_makefile_in.awk index 0c6d20398f..c7ba9a8c52 100644 --- a/build/scan_makefile_in.awk +++ b/build/scan_makefile_in.awk @@ -2,7 +2,7 @@ BEGIN { mode=0 sources="" } - + mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ { if (match($0, "[^=]*$")) { sources=substr($0, RSTART, RLENGTH-1) diff --git a/configure.ac b/configure.ac index d3f3cacd07..cb0405569f 100644 --- a/configure.ac +++ b/configure.ac @@ -159,7 +159,7 @@ if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together]) fi - + dnl Settings we want to make before the checks. dnl ------------------------------------------------------------------------- @@ -688,7 +688,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, [AC_TRY_LINK([#include <netdb.h>], - [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);], + [struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);], AC_TRY_RUN([ #include <netdb.h> #include <sys/types.h> @@ -710,7 +710,7 @@ int main(void) { } pai = ai; - + while (pai) { if (pai->ai_family != AF_INET) { /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ @@ -797,7 +797,7 @@ if test "$PHP_GCOV" = "yes"; then if test "$GCC" != "yes"; then AC_MSG_ERROR([GCC is required for --enable-gcov]) fi - + dnl Check if ccache is being used case `$php_shtool path $CC` in *ccache*[)] gcc_ccache=yes;; @@ -807,7 +807,7 @@ if test "$PHP_GCOV" = "yes"; then if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - + dnl min: 1.5 (i.e. 105, major * 100 + minor for easier comparison) ltp_version_min="105" dnl non-working versions, e.g. "1.8 1.18"; @@ -840,7 +840,7 @@ if test "$PHP_GCOV" = "yes"; then fi ]) else - ltp_msg="To enable code coverage reporting you must have LTP installed" + ltp_msg="To enable code coverage reporting you must have LTP installed" AC_MSG_ERROR([$ltp_msg]) fi @@ -930,7 +930,7 @@ fi AC_MSG_CHECKING([where to scan for configuration files]) PHP_ARG_WITH(config-file-scan-dir,, [ --with-config-file-scan-dir=PATH - Set the path where to scan for configuration files], DEFAULT, no) + Set the path where to scan for configuration files], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then PHP_CONFIG_FILE_SCAN_DIR= fi @@ -1028,7 +1028,7 @@ dnl ------------------------------------------------------------------------- PHP_HELP_SEPARATOR([Extensions: --with-EXTENSION=[shared[,PATH]] - + NOTE: Not all extensions can be build as 'shared'. Example: --with-foobar=shared,/usr/local/foobar/ @@ -1115,13 +1115,13 @@ if test "$PHP_PEAR" != "no"; then dnl PEAR dependancies dnl if test "$PHP_XML" = "no"; then - pear_error_msg="$pear_error_msg + pear_error_msg="$pear_error_msg PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" fi dnl dnl if test "$PHP_XMLRPC" = "no"; then -dnl pear_error_msg="$pear_error_msg +dnl pear_error_msg="$pear_error_msg dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)" dnl fi dnl @@ -1234,7 +1234,7 @@ if test -z "$EXTENSION_DIR"; then if test "$enable_maintainer_zts" = "yes"; then extbasedir=$extbasedir-zts fi - + if test "$PHP_DEBUG" = "1"; then extbasedir=$extbasedir-debug fi diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 6499b1cffb..1b06b301ba 100644 --- a/ext/bcmath/libbcmath/FAQ +++ b/ext/bcmath/libbcmath/FAQ @@ -1,4 +1,4 @@ -BCMATH FAQ: +BCMATH FAQ: 1) Why BCMATH? diff --git a/ext/bcmath/libbcmath/configure b/ext/bcmath/libbcmath/configure index 026fd039c7..0b74129785 100644 --- a/ext/bcmath/libbcmath/configure +++ b/ext/bcmath/libbcmath/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -1236,7 +1236,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <<EOF #define $ac_tr_hdr 1 EOF - + else echo "$ac_t""no" 1>&6 fi @@ -1312,7 +1312,7 @@ fi echo "$ac_t""$ac_cv_c_const" 1>&6 if test $ac_cv_c_const = no; then cat >> confdefs.h <<\EOF -#define const +#define const EOF fi diff --git a/ext/bcmath/libbcmath/install-sh b/ext/bcmath/libbcmath/install-sh index ab74c882e9..9ad48a82cc 100644 --- a/ext/bcmath/libbcmath/install-sh +++ b/ext/bcmath/libbcmath/install-sh @@ -103,7 +103,7 @@ fi if [ x"$dir_arg" != x ]; then dst=$src src="" - + if [ -d $dst ]; then instcmd=: else @@ -112,7 +112,7 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] @@ -122,7 +122,7 @@ else echo "install: $src does not exist" exit 1 fi - + if [ x"$dst" = x ] then echo "install: no destination specified" @@ -150,7 +150,7 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' +defaultIFS=' ' IFS="${IFS-${defaultIFS}}" @@ -189,17 +189,17 @@ else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then dstfile=`basename $dst` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then dstfile=`basename $dst` else @@ -230,7 +230,7 @@ else # Now rename the file to the real destination. $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && diff --git a/ext/bcmath/libbcmath/mkinstalldirs b/ext/bcmath/libbcmath/mkinstalldirs index cc8783edce..fef1eb9418 100644 --- a/ext/bcmath/libbcmath/mkinstalldirs +++ b/ext/bcmath/libbcmath/mkinstalldirs @@ -7,7 +7,7 @@ errstatus=0 -for file in ${1+"$@"} ; do +for file in ${1+"$@"} ; do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift diff --git a/ext/bcmath/package.xml b/ext/bcmath/package.xml index 3ef9773fe7..1b6072b60c 100644 --- a/ext/bcmath/package.xml +++ b/ext/bcmath/package.xml @@ -12,7 +12,7 @@ </maintainer> </maintainers> <description> -For arbitrary precision mathematics PHP offers the Binary Calculator +For arbitrary precision mathematics PHP offers the Binary Calculator which supports numbers of any size and precision, represented as strings. </description> <license>PHP</license> diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 index 55917c07f4..9a4851e0d1 100644 --- a/ext/bz2/config.m4 +++ b/ext/bz2/config.m4 @@ -24,7 +24,7 @@ if test "$PHP_BZ2" != "no"; then AC_MSG_ERROR(Please reinstall the BZip2 distribution) fi - PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, + PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, [ PHP_ADD_INCLUDE($BZIP_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) diff --git a/ext/bz2/package.xml b/ext/bz2/package.xml index b1b3688b56..996ebf9640 100644 --- a/ext/bz2/package.xml +++ b/ext/bz2/package.xml @@ -33,5 +33,5 @@ Bz2 is an extension to create and parse bzip2 compressed data. <file role="doc">php_bz2.h</file> <file role="src">bz2.c</file> </dir> - </filelist> + </filelist> </package> diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index b4098bb850..fa93705744 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -278,13 +278,13 @@ static void _php_cal_info(int cal, zval *ret) add_index_string(&months, i, calendar->month_name_long[i]); add_index_string(&smonths, i, calendar->month_name_short[i]); } - + add_assoc_zval(ret, "months", &months); add_assoc_zval(ret, "abbrevmonths", &smonths); add_assoc_long(ret, "maxdaysinmonth", calendar->max_days_in_month); add_assoc_string(ret, "calname", calendar->name); add_assoc_string(ret, "calsymbol", calendar->symbol); - + } /* {{{ proto array cal_info([int calendar]) @@ -512,21 +512,21 @@ PHP_FUNCTION(juliantojd) /* caution: the Hebrew format produces non unique result. for example both: year '5' and year '5000' produce 'ä'. -use the numeric one for calculations. +use the numeric one for calculations. */ static char *heb_number_to_chars(int n, int fl, char **ret) { char *p, old[18], *endofalafim; p = endofalafim = old; -/* - prevents the option breaking the jewish beliefs, and some other +/* + prevents the option breaking the jewish beliefs, and some other critical resources ;) */ if (n > 9999 || n < 1) { *ret = NULL; return NULL; - } + } /* alafim (thousands) case */ if (n / 1000) { diff --git a/ext/calendar/jewish.c b/ext/calendar/jewish.c index 61c3c22299..6aa8bb8a55 100644 --- a/ext/calendar/jewish.c +++ b/ext/calendar/jewish.c @@ -301,7 +301,7 @@ static int yearOffset[19] = /* names for leap (13-month) year */ char *JewishMonthNameLeap[14] = { - "", + "", "Tishri", "Heshvan", "Kislev", @@ -320,7 +320,7 @@ char *JewishMonthNameLeap[14] = /* names for regular year */ char *JewishMonthName[14] = { - "", + "", "Tishri", "Heshvan", "Kislev", @@ -339,7 +339,7 @@ char *JewishMonthName[14] = /* names for leap (13-month) year */ char *JewishMonthHebNameLeap[14] = { - "", + "", "\xFA\xF9\xF8\xE9", "\xE7\xF9\xE5\xEF", "\xEB\xF1\xEC\xE5", @@ -358,7 +358,7 @@ char *JewishMonthHebNameLeap[14] = /* names for regular year */ char *JewishMonthHebName[14] = { - "", + "", "\xFA\xF9\xF8\xE9", "\xE7\xF9\xE5\xEF", "\xEB\xF1\xEC\xE5", diff --git a/ext/calendar/package.xml b/ext/calendar/package.xml index 82d0675290..4b4514d1c1 100644 --- a/ext/calendar/package.xml +++ b/ext/calendar/package.xml @@ -36,7 +36,7 @@ standard it is based on is the Julian Day Count. The Julian Day Count is a count of days starting from January 1st, 4713 B.C. To convert between calendar systems, you must first convert to Julian Day Count, then to the calendar system of your choice. Julian Day Count is very -different from the Julian Calendar! +different from the Julian Calendar! </description> <license>PHP</license> <release> diff --git a/ext/calendar/tests/skipif.inc b/ext/calendar/tests/skipif.inc index de8e4ae930..71cdc73630 100644 --- a/ext/calendar/tests/skipif.inc +++ b/ext/calendar/tests/skipif.inc @@ -1,4 +1,4 @@ -<?php -if(!extension_loaded("calendar")) - print "skip - CALENDAR extension not available"; +<?php +if(!extension_loaded("calendar")) + print "skip - CALENDAR extension not available"; ?> diff --git a/ext/com_dotnet/README b/ext/com_dotnet/README index 0d9db40d98..6cf14c0bea 100644 --- a/ext/com_dotnet/README +++ b/ext/com_dotnet/README @@ -55,12 +55,12 @@ Sample Script: <?php $word = new COM("word.application"); -print "Loaded Word, version {$word->Version}\n"; -$word->Visible = 1; -$word->Documents->Add(); -$word->Selection->TypeText("This is a test..."); -$word->Documents[1]->SaveAs("Useless test.doc"); -$word->Quit(); +print "Loaded Word, version {$word->Version}\n"; +$word->Visible = 1; +$word->Documents->Add(); +$word->Selection->TypeText("This is a test..."); +$word->Documents[1]->SaveAs("Useless test.doc"); +$word->Quit(); ?> TODO: diff --git a/ext/ctype/ctype.xml b/ext/ctype/ctype.xml index 0e7c714b70..312c195e05 100644 --- a/ext/ctype/ctype.xml +++ b/ext/ctype/ctype.xml @@ -9,7 +9,7 @@ current locale. </para> <para> - When called with an integer argument these functions + When called with an integer argument these functions behave exactly like their C counterparts. </para> <para> @@ -19,7 +19,7 @@ requested criteria. </para> <para> - Passing anything else but a string or integer will + Passing anything else but a string or integer will return false immediately. </para> </partintro> diff --git a/ext/ctype/package.xml b/ext/ctype/package.xml index 62a9812be7..adf9fac624 100644 --- a/ext/ctype/package.xml +++ b/ext/ctype/package.xml @@ -12,8 +12,8 @@ </maintainer> </maintainers> <description> -The functions provided by this extension check whether a -character or string falls into a certain character class +The functions provided by this extension check whether a +character or string falls into a certain character class according to the current locale. </description> <license>PHP</license> diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index 8e688c1a11..100558372d 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id$ +dnl $Id$ dnl PHP_ARG_WITH(curl, for cURL support, @@ -91,17 +91,17 @@ if test "$PHP_CURL" != "no"; then PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) PHP_EVAL_INCLINE($CURL_INCL, CURL_SHARED_LIBADD) - + AC_MSG_CHECKING([for SSL support in libcurl]) if test -n "$CURL_SSL"; then AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) - + save_CFLAGS="$CFLAGS" CFLAGS=$CURL_INCL save_LDFLAGS="$LDFLAGS" LDFLAGS=$CURL_LIBS - + AC_PROG_CPP AC_MSG_CHECKING([for openssl support in libcurl]) AC_TRY_RUN([ @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) ], [ AC_MSG_RESULT([no]) ]) - + AC_MSG_CHECKING([for gnutls support in libcurl]) AC_TRY_RUN([ #include <strings.h> @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) int main(int argc, char *argv[]) { curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); - + if (data && data->ssl_version && *data->ssl_version) { const char *ptr = data->ssl_version; @@ -158,15 +158,15 @@ int main(int argc, char *argv[]) ], [ AC_MSG_RESULT([no]) ]) - + CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS" else AC_MSG_RESULT([no]) fi - PHP_CHECK_LIBRARY(curl,curl_easy_perform, - [ + PHP_CHECK_LIBRARY(curl,curl_easy_perform, + [ AC_DEFINE(HAVE_CURL,1,[ ]) ],[ AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index 112e5ea8f4..814c7ada74 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -19,7 +19,7 @@ if (PHP_CURL != "no") { SETUP_OPENSSL("curl", PHP_CURL) > 0 && CHECK_LIB("winmm.lib", "curl", PHP_CURL) && CHECK_LIB("wldap32.lib", "curl", PHP_CURL) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && !isNaN(ver_num) && (ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") && diff --git a/ext/curl/package.xml b/ext/curl/package.xml index f54abaf872..24f62b1f66 100644 --- a/ext/curl/package.xml +++ b/ext/curl/package.xml @@ -12,13 +12,13 @@ </maintainer> </maintainers> <description> -PHP supports libcurl, a library created by Daniel Stenberg, -that allows you to connect and communicate to many different -types of servers with many different types of protocols. -libcurl currently supports the http, https, ftp, gopher, -telnet, dict, file, and ldap protocols. libcurl also supports -HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading (this -can also be done with PHP's ftp extension), HTTP form based +PHP supports libcurl, a library created by Daniel Stenberg, +that allows you to connect and communicate to many different +types of servers with many different types of protocols. +libcurl currently supports the http, https, ftp, gopher, +telnet, dict, file, and ldap protocols. libcurl also supports +HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading (this +can also be done with PHP's ftp extension), HTTP form based upload, proxies, cookies, and user+password authentication. </description> <license>PHP</license> diff --git a/ext/curl/tests/responder/get.php b/ext/curl/tests/responder/get.php index 60aafc03d4..f9269745f6 100644 --- a/ext/curl/tests/responder/get.php +++ b/ext/curl/tests/responder/get.php @@ -21,7 +21,7 @@ echo $_COOKIE['foo']; break; case 'encoding': - echo $_SERVER['HTTP_ACCEPT_ENCODING']; + echo $_SERVER['HTTP_ACCEPT_ENCODING']; break; case 'contenttype': header('Content-Type: text/plain;charset=utf-8'); diff --git a/ext/curl/tests/server.inc b/ext/curl/tests/server.inc index 27f0cbbc84..124e0f898c 100644 --- a/ext/curl/tests/server.inc +++ b/ext/curl/tests/server.inc @@ -8,7 +8,7 @@ function curl_cli_server_start() { if(getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { return getenv('PHP_CURL_HTTP_REMOTE_SERVER'); } - + $php_executable = getenv('TEST_PHP_EXECUTABLE'); $doc_root = __DIR__; $router = "responder/get.php"; @@ -36,7 +36,7 @@ function curl_cli_server_start() { $handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root); } - + // note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.' // it might not be listening yet...need to wait until fsockopen() call returns $error = "Unable to connect to server\n"; diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 index 91a4fda090..f1a4e5154e 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -5,7 +5,7 @@ sinclude(ext/date/lib/timelib.m4) sinclude(lib/timelib.m4) PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" -timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c +timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) diff --git a/ext/dba/README b/ext/dba/README index a79413f100..3d23fb914c 100755 --- a/ext/dba/README +++ b/ext/dba/README @@ -1,54 +1,54 @@ -These functions build the foundation for accessing Berkeley DB style -databases. +These functions build the foundation for accessing Berkeley DB style +databases. This is a general abstraction layer for several file-based databases. As -such, functionality is limited to a common subset of features supported -by modern databases such as Sleepycat Software's DB2. (This is not to be -confused with IBM's DB2 software, which is supported through the ODBC -functions.) +such, functionality is limited to a common subset of features supported +by modern databases such as Sleepycat Software's DB2. (This is not to be +confused with IBM's DB2 software, which is supported through the ODBC +functions.) This extensions allows to work with the following databases: dbm DBM is the oldest (original) type of Berkeley DB style databases. - You should avoid it, if possible. We do not support the - compatibility functions built into DB2 and gdbm, because they are - only compatible on the source code level, but cannot handle the - original dbm format. -ndbm NDBM is a newer type and more flexible than dbm. It still has - most of the arbitrary limits of dbm (therefore it is deprecated). -gdbm GDBM is the GNU database manager. + You should avoid it, if possible. We do not support the + compatibility functions built into DB2 and gdbm, because they are + only compatible on the source code level, but cannot handle the + original dbm format. +ndbm NDBM is a newer type and more flexible than dbm. It still has + most of the arbitrary limits of dbm (therefore it is deprecated). +gdbm GDBM is the GNU database manager. db2 DB2 is Sleepycat Software's DB2. It's described as "a programmatic - toolkit that provides high-performance built-in database support - for both standalone and client/server applications. -db3 DB3 is Sleepycat Software's DB3. + toolkit that provides high-performance built-in database support + for both standalone and client/server applications. +db3 DB3 is Sleepycat Software's DB3. db4 DB4 is Sleepycat Software's DB4. This is available since PHP 5.0. -cdb CDB is "a fast, reliable, lightweight package for creating and - reading constant databases." It is from the author of qmail and - can be found at http://cr.yp.to/cdb.html. Since it is constant, - we support only reading operations. And since PHP 4.3.0 we support - writing (not updating) through the internal cdb library. -cdb_make Since PHP 4.3.0 we support creation (not updating) of cdb files - when the bundled cdb library is used. -flatfile This is available since PHP 4.3.0 for compatibility with the - deprecated dbm extension only and should be avoided. However you - may use this where files were created in this format. That happens - when configure could not find any external library. -inifile This is available since PHP 4.3.3 to be able to modify php.ini - files from within PHP scripts. When working with ini files you - can pass arrays of the form array(0=>group,1=>value_name) or - strings of the form "[group]value_name" where group is optional. - As the functions dba_firstkey() and dba_nextkey() return string - representations of the key there is a new function dba_key_split() - available since PHP 5 which allows to convert the string keys into - array keys without losing FALSE. -qdbm This is available since PHP 5.0.0. The qdbm library can be loaded - from http://qdbm.sourceforge.net. +cdb CDB is "a fast, reliable, lightweight package for creating and + reading constant databases." It is from the author of qmail and + can be found at http://cr.yp.to/cdb.html. Since it is constant, + we support only reading operations. And since PHP 4.3.0 we support + writing (not updating) through the internal cdb library. +cdb_make Since PHP 4.3.0 we support creation (not updating) of cdb files + when the bundled cdb library is used. +flatfile This is available since PHP 4.3.0 for compatibility with the + deprecated dbm extension only and should be avoided. However you + may use this where files were created in this format. That happens + when configure could not find any external library. +inifile This is available since PHP 4.3.3 to be able to modify php.ini + files from within PHP scripts. When working with ini files you + can pass arrays of the form array(0=>group,1=>value_name) or + strings of the form "[group]value_name" where group is optional. + As the functions dba_firstkey() and dba_nextkey() return string + representations of the key there is a new function dba_key_split() + available since PHP 5 which allows to convert the string keys into + array keys without losing FALSE. +qdbm This is available since PHP 5.0.0. The qdbm library can be loaded + from http://qdbm.sourceforge.net. After configuring and compiling PHP you must execute the following test -from commandline: - php run-tests.php ext/dba. -This shows whether your combination of handlers works. Most problematic -are dbm and ndbm which conflict with many installations. The reason for +from commandline: + php run-tests.php ext/dba. +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 +other library. The configuration test only prevents you from configuring malfaunctioning single handlers but not combinations.
\ No newline at end of file diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index 2a99c2a100..bc0fd55d6c 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -155,11 +155,11 @@ if test "$PHP_GDBM" != "no"; then if test -n "$THIS_INCLUDE"; then PHP_CHECK_LIBRARY(gdbm, gdbm_open, [ AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_GDBM, 1, [ ]) + AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS=gdbm ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) fi - + PHP_DBA_STD_ASSIGN PHP_DBA_STD_CHECK PHP_DBA_STD_ATTACH @@ -180,12 +180,12 @@ if test "$PHP_NDBM" != "no"; then break fi done - + if test -n "$THIS_INCLUDE"; then for LIB in ndbm db1 c; do PHP_CHECK_LIBRARY($LIB, dbm_open, [ AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_NDBM, 1, [ ]) + AC_DEFINE(DBA_NDBM, 1, [ ]) THIS_LIBS=$LIB ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then @@ -325,7 +325,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ ]) fi if test -n "$THIS_LIBS"; then - AC_DEFINE(DBA_DB$1, 1, [ ]) + AC_DEFINE(DBA_DB$1, 1, [ ]) if test -n "$THIS_INCLUDE"; then AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) fi @@ -567,7 +567,7 @@ if test "$PHP_DBM" != "no"; then AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ]) AC_MSG_RESULT(no) fi - AC_DEFINE(DBA_DBM, 1, [ ]) + AC_DEFINE(DBA_DBM, 1, [ ]) THIS_LIBS=$LIB ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then @@ -575,7 +575,7 @@ if test "$PHP_DBM" != "no"; then fi done fi - + PHP_DBA_STD_ASSIGN PHP_DBA_STD_CHECK PHP_DBA_STD_ATTACH @@ -621,7 +621,7 @@ elif test "$PHP_CDB" != "no"; then for LIB in cdb c; do PHP_CHECK_LIBRARY($LIB, cdb_read, [ AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) - AC_DEFINE(DBA_CDB, 1, [ ]) + AC_DEFINE(DBA_CDB, 1, [ ]) THIS_LIBS=$LIB ], [], [-L$THIS_PREFIX/$PHP_LIBDIR]) if test -n "$THIS_LIBS"; then @@ -654,7 +654,7 @@ PHP_DBA_STD_RESULT(FlatFile, FlatFile) dnl dnl Extension setup -dnl +dnl AC_MSG_CHECKING([whether to enable DBA interface]) if test "$HAVE_DBA" = "1"; then if test "$ext_shared" = "yes"; then diff --git a/ext/dba/dba_lmdb.c b/ext/dba/dba_lmdb.c index defc35e413..cf59f4689d 100644 --- a/ext/dba/dba_lmdb.c +++ b/ext/dba/dba_lmdb.c @@ -108,7 +108,7 @@ DBA_FETCH_FUNC(lmdb) int rc; MDB_val k, v; char *ret = NULL; - + if (LMDB_IT(cur)) { rc = mdb_txn_renew(LMDB_IT(txn)); } else { @@ -125,7 +125,7 @@ DBA_FETCH_FUNC(lmdb) rc = mdb_get(LMDB_IT(txn), LMDB_IT(dbi), &k, &v); if (rc) { if (MDB_NOTFOUND != rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); } mdb_txn_abort(LMDB_IT(txn)); return NULL; @@ -201,7 +201,7 @@ DBA_EXISTS_FUNC(lmdb) rc = mdb_get(LMDB_IT(txn), LMDB_IT(dbi), &k, &v); if (rc) { if (MDB_NOTFOUND != rc) { - php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); + php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc)); } mdb_txn_abort(LMDB_IT(txn)); return FAILURE; @@ -265,7 +265,7 @@ DBA_FIRSTKEY_FUNC(lmdb) return NULL; } - rc = mdb_cursor_get(LMDB_IT(cur), &k, &v, MDB_FIRST); + rc = mdb_cursor_get(LMDB_IT(cur), &k, &v, MDB_FIRST); if (rc) { mdb_txn_abort(LMDB_IT(txn)); mdb_cursor_close(LMDB_IT(cur)); @@ -298,7 +298,7 @@ DBA_NEXTKEY_FUNC(lmdb) return NULL; } - rc = mdb_cursor_get(LMDB_IT(cur), &k, &v, MDB_NEXT); + rc = mdb_cursor_get(LMDB_IT(cur), &k, &v, MDB_NEXT); if (rc) { mdb_txn_abort(LMDB_IT(txn)); mdb_cursor_close(LMDB_IT(cur)); diff --git a/ext/dba/install_cdb.sh b/ext/dba/install_cdb.sh index ce5f3cc856..86961614b0 100755 --- a/ext/dba/install_cdb.sh +++ b/ext/dba/install_cdb.sh @@ -1,10 +1,10 @@ #! /bin/sh # You can use this script if you want to use an external cdb lib. If you -# compile php using --with-cdb the internal functions will be used and no +# compile php using --with-cdb the internal functions will be used and no # external library is used so that this script is not necessary. # -# cdb-0.75 lacks support for installing header files and creating a +# cdb-0.75 lacks support for installing header files and creating a # library which programs can link against. This shell script fills # the gap. # diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index 5ea62ad24c..ea3cb03793 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -12,7 +12,7 @@ fi if test "$PHP_DOM" != "no"; then - if test "$PHP_LIBXML" = "no"; then + if test "$PHP_LIBXML" = "no"; then AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml]) fi @@ -27,7 +27,7 @@ if test "$PHP_DOM" != "no"; then nodelist.c text.c comment.c domconfiguration.c \ domimplementationsource.c entityreference.c \ notation.c xpath.c dom_iterators.c \ - typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], + typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], $ext_shared) PHP_SUBST(DOM_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/dom/xml_common.h]) diff --git a/ext/dom/document.c b/ext/dom/document.c index fdb71f6738..c9e1802f78 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -2038,7 +2038,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ RETURN_FALSE; } - + ctxt->vctxt.error = php_libxml_ctx_error; ctxt->vctxt.warning = php_libxml_ctx_warning; if (ctxt->sax != NULL) { @@ -2247,7 +2247,7 @@ PHP_METHOD(domdocument, registerNodeClass) dom_set_doc_classmap(intern->document, basece, ce); RETURN_TRUE; } - + zend_throw_error(NULL, "Class %s is not derived from %s.", ZSTR_VAL(ce->name), ZSTR_VAL(basece->name)); RETURN_FALSE; } diff --git a/ext/dom/examples/dom1.php b/ext/dom/examples/dom1.php index 8ea367458d..ca55739c8a 100644 --- a/ext/dom/examples/dom1.php +++ b/ext/dom/examples/dom1.php @@ -41,7 +41,7 @@ echo "--------- creating a new attribute\n"; //$attr = $dom->createAttribute("src", "picture.gif"); //print_r($attr); -//$rootnode->set_attributeNode($attr); +//$rootnode->set_attributeNode($attr); $attr = $rootnode->setAttribute("src", "picture.gif"); $attr = $rootnode->getAttribute("src"); print_r($attr); diff --git a/ext/dom/examples/note-invalid.xml b/ext/dom/examples/note-invalid.xml index 58d4e65044..0f4611c6a2 100644 --- a/ext/dom/examples/note-invalid.xml +++ b/ext/dom/examples/note-invalid.xml @@ -6,4 +6,4 @@ <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> <footer>Or I'll clobber you!</footer> -</note> +</note> diff --git a/ext/dom/examples/note.xml b/ext/dom/examples/note.xml index 49614a1b52..f580ef1c25 100644 --- a/ext/dom/examples/note.xml +++ b/ext/dom/examples/note.xml @@ -5,4 +5,4 @@ <from>Shane</from> <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> -</note> +</note> diff --git a/ext/dom/tests/domdocumentload_utilities.php b/ext/dom/tests/domdocumentload_utilities.php index efd1e5a1a5..d40f7639ff 100644 --- a/ext/dom/tests/domdocumentload_utilities.php +++ b/ext/dom/tests/domdocumentload_utilities.php @@ -1,13 +1,13 @@ <?php function libxml_options_to_int($libxmlOptions) { - + $defined_constants = get_defined_constants(true); $env_array = explode('|', $libxmlOptions); $libxml_constants = array_intersect_key($defined_constants['libxml'], array_flip($env_array)); $sum = 0; - foreach($libxml_constants as $value) { + foreach($libxml_constants as $value) { $sum = $sum|$value; } diff --git a/ext/dom/tests/domdocumentloadxml_test_method.php b/ext/dom/tests/domdocumentloadxml_test_method.php index ed2f38b6c6..9b97e2badd 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method.php +++ b/ext/dom/tests/domdocumentloadxml_test_method.php @@ -4,7 +4,7 @@ include(dirname(__FILE__) . '/domdocumentload_utilities.php'); $doc = new DOMDocument(); $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); -$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), +$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); diff --git a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php index 1ef72d58d7..1bcf8a8e33 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php +++ b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php @@ -4,7 +4,7 @@ include(dirname(__FILE__) . '/domdocumentload_utilities.php'); $doc = new DOMDocument(); $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); -$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), +$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); diff --git a/ext/dom/tests/note.xml b/ext/dom/tests/note.xml index 49614a1b52..f580ef1c25 100644 --- a/ext/dom/tests/note.xml +++ b/ext/dom/tests/note.xml @@ -5,4 +5,4 @@ <from>Shane</from> <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> -</note> +</note> diff --git a/ext/enchant/package.xml b/ext/enchant/package.xml index 1012839382..26b79f4950 100755 --- a/ext/enchant/package.xml +++ b/ext/enchant/package.xml @@ -7,7 +7,7 @@ API for many spell libraries: - aspell/pspell (intended to replace ispell) - hspell (hebrew) -- ispell +- ispell - myspell/hunspell (OpenOffice project, mozilla) - uspell (primarily Yiddish, Hebrew, and Eastern European languages) A plugin system allows to add custom spell support. diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 3a76d8fde8..14e22ca7aa 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -138,7 +138,7 @@ PHP_MINFO_FUNCTION(exif) php_info_print_table_row(2, "Supported EXIF Version", "0220"); php_info_print_table_row(2, "Supported filetypes", "JPEG, TIFF"); - if (zend_hash_str_exists(&module_registry, "mbstring", sizeof("mbstring")-1)) { + if (zend_hash_str_exists(&module_registry, "mbstring", sizeof("mbstring")-1)) { php_info_print_table_row(2, "Multibyte decoding support using mbstring", "enabled"); } else { php_info_print_table_row(2, "Multibyte decoding support using mbstring", "disabled"); @@ -965,36 +965,36 @@ static tag_info_array tag_table_VND_OLYMPUS = { }; static tag_info_array tag_table_VND_SAMSUNG = { - { 0x0001, "Version"}, - { 0x0021, "PictureWizard"}, - { 0x0030, "LocalLocationName"}, - { 0x0031, "LocationName"}, - { 0x0035, "Preview"}, - { 0x0043, "CameraTemperature"}, - { 0xa001, "FirmwareName"}, - { 0xa003, "LensType"}, - { 0xa004, "LensFirmware"}, - { 0xa010, "SensorAreas"}, - { 0xa011, "ColorSpace"}, - { 0xa012, "SmartRange"}, - { 0xa013, "ExposureBiasValue"}, - { 0xa014, "ISO"}, - { 0xa018, "ExposureTime"}, - { 0xa019, "FNumber"}, - { 0xa01a, "FocalLengthIn35mmFormat"}, - { 0xa020, "EncryptionKey"}, - { 0xa021, "WB_RGGBLevelsUncorrected"}, - { 0xa022, "WB_RGGBLevelsAuto"}, - { 0xa023, "WB_RGGBLevelsIlluminator1"}, - { 0xa024, "WB_RGGBLevelsIlluminator2"}, - { 0xa028, "WB_RGGBLevelsBlack"}, - { 0xa030, "ColorMatrix"}, - { 0xa031, "ColorMatrixSRGB"}, - { 0xa032, "ColorMatrixAdobeRGB"}, - { 0xa040, "ToneCurve1"}, - { 0xa041, "ToneCurve2"}, - { 0xa042, "ToneCurve3"}, - { 0xa043, "ToneCurve4"}, + { 0x0001, "Version"}, + { 0x0021, "PictureWizard"}, + { 0x0030, "LocalLocationName"}, + { 0x0031, "LocationName"}, + { 0x0035, "Preview"}, + { 0x0043, "CameraTemperature"}, + { 0xa001, "FirmwareName"}, + { 0xa003, "LensType"}, + { 0xa004, "LensFirmware"}, + { 0xa010, "SensorAreas"}, + { 0xa011, "ColorSpace"}, + { 0xa012, "SmartRange"}, + { 0xa013, "ExposureBiasValue"}, + { 0xa014, "ISO"}, + { 0xa018, "ExposureTime"}, + { 0xa019, "FNumber"}, + { 0xa01a, "FocalLengthIn35mmFormat"}, + { 0xa020, "EncryptionKey"}, + { 0xa021, "WB_RGGBLevelsUncorrected"}, + { 0xa022, "WB_RGGBLevelsAuto"}, + { 0xa023, "WB_RGGBLevelsIlluminator1"}, + { 0xa024, "WB_RGGBLevelsIlluminator2"}, + { 0xa028, "WB_RGGBLevelsBlack"}, + { 0xa030, "ColorMatrix"}, + { 0xa031, "ColorMatrixSRGB"}, + { 0xa032, "ColorMatrixAdobeRGB"}, + { 0xa040, "ToneCurve1"}, + { 0xa041, "ToneCurve2"}, + { 0xa042, "ToneCurve3"}, + { 0xa043, "ToneCurve4"}, TAG_TABLE_END }; @@ -1105,72 +1105,72 @@ static tag_info_array tag_table_VND_PANASONIC = { }; static tag_info_array tag_table_VND_DJI = { - { 0x0001, "Make"}, - { 0x0003, "SpeedX"}, - { 0x0004, "SpeedY"}, - { 0x0005, "SpeedZ"}, - { 0x0006, "Pitch"}, - { 0x0007, "Yaw"}, - { 0x0008, "Roll"}, - { 0x0009, "CameraPitch"}, - { 0x000a, "CameraYaw"}, - { 0x000b, "CameraRoll"}, + { 0x0001, "Make"}, + { 0x0003, "SpeedX"}, + { 0x0004, "SpeedY"}, + { 0x0005, "SpeedZ"}, + { 0x0006, "Pitch"}, + { 0x0007, "Yaw"}, + { 0x0008, "Roll"}, + { 0x0009, "CameraPitch"}, + { 0x000a, "CameraYaw"}, + { 0x000b, "CameraRoll"}, TAG_TABLE_END }; static tag_info_array tag_table_VND_SONY = { - { 0x0102, "Quality"}, - { 0x0104, "FlashExposureComp"}, - { 0x0105, "Teleconverter"}, - { 0x0112, "WhiteBalanceFineTune"}, - { 0x0114, "CameraSettings"}, - { 0x0115, "WhiteBalance"}, - { 0x0116, "0x0116"}, - { 0x0e00, "PrintIM"}, - { 0x1000, "MultiBurstMode"}, - { 0x1001, "MultiBurstImageWidth"}, - { 0x1002, "MultiBurstImageHeight"}, - { 0x1003, "Panorama"}, - { 0x2000, "0x2000"}, - { 0x2001, "PreviewImage"}, - { 0x2002, "0x2002"}, - { 0x2003, "0x2003"}, - { 0x2004, "Contrast"}, - { 0x2005, "Saturation"}, - { 0x2006, "0x2006"}, - { 0x2007, "0x2007"}, - { 0x2008, "0x2008"}, - { 0x2009, "0x2009"}, - { 0x200a, "AutoHDR"}, - { 0x3000, "ShotInfo"}, - { 0xb000, "FileFormat"}, - { 0xb001, "SonyModelID"}, - { 0xb020, "ColorReproduction"}, - { 0xb021, "ColorTemperature"}, - { 0xb022, "ColorCompensationFilter"}, - { 0xb023, "SceneMode"}, - { 0xb024, "ZoneMatching"}, - { 0xb025, "DynamicRangeOptimizer"}, - { 0xb026, "ImageStabilization"}, - { 0xb027, "LensID"}, - { 0xb028, "MinoltaMakerNote"}, - { 0xb029, "ColorMode"}, - { 0xb02b, "FullImageSize"}, - { 0xb02c, "PreviewImageSize"}, - { 0xb040, "Macro"}, - { 0xb041, "ExposureMode"}, - { 0xb042, "FocusMode"}, - { 0xb043, "AFMode"}, - { 0xb044, "AFIlluminator"}, - { 0xb047, "JPEGQuality"}, - { 0xb048, "FlashLevel"}, - { 0xb049, "ReleaseMode"}, - { 0xb04a, "SequenceNumber"}, - { 0xb04b, "AntiBlur"}, - { 0xb04e, "LongExposureNoiseReduction"}, - { 0xb04f, "DynamicRangeOptimizer"}, - { 0xb052, "IntelligentAuto"}, - { 0xb054, "WhiteBalance2"}, + { 0x0102, "Quality"}, + { 0x0104, "FlashExposureComp"}, + { 0x0105, "Teleconverter"}, + { 0x0112, "WhiteBalanceFineTune"}, + { 0x0114, "CameraSettings"}, + { 0x0115, "WhiteBalance"}, + { 0x0116, "0x0116"}, + { 0x0e00, "PrintIM"}, + { 0x1000, "MultiBurstMode"}, + { 0x1001, "MultiBurstImageWidth"}, + { 0x1002, "MultiBurstImageHeight"}, + { 0x1003, "Panorama"}, + { 0x2000, "0x2000"}, + { 0x2001, "PreviewImage"}, + { 0x2002, "0x2002"}, + { 0x2003, "0x2003"}, + { 0x2004, "Contrast"}, + { 0x2005, "Saturation"}, + { 0x2006, "0x2006"}, + { 0x2007, "0x2007"}, + { 0x2008, "0x2008"}, + { 0x2009, "0x2009"}, + { 0x200a, "AutoHDR"}, + { 0x3000, "ShotInfo"}, + { 0xb000, "FileFormat"}, + { 0xb001, "SonyModelID"}, + { 0xb020, "ColorReproduction"}, + { 0xb021, "ColorTemperature"}, + { 0xb022, "ColorCompensationFilter"}, + { 0xb023, "SceneMode"}, + { 0xb024, "ZoneMatching"}, + { 0xb025, "DynamicRangeOptimizer"}, + { 0xb026, "ImageStabilization"}, + { 0xb027, "LensID"}, + { 0xb028, "MinoltaMakerNote"}, + { 0xb029, "ColorMode"}, + { 0xb02b, "FullImageSize"}, + { 0xb02c, "PreviewImageSize"}, + { 0xb040, "Macro"}, + { 0xb041, "ExposureMode"}, + { 0xb042, "FocusMode"}, + { 0xb043, "AFMode"}, + { 0xb044, "AFIlluminator"}, + { 0xb047, "JPEGQuality"}, + { 0xb048, "FlashLevel"}, + { 0xb049, "ReleaseMode"}, + { 0xb04a, "SequenceNumber"}, + { 0xb04b, "AntiBlur"}, + { 0xb04e, "LongExposureNoiseReduction"}, + { 0xb04f, "DynamicRangeOptimizer"}, + { 0xb052, "IntelligentAuto"}, + { 0xb054, "WhiteBalance2"}, TAG_TABLE_END }; @@ -1319,16 +1319,16 @@ static tag_info_array tag_table_VND_SIGMA = { }; static tag_info_array tag_table_VND_KYOCERA = { - { 0x0001, "FormatThumbnail"}, - { 0x0E00, "PrintImageMatchingInfo"}, + { 0x0001, "FormatThumbnail"}, + { 0x0E00, "PrintImageMatchingInfo"}, TAG_TABLE_END }; static tag_info_array tag_table_VND_RICOH = { - { 0x0001, "MakerNoteDataType"}, - { 0x0002, "Version"}, - { 0x0E00, "PrintImageMatchingInfo"}, - { 0x2001, "RicohCameraInfoMakerNoteSubIFD"}, + { 0x0001, "MakerNoteDataType"}, + { 0x0002, "Version"}, + { 0x0E00, "PrintImageMatchingInfo"}, + { 0x2001, "RicohCameraInfoMakerNoteSubIFD"}, TAG_TABLE_END }; @@ -1365,20 +1365,20 @@ static const maker_note_type maker_note_array[] = { { tag_table_VND_NIKON, "NIKON", NULL, "Nikon\x00\x01\x00", 8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, { tag_table_VND_NIKON_990, "NIKON", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, { tag_table_VND_OLYMPUS, "OLYMPUS OPTICAL CO.,LTD", NULL, "OLYMP\x00\x01\x00", 8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_SAMSUNG, "SAMSUNG", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_PANASONIC, "Panasonic", NULL, "Panasonic\x00\x00\x00", 12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_DJI, "DJI", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_SONY, "SONY", NULL, "SONY DSC \x00\x00\x00", 12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_PENTAX, "PENTAX", NULL, "AOC\x00", 6, 6, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_MINOLTA, "Minolta, KONICA MINOLTA", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_SIGMA, "SIGMA, FOVEON", NULL, "SIGMA\x00\x00\x00", 10, 10, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_SIGMA, "SIGMA, FOVEON", NULL, "FOVEON\x00\x00\x00", 10, 10, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, - { tag_table_VND_KYOCERA, "KYOCERA, CONTAX", NULL, "KYOCERA \x00\x00\x00", 22, 22, MN_ORDER_NORMAL, MN_OFFSET_MAKER}, - { tag_table_VND_RICOH, "RICOH", NULL, "Ricoh", 5, 5, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL}, - { tag_table_VND_RICOH, "RICOH", NULL, "RICOH", 5, 5, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL}, + { tag_table_VND_SAMSUNG, "SAMSUNG", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_PANASONIC, "Panasonic", NULL, "Panasonic\x00\x00\x00", 12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_DJI, "DJI", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_SONY, "SONY", NULL, "SONY DSC \x00\x00\x00", 12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_PENTAX, "PENTAX", NULL, "AOC\x00", 6, 6, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_MINOLTA, "Minolta, KONICA MINOLTA", NULL, NULL, 0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_SIGMA, "SIGMA, FOVEON", NULL, "SIGMA\x00\x00\x00", 10, 10, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_SIGMA, "SIGMA, FOVEON", NULL, "FOVEON\x00\x00\x00", 10, 10, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_KYOCERA, "KYOCERA, CONTAX", NULL, "KYOCERA \x00\x00\x00", 22, 22, MN_ORDER_NORMAL, MN_OFFSET_MAKER}, + { tag_table_VND_RICOH, "RICOH", NULL, "Ricoh", 5, 5, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL}, + { tag_table_VND_RICOH, "RICOH", NULL, "RICOH", 5, 5, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL}, /* These re-uses existing formats */ - { tag_table_VND_OLYMPUS, "AGFA", NULL, "AGFA \x00\x01", 8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, + { tag_table_VND_OLYMPUS, "AGFA", NULL, "AGFA \x00\x01", 8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}, { tag_table_VND_OLYMPUS, "EPSON", NULL, "EPSON\x00\x01\x00", 8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL} }; /* }}} */ @@ -3151,7 +3151,7 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu continue; break; } - + if (maker_note->offset >= value_len) { /* Do not go past the value end */ exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "IFD data too short: 0x%04X offset 0x%04X", value_len, maker_note->offset); diff --git a/ext/exif/package.xml b/ext/exif/package.xml index 68ba9c1bbf..ecb7c40562 100644 --- a/ext/exif/package.xml +++ b/ext/exif/package.xml @@ -18,8 +18,8 @@ </maintainer> </maintainers> <description> -The EXIF functions provide access to information stored in headers -of JPEG and TIFF images. This way you can read meta data generated +The EXIF functions provide access to information stored in headers +of JPEG and TIFF images. This way you can read meta data generated by digital cameras and certain image processing applications. </description> <license>PHP</license> diff --git a/ext/ext_skel_win32.php b/ext/ext_skel_win32.php index 770c6f48bb..ba44ae6089 100644 --- a/ext/ext_skel_win32.php +++ b/ext/ext_skel_win32.php @@ -7,12 +7,12 @@ if (php_sapi_name() != "cli") { } /* This script can be used on Win32 systems - + 1) Make sure you have CygWin installed 2) Adjust the $cygwin_path to match your installation 3) Change the environment cariable PATHEXT to include .PHP 4) run ext_skel --extname=... - the first time you run this script you will be asked to + the first time you run this script you will be asked to associate it with a program. chooses the CLI version of php. */ @@ -39,7 +39,7 @@ $fp = fopen("$extname/$extname.php", "rb"); if ($fp) { $php_file = fread($fp, filesize("$extname/$extname.php")); fclose($fp); - + $php_file = str_replace("dl('", "dl('php_", $php_file); $fp = fopen("$extname/$extname.php", "wb"); if ($fp) { diff --git a/ext/fileinfo/package.xml b/ext/fileinfo/package.xml index a274e47161..2129336b61 100644 --- a/ext/fileinfo/package.xml +++ b/ext/fileinfo/package.xml @@ -12,10 +12,10 @@ </maintainer> </maintainers> <description> -This extension allows retrieval of information regarding vast majority of file. +This extension allows retrieval of information regarding vast majority of file. This information may include dimensions, quality, length etc... -Additionally it can also be used to retrieve the mime type for a particular +Additionally it can also be used to retrieve the mime type for a particular file and for text files proper language encoding. </description> <license>PHP</license> diff --git a/ext/filter/docs/filter.txt b/ext/filter/docs/filter.txt index 48aae0c8d5..a5d4bce41f 100644 --- a/ext/filter/docs/filter.txt +++ b/ext/filter/docs/filter.txt @@ -6,7 +6,7 @@ Introduction We all know that you should always check input variables, but PHP does not offer really good functionality for doing this in a safe way. The Input Filter extension is meant to address this issue by implementing a set of filters and -mechanisms that users can use to safely access their input data. +mechanisms that users can use to safely access their input data. Change Log @@ -51,7 +51,7 @@ General Considerations * All flags mentioned here should be prepended with `FILTER_FLAG_` when used with PHP. - + API === mixed *input_get* (int *source*, string *name*, [, int *filter* [, mixed *filter_options*, [ string *characterset* ] ]); @@ -62,7 +62,7 @@ mixed *input_get* (int *source*, string *name*, [, int *filter* [, mixed *filter mixed *input_get_args* (array *definitions*, int *source*, [, array *data*]); Returns an array with all filtered variables defined in 'definition'. The keys are used as the name of the argument. The value can be either - an integer (flags) or an array of options. This array can contain + an integer (flags) or an array of options. This array can contain the 'filter' type, the 'flags', the 'otptions' or the 'charset' bool *input_has_variable (int *source*, string *name*); @@ -110,7 +110,7 @@ application by returning false. The constants should be prepended by `FILTER_VALIDATE_` when used with php. ================ ========== =========== ================================================== -Name Constant Return Type Description +Name Constant Return Type Description ================ ========== =========== ================================================== int INT integer Returns the input variable as an integer @@ -122,7 +122,7 @@ int INT integer Returns the input variable as an integer * max_range: Maximum number that is allowed (inclusive) * flags: A bitmask supporting the following flags: - + - ALLOW_OCTAL: allow octal numbers with the format 0nn as input too. - ALLOW_HEX: allow hexadecimal numbers with the @@ -144,7 +144,7 @@ validate_url URL string Validates an URL's format. $filter_options - an bitmask that supports the following flags: - + * SCHEME_REQUIRED: The 'schema' part of the URL needs to in the passed URL. * HOST_REQUIRED: The 'host' part of the URL @@ -180,9 +180,9 @@ set rules for this specific filter. Instead of taking an *options* array, they use this parameter for flags for the specific filter. The constants should be prepended by `FILTER_SANITIZE_` when used with php. - + ============= ================ =========== ===================================================== -Name Constant Return Type Description +Name Constant Return Type Description ============= ================ =========== ===================================================== string STRING string Returns the input variable as a string after it has been stripped of XML/HTML tags and other evil things @@ -190,7 +190,7 @@ string STRING string Returns the input variable as a strin $filter_options - an bitmask that supports the following flags: - + * NO_ENCODE_QUOTES: Prevents single and double quotes from being encoded as numerical HTML entities. @@ -228,10 +228,10 @@ encoded ENCODED string Encodes all characters outside the ra special_chars SPECIAL_CHARS string Encodes the 'special' characters ' " < > &, \0 and everything below 0x20 as numerical HTML entities. - + $filter_options - an bitmask that supports the following flags: - + * STRIP_LOW: excludes all characters < 0x20 from the allowed character list. If this is not set, then those characters are encoded as numerical HTML @@ -243,10 +243,10 @@ special_chars SPECIAL_CHARS string Encodes the 'special' characters ' " unsafe_raw UNSAFE_RAW string Returns the input variable as a string without XML/HTML being stripped from the input value. - + $filter_options - an bitmask that supports the following flags: - + * STRIP_LOW: excludes all characters < 0x20 from the allowed character list * STRIP_HIGH: excludes all characters >= 0x80 from @@ -256,7 +256,7 @@ unsafe_raw UNSAFE_RAW string Returns the input variable as a strin * ENCODE_HIGH: allows characters >= 0x80 but encodes them as numerical HTML entities * ENCODE_AMP: encodes & as & - + The flags STRIP_LOW and ENCODE_LOW are mutual exclusive, and so are STRIP_HIGH and ENCODE_HIGH. In the case they clash, the characters will be @@ -269,20 +269,20 @@ email EMAIL string Removes all characters that can not b filter does `not` validate if the e-mail address has the correct format, use the validate_email filter for that. - + url URL string Removes all characters that can not be part of a correctly formed URI. (a-z A-Z 0-9 $ - _ . + ! * ' ( ) , { } | \ ^ ~ [ ] ` < > # % " ; / ? : @ & =) This filter does `not` validate if a URI has the correct format, use the validate_url filter for that. - + number_int NUMBER_INT int Removes all characters that are [^0-9+-]. number_float NUMBER_FLOAT float Removes all characters that are [^0-9+-]. $filter_options - an bitmask that supports the following flags: - + * ALLOW_FRACTION: adds "." to the characters that are not stripped. * ALLOW_THOUSAND: adds "," to the characters that @@ -308,7 +308,7 @@ supported: The constants should be prepended by `FILTER_` when used with php. ============= =========== =========== ===================================================== -Name Constant Return Type Description +Name Constant Return Type Description ============= =========== =========== ===================================================== callback CALLBACK mixed Calls the callback function/method with the input variable's value by reference which can do filtering diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 9b409026a7..09aa43a42c 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -71,8 +71,8 @@ */ static int ftp_putcmd( ftpbuf_t *ftp, const char *cmd, - const size_t cmd_len, - const char *args, + const size_t cmd_len, + const char *args, const size_t args_len); /* wrapper around send/recv to handle timeouts */ diff --git a/ext/ftp/package.xml b/ext/ftp/package.xml index 9b70e33229..860fb2b290 100644 --- a/ext/ftp/package.xml +++ b/ext/ftp/package.xml @@ -18,13 +18,13 @@ </maintainer> </maintainers> <description> -The functions in this extension implement client access to file -servers speaking the File Transfer Protocol (FTP) as defined in -http://www.faqs.org/rfcs/rfc959. This extension is meant for -detailed access to an FTP server providing a wide range of -control to the executing script. If you only wish to read from -or write to a file on an FTP server, consider using the ftp:// -wrapper with the filesystem functions which provide a simpler +The functions in this extension implement client access to file +servers speaking the File Transfer Protocol (FTP) as defined in +http://www.faqs.org/rfcs/rfc959. This extension is meant for +detailed access to an FTP server providing a wide range of +control to the executing script. If you only wish to read from +or write to a file on an FTP server, consider using the ftp:// +wrapper with the filesystem functions which provide a simpler and more intuitive interface. </description> <license>PHP</license> diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 1edd91f4ad..7abbee4389 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -347,7 +347,7 @@ dnl if test "$PHP_GD" != "no"; then PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) - if test "$GD_MODULE_TYPE" = "builtin"; then + if test "$GD_MODULE_TYPE" = "builtin"; then PHP_ADD_BUILD_DIR($ext_builddir/libgd) GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 567cdd52e2..4acd25c43c 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -15,8 +15,8 @@ if (PHP_GD != "no") { CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") || CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || + CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11") @@ -78,7 +78,7 @@ if (PHP_GD != "no") { if (ICC_TOOLSET) { ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt"); } - + PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd" ); } else { WARNING("gd not enabled; libraries and headers not found"); diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 2e021de788..50d4745371 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3902,7 +3902,7 @@ PHP_FUNCTION(imagesetclip) zval *im_zval; gdImagePtr im; zend_long x1, y1, x2, y2; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rllll", &im_zval, &x1, &y1, &x2, &y2) == FAILURE) { return; } @@ -3923,7 +3923,7 @@ PHP_FUNCTION(imagegetclip) zval *im_zval; gdImagePtr im; int x1, y1, x2, y2; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &im_zval) == FAILURE) { return; } @@ -3933,7 +3933,7 @@ PHP_FUNCTION(imagegetclip) } gdImageGetClip(im, &x1, &y1, &x2, &y2); - + array_init(return_value); add_next_index_long(return_value, x1); add_next_index_long(return_value, y1); diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc index 1928ff696a..014d2e1644 100644 --- a/ext/gd/tests/func.inc +++ b/ext/gd/tests/func.inc @@ -18,44 +18,44 @@ function get_php_info() function get_freetype_version() { $version = 0; - + if (preg_match(',FreeType Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } function get_libjpeg_version() { $version = 0; - + if (preg_match(',libJPEG Version => ([a-z0-9]+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } function get_libpng_version() { $version = 0; - + if (preg_match(',libPNG Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } function get_libxpm_version() { $version = 0; - + if (preg_match(',libXpm Version => (\d+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index 59a6d077de..08f5015340 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -16,7 +16,7 @@ if test "$PHP_GETTEXT" != "no"; then GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR GETTEXT_INCDIR=$GETTEXT_DIR/include - + O_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" AC_CHECK_LIB(intl, bindtextdomain, [ @@ -42,7 +42,7 @@ if test "$PHP_GETTEXT" != "no"; then AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext, [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])]) AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset, [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])]) LDFLAGS=$O_LDFLAGS - + if test -n "$GETTEXT_LIBS"; then PHP_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD) fi diff --git a/ext/gmp/README b/ext/gmp/README index e142e2e031..2213237f76 100644 --- a/ext/gmp/README +++ b/ext/gmp/README @@ -1,5 +1,5 @@ Arbitrary length number support with GNU MP library. Please see the PGP manual for more documentation. See also GNU MP home page at http://www.swox.com/gmp/. -GNU MP library is available under the tems of GNU LGPL +GNU MP library is available under the tems of GNU LGPL license. Please see http://www.swox.com/gmp/lgpl.html diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 index 22cca7eaf2..1567d30cac 100644 --- a/ext/gmp/config.m4 +++ b/ext/gmp/config.m4 @@ -13,7 +13,7 @@ if test "$PHP_GMP" != "no"; then if test -z "$GMP_DIR"; then AC_MSG_ERROR(Unable to locate gmp.h) fi - + PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem, [],[ AC_MSG_ERROR([GNU MP Library version 4.2 or greater required.]) diff --git a/ext/hash/README b/ext/hash/README index 97eb206d02..8c01afa6b1 100644 --- a/ext/hash/README +++ b/ext/hash/README @@ -15,5 +15,5 @@ $context = hash_init($algoname); hash_update($context, $message); $digest = hash_final($context); -hash(), hash_file(), and hash_final() each support an optional boolean parameter $raw_output which behaves in the same +hash(), hash_file(), and hash_final() each support an optional boolean parameter $raw_output which behaves in the same manner as sha1()'s optional parameter. diff --git a/ext/hash/bench.php b/ext/hash/bench.php index a433af0178..280190f767 100644 --- a/ext/hash/bench.php +++ b/ext/hash/bench.php @@ -3,7 +3,7 @@ /* This gives rather interesting results :) - + Measures on a Notebook P4M-1.7 256MB Windows 2000: sha1 0.556691 tiger160,3 0.774469 diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 index 6f04fd6bf0..e56b66fa2d 100644 --- a/ext/hash/config.w32 +++ b/ext/hash/config.w32 @@ -2,7 +2,7 @@ // vim:ft=javascript ARG_ENABLE("hash", "enable hash support", "yes"); -ARG_WITH("mhash", "mhash support", "no"); +ARG_WITH("mhash", "mhash support", "no"); if (PHP_MHASH != "no") { if (PHP_HASH == "no") { @@ -26,7 +26,7 @@ if (PHP_HASH != "no") { PHP_INSTALL_HEADERS("ext/hash/", "php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h " + - "php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h " + + "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 "); } else { WARNING("hash not enabled; libraries and headers not found"); diff --git a/ext/hash/package.xml b/ext/hash/package.xml index 25a598a4a1..50d28a274d 100644 --- a/ext/hash/package.xml +++ b/ext/hash/package.xml @@ -89,6 +89,6 @@ Supported Algorithms: </filelist> </package> -<!-- +<!-- vim: et ts=1 sw=1 --> diff --git a/ext/hash/sha3/generic32lc/KeccakP-1600-inplace32BI.c b/ext/hash/sha3/generic32lc/KeccakP-1600-inplace32BI.c index 3595e5f47f..b566291220 100644 --- a/ext/hash/sha3/generic32lc/KeccakP-1600-inplace32BI.c +++ b/ext/hash/sha3/generic32lc/KeccakP-1600-inplace32BI.c @@ -1049,7 +1049,7 @@ void KeccakP1600_Permute_Nrounds(void *state, unsigned int nRounds) SwapPI13( &Abo0, &Amo0, &Aso0, &Ago0, 1, 0, 1, 0 ); SwapEO( Ako0, Ako1 ); SwapPI13( &Abu0, &Asu0, &Aku0, &Amu0, 0, 1, 0, 1 ); - break; + break; case 2: SwapPI2( &Aga0, &Asa0, &Aka0, &Ama0 ); @@ -1057,7 +1057,7 @@ void KeccakP1600_Permute_Nrounds(void *state, unsigned int nRounds) SwapPI2( &Abi0, &Agi0, &Aki0, &Asi0 ); SwapPI2( &Abo0, &Aso0, &Ago0, &Amo0 ); SwapPI2( &Abu0, &Aku0, &Amu0, &Asu0 ); - break; + break; case 3: SwapPI13( &Aga0, &Ama0, &Asa0, &Aka0, 0, 1, 0, 1 ); @@ -1067,7 +1067,7 @@ void KeccakP1600_Permute_Nrounds(void *state, unsigned int nRounds) SwapPI13( &Abo0, &Ago0, &Aso0, &Amo0, 0, 1, 0, 1 ); SwapEO( Ako0, Ako1 ); SwapPI13( &Abu0, &Amu0, &Aku0, &Asu0, 1, 0, 1, 0 ); - break; + break; #undef I0 #undef I1 #undef T0 diff --git a/ext/iconv/CREDITS b/ext/iconv/CREDITS index 70d3825ac3..990abde45a 100644 --- a/ext/iconv/CREDITS +++ b/ext/iconv/CREDITS @@ -1,2 +1,2 @@ Iconv -Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi +Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index 05281e07e7..3fd91038b0 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -9,7 +9,7 @@ if (PHP_ICONV != "no") { CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) { EXTENSION("iconv", "iconv.c", PHP_ICONV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - + AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled"); AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available"); AC_DEFINE("ICONV_ALIASED_LIBICONV", 1, "The iconv function is called iconv() in libiconv"); diff --git a/ext/imap/IMAP_Win32_HOWTO.txt b/ext/imap/IMAP_Win32_HOWTO.txt index 5fbd859a6d..88c4669486 100644 --- a/ext/imap/IMAP_Win32_HOWTO.txt +++ b/ext/imap/IMAP_Win32_HOWTO.txt @@ -29,4 +29,3 @@ Start Visual Studio, load php_modules.dsw, select the IMAP projects, and build it. -
\ No newline at end of file diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index badb6e26b2..8c86789f25 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -7,8 +7,8 @@ AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then IMAP_DIR=$i IMAP_INC_DIR=$i$1 break - elif test -r "$i$1/rfc822.h"; then - IMAP_DIR=$i; + elif test -r "$i$1/rfc822.h"; then + IMAP_DIR=$i; IMAP_INC_DIR=$i$1 break ]) @@ -54,14 +54,14 @@ AC_DEFUN([PHP_IMAP_KRB_CHK], [ [ AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) ], [ - AC_MSG_ERROR([Kerberos libraries not found. - + AC_MSG_ERROR([Kerberos libraries not found. + Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) ]) ]) else AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ - AC_MSG_ERROR([This c-client library is built with Kerberos support. + AC_MSG_ERROR([This c-client library is built with Kerberos support. Add --with-kerberos to your configure line. Check config.log for details. ]) @@ -78,14 +78,14 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [ [ AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) ], [ - AC_MSG_ERROR([OpenSSL libraries not found. - + AC_MSG_ERROR([OpenSSL libraries not found. + Check the path given to --with-openssl-dir and output in config.log) ]) ]) elif test -f "$IMAP_INC_DIR/linkage.c"; then AC_EGREP_HEADER(ssl_onceonlyinit, $IMAP_INC_DIR/linkage.c, [ - AC_MSG_ERROR([This c-client library is built with SSL support. + AC_MSG_ERROR([This c-client library is built with SSL support. Add --with-imap-ssl to your configure line. Check config.log for details. ]) @@ -104,7 +104,7 @@ PHP_ARG_WITH(imap-ssl,for IMAP SSL support, [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) -if test "$PHP_IMAP" != "no"; then +if test "$PHP_IMAP" != "no"; then PHP_SUBST(IMAP_SHARED_LIBADD) PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared) AC_DEFINE(HAVE_IMAP,1,[ ]) @@ -180,18 +180,18 @@ if test "$PHP_IMAP" != "no"; then ],[]) CPPFLAGS=$old_CPPFLAGS - PHP_CHECK_LIBRARY(pam, pam_start, + PHP_CHECK_LIBRARY(pam, pam_start, [ PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD) AC_DEFINE(HAVE_LIBPAM,1,[ ]) ]) - PHP_CHECK_LIBRARY(crypt, crypt, + PHP_CHECK_LIBRARY(crypt, crypt, [ PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD) AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ]) - + PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) if test -z "$IMAP_DIR"; then diff --git a/ext/imap/tests/README b/ext/imap/tests/README index 0d222ad0b8..0e554e94c0 100644 --- a/ext/imap/tests/README +++ b/ext/imap/tests/README @@ -1,7 +1,7 @@ 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. +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. The tests have been checked using dovecot (on Linux 32 and 64 bit systems) and hMailServer on Windows. The tests are intended to be mailserver agnostic. diff --git a/ext/imap/tests/clean.inc b/ext/imap/tests/clean.inc index f5e869ff07..2557489ba1 100644 --- a/ext/imap/tests/clean.inc +++ b/ext/imap/tests/clean.inc @@ -6,7 +6,7 @@ $imap_stream = imap_open($default_mailbox, $username, $password); // delete all msgs in default mailbox, i.e INBOX $check = imap_check($imap_stream); for ($i = 1; $i <= $check->Nmsgs; $i++) { - imap_delete($imap_stream, $i); + imap_delete($imap_stream, $i); } $mailboxes = imap_getmailboxes($imap_stream, $server, '*'); @@ -14,12 +14,12 @@ $mailboxes = imap_getmailboxes($imap_stream, $server, '*'); foreach($mailboxes as $value) { // Only delete mailboxes with our prefix if (preg_match('/\{.*?\}INBOX\.(.+)/', $value->name, $match) == 1) { - if (strlen($match[1]) >= strlen($mailbox_prefix) + if (strlen($match[1]) >= strlen($mailbox_prefix) && substr_compare($match[1], $mailbox_prefix, 0, strlen($mailbox_prefix)) == 0) { imap_deletemailbox($imap_stream, $value->name); } - } + } } -imap_close($imap_stream, CL_EXPUNGE); +imap_close($imap_stream, CL_EXPUNGE); ?>
\ No newline at end of file diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc index 110a449cd5..ccb1685d73 100644 --- a/ext/imap/tests/imap_include.inc +++ b/ext/imap/tests/imap_include.inc @@ -3,7 +3,7 @@ $server = '{127.0.0.1/norsh}'; $default_mailbox = $server . "INBOX"; $domain = "something.com"; -$admin_user = "webmaster"; // a user with admin access +$admin_user = "webmaster"; // a user with admin access $username = "$admin_user@$domain"; $password = 'p4ssw0rd'; $users = array("webmaster", "info", "admin", "foo"); // tests require 4 valid userids @@ -56,39 +56,39 @@ function displayOverviewFields($resp, $fields=null) { /** - * Create a test mailbox and populate with msgs + * Create a test mailbox and populate with msgs * * @param string mailbox_suffix Suffix used to uniquely identify mailboxes - * @param int message_count number of test msgs to be written to new mailbox - * + * @param int message_count number of test msgs to be written to new mailbox + * * @return IMAP stream to new mailbox on success; FALSE on failure */ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){ global $server, $default_mailbox, $username, $password; - + // open a stream to default mailbox $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; - } - + } + echo "Create a temporary mailbox and add " . $message_count . " msgs\n"; $new_mailbox = create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type); if ($new_mailbox === false) { echo "Cant create a temporary mailbox: " . imap_last_error(). "\n"; return false; } - + echo ".. mailbox '$new_mailbox' created\n"; - + // reopen stream to new mailbox if (imap_reopen($imap_stream, $new_mailbox) === false) { echo "cant re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n"; return false; } - + return $imap_stream; } @@ -101,9 +101,9 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul function create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type= "simple"){ global $default_mailbox, $mailbox_prefix; $mailbox = $default_mailbox . "." . $mailbox_prefix . $mailbox_suffix; - + $mailboxes = imap_getmailboxes($imap_stream, $mailbox, '*'); - + // check mailbox does not already exist if ($mailboxes) { foreach($mailboxes as $value) { @@ -111,17 +111,17 @@ function create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type exit ("TEST FAILED : Mailbox '$mailbox' already exists\n"); } } - } + } if (imap_createmailbox($imap_stream, $mailbox) === false) { return false; } - + // Add number of test msgs requested if ($message_count > 0) { populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type); - } - + } + return $mailbox; } @@ -146,42 +146,42 @@ function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type = "s $envelope["from"]= "foo@anywhere.com"; $envelope["to"] = "$users[0]@$domain"; $envelope["subject"] = "Test msg $i"; - + $part1["type"] = TYPEMULTIPART; $part1["subtype"] = "mixed"; - + $part2["type"] = TYPETEXT; $part2["subtype"] = "plain"; $part2["description"] = "imap_mail_compose() function"; $part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx"; - + $part3["type"] = TYPETEXT; $part3["subtype"] = "plain"; $part3["description"] = "Example"; $part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"; - + $part4["type"] = TYPETEXT; $part4["subtype"] = "plain"; $part4["description"] = "Return Values"; $part4["contents.data"] = "message 3:zzzzzzzzzzzzzzzzzzzzzzzzzz"; - + $body[1] = $part1; $body[2] = $part2; $body[3] = $part3; $body[4] = $part4; - + $msg = imap_mail_compose($envelope, $body); } - + imap_append($imap_stream, $mailbox, $msg); } } /** - * Get the mailbox name from a mailbox decription, i.e strip off server details. + * Get the mailbox name from a mailbox decription, i.e strip off server details. * - * @param string mailbox complete mailbox name - * @return mailbox name + * @param string mailbox complete mailbox name + * @return mailbox name */ function get_mailbox_name($mailbox){ diff --git a/ext/imap/tests/skipif.inc b/ext/imap/tests/skipif.inc index 47bfd08e22..19ad7893bd 100644 --- a/ext/imap/tests/skipif.inc +++ b/ext/imap/tests/skipif.inc @@ -1,6 +1,6 @@ <?php extension_loaded('imap') or die('skip imap extension not available in this build'); - + // Change these to make tests run successfully $mailbox = '{localhost/norsh}'; $username = 'webmaster@something.com'; diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4 index 5b4cde5852..1712f55788 100644 --- a/ext/interbase/config.m4 +++ b/ext/interbase/config.m4 @@ -46,7 +46,7 @@ if test "$PHP_INTERBASE" != "no"; then ], [ -L$IBASE_LIBDIR ]) - + PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD) PHP_ADD_INCLUDE($IBASE_INCDIR) fi diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32 index 9891fae442..c1f5a91f41 100644 --- a/ext/interbase/config.w32 +++ b/ext/interbase/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("interbase", "InterBase support", "no"); if (PHP_INTERBASE != "no") { - if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", + if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) && (CHECK_LIB("fbclient_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) || CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) { diff --git a/ext/interbase/tests/interbase.inc b/ext/interbase/tests/interbase.inc index 7e58ecca74..41123e68bd 100644 --- a/ext/interbase/tests/interbase.inc +++ b/ext/interbase/tests/interbase.inc @@ -14,7 +14,7 @@ function init_db() { global $test_base, $user, $password; - $test_db = ibase_query(IBASE_CREATE, + $test_db = ibase_query(IBASE_CREATE, sprintf("CREATE SCHEMA '%s' USER '%s' PASSWORD '%s' DEFAULT CHARACTER SET %s",$test_base, $user, $password, ($charset = ini_get('ibase.default_charset')) ? $charset : 'NONE')); $tr = ibase_trans($test_db); @@ -28,7 +28,7 @@ function init_db() function cleanup_db() { global $test_base; - + $r = ibase_connect($test_base); ibase_drop_db($r); } diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc index 11d0d80bc6..37bf023f4d 100644 --- a/ext/interbase/tests/skipif.inc +++ b/ext/interbase/tests/skipif.inc @@ -1,6 +1,6 @@ <?php -if (!extension_loaded("interbase")) print "skip interbase extension not available"; +if (!extension_loaded("interbase")) print "skip interbase extension not available"; require("interbase.inc"); if(!@ibase_connect($test_base)){ die("skip cannot connnect"); diff --git a/ext/intl/ERROR.CONVENTIONS b/ext/intl/ERROR.CONVENTIONS index a7ef53665e..7b0bbe7286 100644 --- a/ext/intl/ERROR.CONVENTIONS +++ b/ext/intl/ERROR.CONVENTIONS @@ -28,7 +28,7 @@ void intl_error_set(intl_error* err, UErrorCode code, char* msg, int copyMsg); and by passing NULL as the first parameter. The last function is a combination of the first two. If the message is not a static buffer, copyMsg should be 1. This makes the message string be copied and freed when no longer needed. There's -no way to pass ownership of the string without it being copied. +no way to pass ownership of the string without it being copied. :: The last is ALSO stored in the object whose method call triggered the error, diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index 13ff6a75a7..ab8ab76796 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -57,7 +57,7 @@ static void _php_intlgregcal_constructor_body( zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: too many arguments", 0); - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -70,7 +70,7 @@ static void _php_intlgregcal_constructor_body( intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: no variant with 4 arguments " "(excluding trailing NULLs)", 0); - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -83,7 +83,7 @@ static void _php_intlgregcal_constructor_body( "|z!s!", &tz_object, &locale, &locale_len) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: bad arguments", 0); - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -95,7 +95,7 @@ static void _php_intlgregcal_constructor_body( &largs[5]) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: bad arguments", 0); - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -113,7 +113,7 @@ static void _php_intlgregcal_constructor_body( if (!EG(exception)) { zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0); } - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -132,7 +132,7 @@ static void _php_intlgregcal_constructor_body( delete gcal; } delete tz; - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -145,7 +145,7 @@ static void _php_intlgregcal_constructor_body( intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "intlgregcal_create_instance: at least one of the arguments" " has an absolute value that is too large", 0); - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -170,7 +170,7 @@ static void _php_intlgregcal_constructor_body( if (gcal) { delete gcal; } - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } @@ -190,7 +190,7 @@ static void _php_intlgregcal_constructor_body( "from PHP's default timezone name (see date_default_timezone_get())", 0); delete gcal; - if (!is_constructor) { + if (!is_constructor) { zval_dtor(return_value); RETVAL_NULL(); } diff --git a/ext/intl/config.w32 b/ext/intl/config.w32 index 328288be3d..3065ac2311 100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 @@ -99,18 +99,18 @@ if (PHP_INTL != "no") { transliterator_class.c \ transliterator_methods.c", "intl"); - + ADD_SOURCES(configure_module_dirname + "/timezone", "\ timezone_class.cpp \ timezone_methods.cpp", "intl"); - + ADD_SOURCES(configure_module_dirname + "/calendar", "\ calendar_methods.cpp \ gregoriancalendar_methods.cpp \ calendar_class.cpp", "intl"); - + ADD_SOURCES(configure_module_dirname + "/breakiterator", "\ breakiterator_class.cpp \ breakiterator_methods.cpp \ @@ -119,7 +119,7 @@ if (PHP_INTL != "no") { codepointiterator_internal.cpp \ codepointiterator_methods.cpp ", "intl"); - + ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib"); /* Compat for ICU before 58.1.*/ diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt index 3bb31b00ec..316d81357c 100644 --- a/ext/intl/doc/Tutorial.txt +++ b/ext/intl/doc/Tutorial.txt @@ -1,13 +1,13 @@ 1. Collator::getAvailableLocales(). Return the locales available at the time of the call, including registered locales. If a sever error occurs (such as out of memory condition) this will return null. -If there is no locale data, an empty enumeration will be returned. +If there is no locale data, an empty enumeration will be returned. Returned locales list is a strings in format of RFC4646 standart (see http://www.rfc-editor.org/rfc/rfc4646.txt). Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project.org/icu-bin/locexp). 2. Collator::getDisplayName( $obj_locale, $disp_locale ). -Get name of the object for the desired Locale, in the desired language. Both arguments +Get name of the object for the desired Locale, in the desired language. Both arguments must be from getAvailableLocales method. @param string $obj_locale Locale to get display name for. @@ -19,21 +19,21 @@ For locale format see RFC4647 standart in ftp://ftp.rfc-editor.org/in-notes/rfc4 3. Collator::getLocaleByType( $type ). Allow user to select whether she wants information on requested, valid or actual locale. Returned locale tag is a string formatted to a RFC4646 standart and normalize to normal form - -value is a string from -For example, a collator for "en_US_CALIFORNIA" was requested. In the current state of ICU (2.0), -the requested locale is "en_US_CALIFORNIA", the valid locale is "en_US" (most specific locale -supported by ICU) and the actual locale is "root" (the collation data comes unmodified from the UCA) -The locale is considered supported by ICU if there is a core ICU bundle for that locale (although -it may be empty). +value is a string from +For example, a collator for "en_US_CALIFORNIA" was requested. In the current state of ICU (2.0), +the requested locale is "en_US_CALIFORNIA", the valid locale is "en_US" (most specific locale +supported by ICU) and the actual locale is "root" (the collation data comes unmodified from the UCA) +The locale is considered supported by ICU if there is a core ICU bundle for that locale (although +it may be empty). 4. VariableTop The Variable_Top attribute is only meaningful if the Alternate attribute is not set to NonIgnorable. -In such a case, it controls which characters count as ignorable. The string value specifies +In such a case, it controls which characters count as ignorable. The string value specifies the "highest" character (in UCA order) weight that is to be considered ignorable. -Thus, for example, if a user wanted whitespace to be ignorable, but not any visible characters, -then s/he would use the value Variable_Top="\u0020" (space). The string should only be a -single character. All characters of the same primary weight are equivalent, so +Thus, for example, if a user wanted whitespace to be ignorable, but not any visible characters, +then s/he would use the value Variable_Top="\u0020" (space). The string should only be a +single character. All characters of the same primary weight are equivalent, so Variable_Top="\u3000" (ideographic space) has the same effect as Variable_Top="\u0020". This setting (alone) has little impact on string comparison performance; setting it lower or higher will make sort keys slightly shorter or longer respectively. @@ -124,7 +124,7 @@ the languages currently in use. Therefore, ICU provides a data-driven, flexible, customizable mechanism called "tailoring". Tailoring overrides the default order of code points and the values of the ICU Collation Service attributes. Collator have followed attributes: - - FRENCH_COLLATION, possible values are: + - FRENCH_COLLATION, possible values are: ON OFF (default) DEFAULT diff --git a/ext/intl/doc/collator_api.php b/ext/intl/doc/collator_api.php index ef7250243b..8005aca2ca 100644 --- a/ext/intl/doc/collator_api.php +++ b/ext/intl/doc/collator_api.php @@ -324,7 +324,7 @@ function collator_sort_with_sort_keys( $coll, $arr ) {} * Get the locale name of the collator. * * @param Collator $coll Collator object. - * @param int $type You can choose between valid and + * @param int $type You can choose between valid and * actual locale * (ULOC_VALID_LOCALE, ULOC_ACTUAL_LOCALE * respectively). diff --git a/ext/intl/doc/datefmt_api.php b/ext/intl/doc/datefmt_api.php index 6beb243863..2dba59df63 100644 --- a/ext/intl/doc/datefmt_api.php +++ b/ext/intl/doc/datefmt_api.php @@ -4,9 +4,9 @@ * Date Formatter class - locale-dependent formatting/parsing of dates using pattern strings and/or canned patterns. * * This class represents the ICU date formatting functionality. It allows users to - * display dates in a localized format or to parse strings + * display dates in a localized format or to parse strings * into PHP date values using pattern strings and/or canned patterns. - * + * * Example: * <code> * $datefmt = new DateFormatter("de-DE", LONG, SHORT, date_default_timezone_get()); @@ -38,19 +38,19 @@ class DateFormatter { const SHORT = 3; /** - * The following int constants are used to specify the calendar. - * These calendars are all based directly on the Gregorian calendar - * Non-Gregorian calendars need to be specified in locale. + * The following int constants are used to specify the calendar. + * These calendars are all based directly on the Gregorian calendar + * Non-Gregorian calendars need to be specified in locale. * Examples might include locale="hi@calendar=BUDDHIST" */ const TRADITIONAL = 0; // non-Gregorian calendar that is locale-defined, required by ICU const GREGORIAN = 1 ;// Gregorian calendar - + ############################################################################# # Object-oriented API ############################################################################# /** - * Create a date formatter + * Create a date formatter * * @param string $locale Locale to use when formatting or parsing * @param integer $datetype Date type to use (none, short, medium, long, full) @@ -66,7 +66,7 @@ class DateFormatter { public function __construct($locale, $datetype, $timetype, $timezone = null, $calendar= null , $pattern= null) {} /** - * Create a date formatter + * Create a date formatter * * @param string $locale Locale to use when formatting or parsing * @param integer $datetype Date type to use (none, short, medium, long, full) @@ -86,7 +86,7 @@ class DateFormatter { * @param mixed $value - value to format * integer: a unix timestamp value (seconds since epoch, UTC) * array: a localtime array - uses 24 hour clock in tm_hour field - * @return string a formatted string or, if an error occurred, 'null'. + * @return string a formatted string or, if an error occurred, 'null'. */ public function format($value) {} @@ -96,7 +96,7 @@ class DateFormatter { * $parse_pos and consuming as much of the input value as possible * If no error occurs before $value is consumed, $parse_pos will contain -1 * otherwise it will contain the position at which parsing ended (and the error - * occurred). + * occurred). * @param string $value string to convert to a time * @param integer $parse_pos position at which to start the parsing in $value (zero-based) * This variable will contain the end position if the parse fails @@ -105,13 +105,13 @@ class DateFormatter { */ public function parse($value, $parse_pos=0) {} - + /** * converts string $value to a field-based time value, starting at * $parse_pos and consuming as much of the input value as possible * If no error occurs before $value is consumed, $parse_pos will contain -1 * otherwise it will contain the position at which parsing ended (and the error - * occurred). + * occurred). * @param string $value string to convert to a time * @param integer $parse_pos position at which to start the parsing in $value (zero-based) * This variable will contain the end position if the parse fails @@ -122,21 +122,21 @@ class DateFormatter { /** - * Gets the datetype in use + * Gets the datetype in use * @return integer the current 'datetype' value of the formatter */ public function getDateType() {} /** - * Gets the timetype in use + * Gets the timetype in use * @return integer the current 'timetype' value of the formatter */ public function getTimeType() {} /** - * Gets the leniency in use + * Gets the leniency in use * @return boolean 'true' if parser is lenient, 'false' if parser is strict * default value for parser is 'false'. */ @@ -144,22 +144,22 @@ class DateFormatter { /** - * Sets the leniency to use + * Sets the leniency to use * @param boolean $lenient sets whether the parser is lenient or not, default is 'false' - * 'true' sets the parser to accept otherwise flawed date or + * 'true' sets the parser to accept otherwise flawed date or * time patterns, parsing as much as possible to obtain a value. - * 'false' sets the parser to strictly parse strings into dates. - * Extra space, unrecognized tokens, or invalid values + * 'false' sets the parser to strictly parse strings into dates. + * Extra space, unrecognized tokens, or invalid values * ("February 30th") are not accepted. * - * @return boolean 'true' if successful; 'false' if an error occurred. + * @return boolean 'true' if successful; 'false' if an error occurred. */ public function setLenient($lenient) {} /** - * Gets the locale in use - * @param [integer] which locale should be returned? + * Gets the locale in use + * @param [integer] which locale should be returned? * values may include ULOC_ACTUAL_LOCALE, * ULOC_VALID_LOCALE. By default the actual * locale is returned. @@ -187,33 +187,33 @@ class DateFormatter { /** - * Sets the calendar used to the appropriate calendar, which must be + * Sets the calendar used to the appropriate calendar, which must be * one of the constants defined above. Some examples include: * - Gregorian calendar * - Traditional * Default value is GREGORIAN * @param integer $which the calendar (an enumerated constant) to use. - * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized + * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized */ public function setCalendar($which) {} /** - * Gets the Calendar in use + * Gets the Calendar in use * @return integer the calendar being used by the formatter */ public function getCalendar() {} /** - * Gets the pattern in use - * @return string the pattern string being used to format/parse + * Gets the pattern in use + * @return string the pattern string being used to format/parse */ public function getPattern() {} /** - * Sets the pattern to use + * Sets the pattern to use * @param string $pattern new pattern string to use * @return boolean 'true' if successful, 'false' if an error occurred. Bad format * strings are usually the cause of the latter. @@ -247,7 +247,7 @@ class DateFormatter { /** - * Create a date formatter + * Create a date formatter * * @param string $locale Locale to use when formatting or parsing * @param integer $datetype Date type to use (none, short, medium, long, full) @@ -268,7 +268,7 @@ class DateFormatter { * @param mixed $value - value to format * integer: a unix timestamp value (seconds since epoch, UTC) * array: a localtime array - uses 24 hour clock in tm_hour field - * @return string a formatted string or, if an error occurred, 'null'. + * @return string a formatted string or, if an error occurred, 'null'. */ function datefmt_format($fmt , $value) {} @@ -278,7 +278,7 @@ class DateFormatter { * $parse_pos and consuming as much of the input value as possible * If no error occurs before $value is consumed, $parse_pos will contain -1 * otherwise it will contain the position at which parsing ended (and the error - * occurred). + * occurred). * @param DateFormatter $fmt The date formatter resource * @param string $value string to convert to a time * @param integer $parse_pos position at which to start the parsing in $value (zero-based) @@ -288,13 +288,13 @@ class DateFormatter { */ function datefmt_parse($fmt , $value, $parse_pos=0) {} - + /** * converts string $value to a field-based time value, starting at * $parse_pos and consuming as much of the input value as possible * If no error occurs before $value is consumed, $parse_pos will contain -1 * otherwise it will contain the position at which parsing ended (and the error - * occurred). + * occurred). * @param DateFormatter $fmt The date formatter resource * @param string $value string to convert to a time * @param integer $parse_pos position at which to start the parsing in $value (zero-based) @@ -322,7 +322,7 @@ class DateFormatter { /** - * Gets the leniency of the formatter + * Gets the leniency of the formatter * @param DateFormatter $fmt The date formatter resource * @return boolean 'true' if parser is lenient, 'false' if parser is strict * default value for parser is 'false'. @@ -331,16 +331,16 @@ class DateFormatter { /** - * Sets the leniency of the formatter + * Sets the leniency of the formatter * @param DateFormatter $fmt The date formatter resource * @param boolean $lenient sets whether the parser is lenient or not, default is 'false' - * 'true' sets the parser to accept otherwise flawed date or + * 'true' sets the parser to accept otherwise flawed date or * time patterns, parsing as much as possible to obtain a value. - * 'false' sets the parser to strictly parse strings into dates. - * Extra space, unrecognized tokens, or invalid values + * 'false' sets the parser to strictly parse strings into dates. + * Extra space, unrecognized tokens, or invalid values * ("February 30th") are not accepted. * - * @return boolean 'true' if successful; 'false' if an error occurred. + * @return boolean 'true' if successful; 'false' if an error occurred. */ function datefmt_set_lenient($fmt , $lenient) {} @@ -348,7 +348,7 @@ class DateFormatter { /** * Gets the locale in use * @param DateFormatter $fmt The date formatter resource - * @param [integer] which locale should be returned? + * @param [integer] which locale should be returned? * values may include ULOC_ACTUAL_LOCALE, * ULOC_VALID_LOCALE. By default the actual * locale is returned. @@ -366,14 +366,14 @@ class DateFormatter { /** - * Sets the calendar used to the appropriate calendar, which must be + * Sets the calendar used to the appropriate calendar, which must be * one of the constants defined above. Some examples include: * - Gregorian calendar * - Traditional * Default value is GREGORIAN * @param DateFormatter $fmt The date formatter resource * @param integer $which the calendar (an enumerated constant) to use. - * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized + * @return boolean 'true' if successful, 'false' if an error occurred or if the calendar was not recognized */ function datefmt_set_calendar($fmt , $which) {} diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php index e22d165cbb..91f4869166 100644 --- a/ext/intl/doc/grapheme_api.php +++ b/ext/intl/doc/grapheme_api.php @@ -30,14 +30,14 @@ * Find position (in grapheme units) of first occurrence of a string * @param string $haystack The string to look in * @param string $needle The string to look for - * @param [int] $offset The optional offset parameter allows you to specify - which character in haystack to start searching. The position + * @param [int] $offset The optional offset parameter allows you to specify + which character in haystack to start searching. The position returned is still relative to the beginning of haystack. * @return int Returns the position as an integer. If needle is not found, strpos() will return boolean FALSE. */ function grapheme_strpos($haystack, $needle, $offset = 0) {} - + /** * Find position (in grapheme units) of first occurrence of a case-insensitive string * @param string $haystack The string to look in @@ -48,7 +48,7 @@ * @return int Returns the position as an integer. If needle is not found, grapheme_stripos() will return boolean FALSE. */ function grapheme_stripos($haystack, $needle, $offset = 0) {} - + /** * Find position (in grapheme units) of last occurrence of a string @@ -77,12 +77,12 @@ /** * Return part of a string * @param string $string The input string. - * @param int $start If start is non-negative, the returned string will start at the + * @param int $start If start is non-negative, the returned string will start at the start'th position in string, counting from zero. If start is negative, - the returned string will start at the start'th character from the + the returned string will start at the start'th character from the end of string. * @param [int] $length If length is given and is positive, the string returned will contain - at most length characters beginning from start (depending on the + at most length characters beginning from start (depending on the length of string). If string is less than or equal to start characters long, FALSE will be returned. If length is given and is negative, then that many characters will be omitted from the end of string (after the @@ -122,7 +122,7 @@ * @param [int] $extract_type one of GRAPHEME_EXTR_COUNT (default), GRAPHEME_EXTR_MAXBYTES, or GRAPHEME_EXTR_MAXCHARS * @param [int] $start starting position in $haystack in bytes * @param [&int] $next set to next starting position in bytes - * @return string A string starting at offset $start containing no more than $size grapheme clusters + * @return string A string starting at offset $start containing no more than $size grapheme clusters and ending on a default grapheme cluster boundary. */ function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0, &$next) {} diff --git a/ext/intl/doc/locale_api.php b/ext/intl/doc/locale_api.php index c6c41ede0a..4633ac1227 100644 --- a/ext/intl/doc/locale_api.php +++ b/ext/intl/doc/locale_api.php @@ -1,29 +1,29 @@ <?php /** - * A "Locale" is an identifier used to get language, culture, or regionally-specific + * A "Locale" is an identifier used to get language, culture, or regionally-specific * behavior from an API. PHP locales are organized and identified the same - * way that the CLDR locales used by ICU (and many vendors of Unix-like operating + * way that the CLDR locales used by ICU (and many vendors of Unix-like operating * systems, the Mac, Java, and so forth) use. Locales are identified using * RFC 4646 language tags (which use hyphen, not underscore) in addition to the * more traditional underscore-using identifiers. Unless otherwise noted - * the functions in this class are tolerant of both formats. + * the functions in this class are tolerant of both formats. * * Examples of identifiers include: * * * en-US (English, United States) * * zh-Hant-TW (Chinese, Traditional Script, Taiwan) - * * fr-CA, fr-FR (French for Canada and France respectively) + * * fr-CA, fr-FR (French for Canada and France respectively) * - * The Locale class (and related procedural functions) are used to interact - * with locale identifiers--to verify that an ID is well-formed, valid, - * etc. The extensions used by CLDR in UAX #35 (and inherited by ICU) are + * The Locale class (and related procedural functions) are used to interact + * with locale identifiers--to verify that an ID is well-formed, valid, + * etc. The extensions used by CLDR in UAX #35 (and inherited by ICU) are * valid and used wherever they would be in ICU normally. * - * Locales cannot be instantiated as objects. All of the functions/methods + * Locales cannot be instantiated as objects. All of the functions/methods * provided are static. * - * * The null or empty string obtains the "root" locale. + * * The null or empty string obtains the "root" locale. * The "root" locale is equivalent to "en_US_POSIX" in CLDR. * * Language tags (and thus locale identifiers) are case insensitive. There * exists a canonicalization function to make case match the specification. @@ -56,7 +56,7 @@ class Locale { const ACTUAL_LOCALE = 'ULOC_ACTUAL_LOCALE'; const VALID_LOCALE = 'ULOC_VALID_LOCALE'; - /** + /** * Valid locale tag and subtag values */ const LANG_TAG = "language"; @@ -66,7 +66,7 @@ class Locale { const VARIANT_TAG = "variant"; const GRANDFATHERED_LANG_TAG = "grandfathered"; const PRIVATE_TAG = "private"; - + ############################################################################# # Object-oriented API @@ -74,12 +74,12 @@ class Locale { /** * Gets the default locale value from the INTL global 'default_locale' - * At the PHP initilaization (MINIT) this value is set to - * 'intl.default_locale' value from php.ini if that value exists - * or from ICU's function uloc_getDefault() + * At the PHP initilaization (MINIT) this value is set to + * 'intl.default_locale' value from php.ini if that value exists + * or from ICU's function uloc_getDefault() * Then onwards picks up changes from setDefault() calls also * - * @return string the current runtime locale + * @return string the current runtime locale */ public static function getDefault() {} @@ -87,7 +87,7 @@ class Locale { * sets the default runtime locale to $locale * This changes the value of INTL global 'default_locale' * - * @param string $locale is a BCP 47 compliant language tag containing the + * @param string $locale is a BCP 47 compliant language tag containing the * locale identifier. UAX #35 extensions are accepted. * @return boolean 'true' if okay, 'false' if an error */ @@ -98,8 +98,8 @@ class Locale { * Gets the primary language for the input locale * * @param string $locale the locale to extract the primary language code from - * @return string the language code associated with the language - * or null in case of error. + * @return string the language code associated with the language + * or null in case of error. */ public static function getPrimaryLanguage($locale) {} @@ -126,7 +126,7 @@ class Locale { * Gets the variants for the input locale * * @param string $locale the locale to extract the variants from - * @return array the array containing the list of all variants + * @return array the array containing the list of all variants * subtag for the locale or null if not present */ public static function getAllVariants($locale) {} @@ -136,7 +136,7 @@ class Locale { * Gets the keywords for the input locale * * @param string $locale the locale to extract the keywords from - * @return array associative array containing the keyword-value pairs for this locale + * @return array associative array containing the keyword-value pairs for this locale */ public static function getKeywords($locale) {} @@ -146,9 +146,9 @@ class Locale { * * @param string $locale the locale to return a displayname for * @param [string] $in_locale optional format locale - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ public static function getDisplayName($locale, $in_locale = null) {} @@ -158,9 +158,9 @@ class Locale { * * @param string $locale the locale to return a display language for * @param [string] $in_locale optional format locale to use to display the language name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the language for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ public static function getDisplayLanguage($lang, $in_locale = null) {} @@ -169,9 +169,9 @@ class Locale { * * @param string $locale the locale to return a display script for * @param [string] $in_locale optional format locale to use to display the script name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the script for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ public static function getDisplayScript($script, $in_locale = null) {} @@ -181,9 +181,9 @@ class Locale { * * @param string $locale the locale to return a display region for * @param [string] $in_locale optional format locale to use to display the region name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the region for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ public static function getDisplayRegion($region, $in_locale = null) {} @@ -193,15 +193,15 @@ class Locale { * * @param string $locale the locale to return a display variant for * @param [string] $in_locale optional format locale to use to display the variant name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the variant for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ public static function getDisplayVariant($variant, $in_locale = null) {} /** - * Checks if a $langtag filter matches with $locale according to + * Checks if a $langtag filter matches with $locale according to * RFC 4647's basic filtering algorithm * * @param string $langtag the language tag to check @@ -213,24 +213,24 @@ class Locale { /** * Searchs the items in $langtag for the best match to the language - * range specified in $locale according to RFC 4647's lookup algorithm. + * range specified in $locale according to RFC 4647's lookup algorithm. * * @param array $langtag an array containing a list of language tags to compare * to $locale * @param string $locale the locale to use as the language range when matching * @param string $default the locale to use if no match is found - * @return string closest matching language tag, $default, + * @return string closest matching language tag, $default, * or empty string */ public static function lookup(array $langtag, $locale, $default = null) {} /** - * Returns a correctly ordered and delimited locale ID + * Returns a correctly ordered and delimited locale ID * - * @param array $subtags an array containing a list of key-value pairs, where - * the keys identify the particular locale ID subtags, - * and the values are the associated subtag values. + * @param array $subtags an array containing a list of key-value pairs, where + * the keys identify the particular locale ID subtags, + * and the values are the associated subtag values. * * @return string the corresponding locale identifier. */ @@ -240,11 +240,11 @@ class Locale { /** * Returns a key-value array of locale ID subtag elements. * - * @param string $locale the locale to extract the subtag array from + * @param string $locale the locale to extract the subtag array from * - * @return array $subtags an array containing a list of key-value pairs, where - * the keys identify the particular locale ID subtags, - * and the values are the associated subtag values. + * @return array $subtags an array containing a list of key-value pairs, where + * the keys identify the particular locale ID subtags, + * and the values are the associated subtag values. */ public static function parseLocale($locale) {} @@ -257,12 +257,12 @@ class Locale { /** * Gets the default locale value from the INTL global 'default_locale' - * At the PHP initilaization (MINIT) this value is set to - * 'intl.default_locale' value from php.ini if that value exists - * or from ICU's function uloc_getDefault() + * At the PHP initilaization (MINIT) this value is set to + * 'intl.default_locale' value from php.ini if that value exists + * or from ICU's function uloc_getDefault() * Then onwards picks up changes from setDefault() calls also * - * @return string the current runtime locale + * @return string the current runtime locale */ function locale_get_default() {} @@ -270,7 +270,7 @@ class Locale { * sets the default runtime locale to $locale * This changes the value of INTL global 'default_locale' * - * @param string $locale is a BCP 47 compliant language tag containing the + * @param string $locale is a BCP 47 compliant language tag containing the * locale identifier. UAX #35 extensions are accepted. * @return boolean 'true' if okay, 'false' if an error */ @@ -281,8 +281,8 @@ class Locale { * Gets the primary language for the input locale * * @param string $locale the locale to extract the primary language code from - * @return string the language code associated with the language - * or null in case of error. + * @return string the language code associated with the language + * or null in case of error. */ function locale_get_primary_language($locale) {} @@ -309,7 +309,7 @@ class Locale { * Gets the variants for the input locale * * @param string $locale the locale to extract the variants from - * @return array the array containing the list of all variants + * @return array the array containing the list of all variants * subtag for the locale or null if not present */ function locale_get_all_variants($locale) {} @@ -319,7 +319,7 @@ class Locale { * Gets the keywords for the input locale * * @param string $locale the locale to extract the keywords from - * @return array associative array containing the keyword-value pairs for this locale + * @return array associative array containing the keyword-value pairs for this locale */ function locale_get_keywords($locale) {} @@ -329,9 +329,9 @@ class Locale { * * @param string $locale the locale to return a displayname for * @param [string] $in_locale optional format locale - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ function locale_get_display_name($locale, $in_locale = null) {} @@ -341,9 +341,9 @@ class Locale { * * @param string $locale the locale to return a display language for * @param [string] $in_locale optional format locale to use to display the language name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the language for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ function locale_get_display_language($lang, $in_locale = null) {} @@ -352,9 +352,9 @@ class Locale { * * @param string $locale the locale to return a display script for * @param [string] $in_locale optional format locale to use to display the script name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the script for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ function locale_get_display_script($script, $in_locale = null) {} @@ -364,9 +364,9 @@ class Locale { * * @param string $locale the locale to return a display region for * @param [string] $in_locale optional format locale to use to display the region name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the region for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ function locale_get_display_region($region, $in_locale = null) {} @@ -376,15 +376,15 @@ class Locale { * * @param string $locale the locale to return a display variant for * @param [string] $in_locale optional format locale to use to display the variant name - * If is 'null' then the default locale is used. + * If is 'null' then the default locale is used. * @return string display name of the variant for the $locale in the format - * appropriate for $in_locale. + * appropriate for $in_locale. */ function locale_get_display_variant($variant, $in_locale = null) {} /** - * Checks if a $langtag filter matches with $locale according to + * Checks if a $langtag filter matches with $locale according to * RFC 4647's basic filtering algorithm * * @param string $langtag the language tag to check @@ -396,24 +396,24 @@ class Locale { /** * Searchs the items in $langtag for the best match to the language - * range specified in $locale according to RFC 4647's lookup algorithm. + * range specified in $locale according to RFC 4647's lookup algorithm. * * @param array $langtag an array containing a list of language tags to compare * to $locale * @param string $locale the locale to use as the language range when matching * @param string $default the locale to use if no match is found - * @return string closest matching language tag, $default, + * @return string closest matching language tag, $default, * or empty string */ function locale_lookup(array $langtag, $locale, $default = null) {} /** - * Returns a correctly ordered and delimited locale ID + * Returns a correctly ordered and delimited locale ID * - * @param array $subtags an array containing a list of key-value pairs, where - * the keys identify the particular locale ID subtags, - * and the values are the associated subtag values. + * @param array $subtags an array containing a list of key-value pairs, where + * the keys identify the particular locale ID subtags, + * and the values are the associated subtag values. * * @return string the corresponding locale identifier. */ @@ -423,11 +423,11 @@ class Locale { /** * Returns a key-value array of locale ID subtag elements. * - * @param string $locale the locale to extract the subtag array from + * @param string $locale the locale to extract the subtag array from * - * @return array $subtags an array containing a list of key-value pairs, where - * the keys identify the particular locale ID subtags, - * and the values are the associated subtag values. + * @return array $subtags an array containing a list of key-value pairs, where + * the keys identify the particular locale ID subtags, + * and the values are the associated subtag values. */ function locale_parse_locale($locale) {} diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php index 3df6f0de11..856946c718 100644 --- a/ext/intl/doc/msgfmt_api.php +++ b/ext/intl/doc/msgfmt_api.php @@ -14,7 +14,7 @@ class MessageFormatter { /** * Constructs a new Message Formatter - * + * * @param string $locale the locale to use when formatting arguments * @param string $pattern the pattern string to stick arguments into */ @@ -22,7 +22,7 @@ class MessageFormatter { /** * Constructs a new Message Formatter - * + * * @param string $locale the locale to use when formatting arguments * @param string $pattern the pattern string to stick arguments into */ @@ -113,7 +113,7 @@ class MessageFormatter { /** * Constructs a new Message Formatter - * + * * @param string $locale the locale to use when formatting arguments * @param string $pattern the pattern string to stick arguments into * @return MessageFormatter formatter object @@ -122,7 +122,7 @@ class MessageFormatter { /** * Format the message - * @param MessageFormatter $fmt The message formatter + * @param MessageFormatter $fmt The message formatter * @param array $args arguments to insert into the pattern string * @return string the formatted string, or false if an error occurred */ @@ -134,7 +134,7 @@ class MessageFormatter { * $error will contain any error code. If an error occurs, $parse_pos contains * the position of the error. * - * @param MessageFormatter $fmt The message formatter + * @param MessageFormatter $fmt The message formatter * @param string $value string to parse for items * @return array array containing items extracted * @@ -168,7 +168,7 @@ class MessageFormatter { /** * Get the pattern used by the formatter * - * @param MessageFormatter $fmt The message formatter + * @param MessageFormatter $fmt The message formatter * @return string the pattern string for this message formatter */ function msgfmt_get_pattern($fmt) {} @@ -176,7 +176,7 @@ class MessageFormatter { /** * Set the pattern used by the formatter * - * @param MessageFormatter $fmt The message formatter + * @param MessageFormatter $fmt The message formatter * @param string $pattern the pattern string to use in this message formatter * @return boolean 'true' if successful, 'false' if an error */ @@ -187,14 +187,14 @@ class MessageFormatter { * * Returns error code from the last number formatting operation. * - * @param MessageFormatter $fmt The message formatter + * @param MessageFormatter $fmt The message formatter * @return integer the error code, one of UErrorCode values. Initial value is U_ZERO_ERROR. */ function msgfmt_get_error_code($fmt) {} /** * Get the error text from the last operation. * - * @param MessageFormatter $fmt The message formatter + * @param MessageFormatter $fmt The message formatter * @return string Description of the last error. */ function msgfmt_get_error_message($fmt) {} diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c index a88b559572..f80eea106a 100644 --- a/ext/intl/intl_error.c +++ b/ext/intl/intl_error.c @@ -233,7 +233,7 @@ void intl_errors_set_code( intl_error* err, UErrorCode err_code ) void intl_register_IntlException_class( void ) { zend_class_entry ce; - + /* Create and register 'IntlException' class. */ INIT_CLASS_ENTRY_EX( ce, "IntlException", sizeof( "IntlException" ) - 1, NULL ); IntlException_ce_ptr = zend_register_internal_class_ex( &ce, diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index dba93f3fbc..4ba5e8fa1f 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -410,7 +410,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS) loc_name = intl_locale_get_default(); loc_name_len = strlen(loc_name); } - + INTL_CHECK_LOCALE_LEN(loc_name_len); /* Call ICU get */ @@ -439,7 +439,7 @@ static void get_icu_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAMETERS) } } -/* }}} */ +/* }}} */ /* {{{ proto static string Locale::getScript($locale) * gets the script for the $locale diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re index 8348981deb..3fda1df5ad 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -104,7 +104,7 @@ void php_json_scanner_init(php_json_scanner *s, char *str, size_t str_len, int o int php_json_scan(php_json_scanner *s) { ZVAL_NULL(&s->value); - + std: s->token = s->cursor; diff --git a/ext/ldap/tests/README b/ext/ldap/tests/README index edc44eb4b0..8dfa12d2f9 100644 --- a/ext/ldap/tests/README +++ b/ext/ldap/tests/README @@ -63,7 +63,7 @@ export LDAP_TEST_HOST=192.168.33.10 Now you can run the test-suite by calling "make test". To test only the LDAP-Tests, run "make test TESTS=ext/ldap" -CAVEAT: The current setup does not (yet) test secure connections. +CAVEAT: The current setup does not (yet) test secure connections. ======== diff --git a/ext/mbstring/README.libmbfl b/ext/mbstring/README.libmbfl index 4f1174e2f7..de72aab440 100644 --- a/ext/mbstring/README.libmbfl +++ b/ext/mbstring/README.libmbfl @@ -3,7 +3,7 @@ libmbfl is a streamable multibyte character code filter and converter library. libmbfl is distributed under LGPL 2.1 and bundled with PHP. -The original version of libmbfl is developed and distributed +The original version of libmbfl is developed and distributed at http://sourceforge.jp/project/php-i18n/ . If you need to modify the bundled libmbfl, the change also have to be applied for diff --git a/ext/mbstring/README_PHP3-i18n-ja b/ext/mbstring/README_PHP3-i18n-ja index eabe9e90f2..ddb688d1c5 100644 --- a/ext/mbstring/README_PHP3-i18n-ja +++ b/ext/mbstring/README_PHP3-i18n-ja @@ -13,13 +13,13 @@ Location: http://www.happysize.co.jp/techie/php-ja-jp/ Currently, this I18N version of PHP only adds Japanese support to base PHP. It allows you to use Japanese in scripts, as well as conversion -between various Japanese encodings. It will work perfectly fine with -ASCII with i18n option enabled. (note: executable is bit larger due -to UNICODE table). The basic design aproach is to allow for other +between various Japanese encodings. It will work perfectly fine with +ASCII with i18n option enabled. (note: executable is bit larger due +to UNICODE table). The basic design aproach is to allow for other languages to be added in the future. Developers are encourage to join us! -For more information on Japanese encodings, please refer to the +For more information on Japanese encodings, please refer to the section "Additional Notes." @@ -27,7 +27,7 @@ o What is this package? This package allows you to handle multiple Japanese encodings (SJIS, EUC, UTF-8, JIS) in PHP. If you find any bugs in this package, please report -them to the appropriate mailing list. For now, the PHP-jp mailing list +them to the appropriate mailing list. For now, the PHP-jp mailing list is the best place for this. PHP-jp ML mailto:PHP-jp@sidecar.ics.es.osaka-u.ac.jp @@ -115,7 +115,7 @@ Previous jp-patch developers Advantages of using I18N package ========================================== -- allows you to use various character encodings for script files and +- allows you to use various character encodings for script files and http output - distinguish character encoding in POST/GET/COOKIE - proper mail output using JIS as body and MIME/Base64/JIS subject @@ -248,7 +248,7 @@ in the server log or regular http output in CGI mode. o About Japanese encodings Due to historical reason, there are multiple character encodings used -for Japanese. The most common encodings are: SJIS, EUC, JIS, and UTF-8. +for Japanese. The most common encodings are: SJIS, EUC, JIS, and UTF-8. Here are (very) brief description of them: EUC @@ -273,8 +273,8 @@ UTF-8 see http://www.unicode.org/ for more detail Because of having all these character encodings, PHP needs to translate -between these encodings on the fly. Also, the addition of the mb regex -library allows you to handle mb strings without fear of getting mb char +between these encodings on the fly. Also, the addition of the mb regex +library allows you to handle mb strings without fear of getting mb char chopped in half. Since Japanese is not the only language with multiple encodings, we @@ -300,7 +300,7 @@ o Encoding naming - UTF-8 standard: UTF-8 - alias: N/A + alias: N/A mime: UTF-8 - ASCII @@ -320,7 +320,7 @@ o Encoding naming - JIS standard: JIS - alias: N/A + alias: N/A mime: ISO-2022-JP - Quoted-Printable @@ -365,13 +365,13 @@ o i18n.internal_encoding - internal encoding SJIS: SJIS UTF-8: UTF-8 - The default is EUC-JP. + The default is EUC-JP. PHP parser is designed based on using ISO-8859-1. For other encodings, following conditions have to be satisfied in order to use them: - per byte encoding - - single byte character in range of 00h-7fh which is compatible + - single byte character in range of 00h-7fh which is compatible with ASCII - multibyte without 00h-7fh In case of Japanese, EUC-JP and UTF-8 are the only encoding that @@ -510,7 +510,7 @@ o string = i18n_convert(string, encoding) string = i18n_convert(string, encoding, pre-conversion-encoding) Returns converted string in desired encoding. If - pre-conversion-encoding is not defined, the given + pre-conversion-encoding is not defined, the given string is assumed to be in internal encoding. encoding @@ -701,9 +701,9 @@ ex: <a href="hoge.php?data=<? echo urlencode($data) ?>">Link</a> o When passing data via GET/POST/COOKIE, \ character sneaks in -When using SJIS as internal encoding, or passed-on data includes '"\, +When using SJIS as internal encoding, or passed-on data includes '"\, PHP automatically inserts escaping character, \. Set magic_quotes_gpc -in php3.ini from On to Off. An alternative work around to this problem +in php3.ini from On to Off. An alternative work around to this problem is to use StripSlashes(). If $quote_str is in SJIS and you would like to extract Japanese text, @@ -719,7 +719,7 @@ o Sometimes, encoding detection fails If i18n_http_input() returns 'pass', it's likely that PHP failed to detect whether it's SJIS or EUC. In such case, use <input type=hidden -value="some Japanese text"> to properly detect the incoming text's +value="some Japanese text"> to properly detect the incoming text's encoding. @@ -740,7 +740,7 @@ Starting 3.0.18-i18n-ja, we have removed doc-jp from tarball package. o 2000-10-28, Rui Hirokawa <hirokawa@php.net> -This patch is derived from php-3.0.15-i18n-ja as well as php-3.0.16 by +This patch is derived from php-3.0.15-i18n-ja as well as php-3.0.16 by Kuwamura applied to original php-3.0.18. It also includes following fixes: 1) allows you to set charset in mail(). @@ -765,7 +765,7 @@ gd-1.7.3-1k1, gd-devel-1.7.3-1k1, freetype-1.3.1-5, freetype-devel-1.3.1-5 For any gd libraries before 1.6.2, you need to use i18n_convert. For gd-1.5.2/3, upgrade to anything above 1.7 to use ImageTTFText without using i18n_convert. As long as you have internal_encoding set to EUC or -SJIS, ImageTTFText should work without mojibake. Again, make sure you +SJIS, ImageTTFText should work without mojibake. Again, make sure you have i18n_http_output("pass") before calling ImageGif, ImagePng, ImageJpeg! o 2000-12-09, Rui Hirokawa <hirokawa@php.net> diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index a20ef92f70..4c1d8e8a88 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -37,7 +37,7 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do PHP_ADD_BUILD_DIR([$ext_builddir/$dir], 1) done - + for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do PHP_ADD_INCLUDE([$ext_srcdir/$dir]) PHP_ADD_INCLUDE([$ext_builddir/$dir]) @@ -54,8 +54,8 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ out="php_config.h" fi fi - - if test "$PHP_MBSTRING_BUNDLED_ONIG" = "1"; then + + if test "$PHP_MBSTRING_BUNDLED_ONIG" = "1"; then cp $ext_srcdir/oniguruma/src/oniguruma.h $ext_srcdir/oniguruma/oniguruma.h fi @@ -101,14 +101,14 @@ int main() { return foo(10, "", 3.14); } AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(long, 4) AC_C_CONST - AC_HEADER_TIME + AC_HEADER_TIME AC_FUNC_ALLOCA AC_FUNC_MEMCMP AC_CHECK_HEADER([stdarg.h], [ AC_DEFINE([HAVE_STDARG_PROTOTYPES], [1], [Define to 1 if you have the <stdarg.h> header file.]) ], []) AC_DEFINE([PHP_ONIG_BUNDLED], [1], [Define to 1 if the bundled oniguruma is used]) - AC_DEFINE([HAVE_ONIG], [1], [Define to 1 if the oniguruma library is available]) + AC_DEFINE([HAVE_ONIG], [1], [Define to 1 if the oniguruma library is available]) PHP_MBSTRING_ADD_CFLAG([-DNOT_RUBY]) PHP_MBSTRING_ADD_BUILD_DIR([oniguruma]) PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/src]) @@ -180,7 +180,7 @@ int main() { return foo(10, "", 3.14); } PHP_CHECK_LIBRARY(onig, onig_init, [ PHP_ADD_LIBRARY_WITH_PATH(onig, $PHP_ONIG/$PHP_LIBDIR, MBSTRING_SHARED_LIBADD) - AC_DEFINE([HAVE_ONIG], [1], [Define to 1 if the oniguruma library is available]) + AC_DEFINE([HAVE_ONIG], [1], [Define to 1 if the oniguruma library is available]) ],[ AC_MSG_ERROR([Problem with oniguruma. Please check config.log for more information.]) ], [ @@ -321,7 +321,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [ else dnl dnl External libmfl - dnl + dnl for inc in include include/mbfl-1.0 include/mbfl; do if test -f "$PHP_LIBMBFL/$inc/mbfilter.h"; then PHP_LIBMBFL_INCLUDE="$inc" @@ -331,7 +331,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [ if test -z "$PHP_LIBMBFL_INCLUDE"; then AC_MSG_ERROR([mbfilter.h not found. Please reinstall libmbfl library.]) - else + else PHP_ADD_INCLUDE([$PHP_LIBMBFL_INCLUDE]) fi @@ -367,7 +367,7 @@ PHP_ARG_WITH(onig, [for external oniguruma], [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. If DIR is not set, the bundled oniguruma will be used], no, no) -if test "$PHP_MBSTRING" != "no"; then +if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) PHP_MBSTRING_ADD_BASE_SOURCES([mbstring.c php_unicode.c mb_gpc.c]) @@ -375,7 +375,7 @@ if test "$PHP_MBSTRING" != "no"; then if test "$PHP_MBREGEX" != "no"; then PHP_MBSTRING_SETUP_MBREGEX fi - + dnl libmbfl is required PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_EXTENSION diff --git a/ext/mbstring/libmbfl/INSTALL b/ext/mbstring/libmbfl/INSTALL index b07c9157cd..4a6bf169db 100644 --- a/ext/mbstring/libmbfl/INSTALL +++ b/ext/mbstring/libmbfl/INSTALL @@ -2,7 +2,7 @@ For UNIX compatible system, ./buildconf -./configure +./configure make make install diff --git a/ext/mbstring/libmbfl/LICENSE b/ext/mbstring/libmbfl/LICENSE index 3b204400cf..9a749e6855 100644 --- a/ext/mbstring/libmbfl/LICENSE +++ b/ext/mbstring/libmbfl/LICENSE @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/ext/mbstring/libmbfl/NEWS b/ext/mbstring/libmbfl/NEWS index 8217e4158f..82a763b695 100644 --- a/ext/mbstring/libmbfl/NEWS +++ b/ext/mbstring/libmbfl/NEWS @@ -10,12 +10,12 @@ version 1.3.2 August 20, 2011 version 1.3.1 August 5, 2011 - added check for invalid/obsolete utf-8 encoding (rui). - + version 1.3.0 August 1, 2011 -- added encoding conversion between Shift_JIS and Unicode (6.0 or PUA) +- added encoding conversion between Shift_JIS and Unicode (6.0 or PUA) for pictogram characters defined by mobile phone carrier in Japan (rui). - + Detailed info:https://github.com/hirokawa/libmbfl/wiki/Introduction-to-libmbflhttps:--github.com-hirokawa-libmbfl-wiki-Introduction-to-libmbfl-_edit%23 - fixed encoding conversion of cp5022x for user defined area (rui). diff --git a/ext/mbstring/libmbfl/filters/Makefile.am b/ext/mbstring/libmbfl/filters/Makefile.am index 33f9049ae9..e6327865d1 100644 --- a/ext/mbstring/libmbfl/filters/Makefile.am +++ b/ext/mbstring/libmbfl/filters/Makefile.am @@ -208,51 +208,51 @@ unicode_table_iso8859_3.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_3_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_3_H -f mk_sb_tbl.awk 8859-3.TXT > $@ -unicode_table_iso8859_4.h: mk_sb_tbl.awk +unicode_table_iso8859_4.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_4_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_4_H -f mk_sb_tbl.awk 8859-4.TXT > $@ -unicode_table_iso8859_5.h: mk_sb_tbl.awk +unicode_table_iso8859_5.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_5_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_5_H -f mk_sb_tbl.awk 8859-5.TXT > $@ -unicode_table_iso8859_6.h: mk_sb_tbl.awk +unicode_table_iso8859_6.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_6_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_6_H -f mk_sb_tbl.awk 8859-6.TXT > $@ -unicode_table_iso8859_7.h: mk_sb_tbl.awk +unicode_table_iso8859_7.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_7_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_7_H -f mk_sb_tbl.awk 8859-7.TXT > $@ -unicode_table_iso8859_8.h: mk_sb_tbl.awk +unicode_table_iso8859_8.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_8_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_8_H -f mk_sb_tbl.awk 8859-8.TXT > $@ -unicode_table_iso8859_9.h: mk_sb_tbl.awk +unicode_table_iso8859_9.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_9_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_9_H -f mk_sb_tbl.awk 8859-9.TXT > $@ -unicode_table_iso8859_10.h: mk_sb_tbl.awk +unicode_table_iso8859_10.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_10_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_10_H -f mk_sb_tbl.awk 8859-10.TXT > $@ -unicode_table_iso8859_11.h: mk_sb_tbl.awk +unicode_table_iso8859_11.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_11_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_11_H -f mk_sb_tbl.awk 8859-11.TXT > $@ -unicode_table_iso8859_13.h: mk_sb_tbl.awk +unicode_table_iso8859_13.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_13_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_13_H -f mk_sb_tbl.awk 8859-13.TXT > $@ -unicode_table_iso8859_14.h: mk_sb_tbl.awk +unicode_table_iso8859_14.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_14_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_14_H -f mk_sb_tbl.awk 8859-14.TXT > $@ -unicode_table_iso8859_15.h: mk_sb_tbl.awk +unicode_table_iso8859_15.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_15_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLE_ISO8859_15_H -f mk_sb_tbl.awk 8859-15.TXT > $@ -unicode_table_iso8859_16.h: mk_sb_tbl.awk +unicode_table_iso8859_16.h: mk_sb_tbl.awk $(AWK) -v TABLE_NAME=iso8859_16_ucs_table \ -v IFNDEF_NAME=UNICODE_TABLEISO8859_16_H -f mk_sb_tbl.awk 8859-16.TXT > $@ diff --git a/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl b/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl index 5b5c3d63ff..5bab0c602e 100755 --- a/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl +++ b/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# script to generate Shift_JIS encoded Emoji to/from Unicode conversion table. +# script to generate Shift_JIS encoded Emoji to/from Unicode conversion table. # Rui Hirokawa <hirokawa@php.net> # # usage: mktbl.pl EmojiSources.txt @@ -22,7 +22,7 @@ sub sjis2code { # Shift_JIS -> JIS $c[0] = (($c[0]-($c[0]<160?112:176))<<1)-($c[1]<159?1:0); - $c[1] -= ($c[1]<159?($c[1]>127?32:31):126); + $c[1] -= ($c[1]<159?($c[1]>127?32:31):126); $s = ($c[0] - 0x21)*94 + $c[1]-0x21; @@ -131,19 +131,19 @@ push(@r_docomo2_val, 0x00); push(@r_docomo3_key, 0x00); push(@r_docomo3_val, 0x00); -print OUT "int mb_tbl_code2uni_docomo_min = $docomo_min;\n"; -print OUT "int mb_tbl_code2uni_docomo_max = $docomo_max;\n\n"; +print OUT "int mb_tbl_code2uni_docomo_min = $docomo_min;\n"; +print OUT "int mb_tbl_code2uni_docomo_max = $docomo_max;\n\n"; print OUT "int mb_tbl_code2uni_docomo[] = {\n"; print OUT &show_code(@docomo_v); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_docomo2code_min1 = $to_docomo_min1;\n"; -print OUT "int mb_tbl_uni_docomo2code_max1 = $to_docomo_max1;\n"; -print OUT "int mb_tbl_uni_docomo2code_min2 = $to_docomo_min2;\n"; -print OUT "int mb_tbl_uni_docomo2code_max2 = $to_docomo_max2;\n"; -print OUT "int mb_tbl_uni_docomo2code_min3 = $to_docomo_min3;\n"; -print OUT "int mb_tbl_uni_docomo2code_max3 = $to_docomo_max3;\n\n"; +print OUT "int mb_tbl_uni_docomo2code_min1 = $to_docomo_min1;\n"; +print OUT "int mb_tbl_uni_docomo2code_max1 = $to_docomo_max1;\n"; +print OUT "int mb_tbl_uni_docomo2code_min2 = $to_docomo_min2;\n"; +print OUT "int mb_tbl_uni_docomo2code_max2 = $to_docomo_max2;\n"; +print OUT "int mb_tbl_uni_docomo2code_min3 = $to_docomo_min3;\n"; +print OUT "int mb_tbl_uni_docomo2code_max3 = $to_docomo_max3;\n\n"; #print "DOCOMO reverse 1\n"; @@ -238,10 +238,10 @@ push(@r_kddi2_val, 0x00); push(@r_kddi3_key, 0x00); push(@r_kddi3_val, 0x00); -print OUT "int mb_tbl_code2uni_kddi1_min = $kddi_min1;\n"; -print OUT "int mb_tbl_code2uni_kddi1_max = $kddi_max1;\n"; -print OUT "int mb_tbl_code2uni_kddi2_min = $kddi_min2;\n"; -print OUT "int mb_tbl_code2uni_kddi2_max = $kddi_max2;\n\n"; +print OUT "int mb_tbl_code2uni_kddi1_min = $kddi_min1;\n"; +print OUT "int mb_tbl_code2uni_kddi1_max = $kddi_max1;\n"; +print OUT "int mb_tbl_code2uni_kddi2_min = $kddi_min2;\n"; +print OUT "int mb_tbl_code2uni_kddi2_max = $kddi_max2;\n\n"; #print "KDDI 1\n"; @@ -255,12 +255,12 @@ print OUT "int mb_tbl_code2uni_kddi2[] = {\n"; print OUT &show_code(@kddi_v2); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_kddi2code_min1 = $to_kddi_min1;\n"; -print OUT "int mb_tbl_uni_kddi2code_max1 = $to_kddi_max1;\n"; -print OUT "int mb_tbl_uni_kddi2code_min2 = $to_kddi_min2;\n"; -print OUT "int mb_tbl_uni_kddi2code_max2 = $to_kddi_max2;\n"; -print OUT "int mb_tbl_uni_kddi2code_min3 = $to_kddi_min3;\n"; -print OUT "int mb_tbl_uni_kddi2code_max3 = $to_kddi_max3;\n\n"; +print OUT "int mb_tbl_uni_kddi2code_min1 = $to_kddi_min1;\n"; +print OUT "int mb_tbl_uni_kddi2code_max1 = $to_kddi_max1;\n"; +print OUT "int mb_tbl_uni_kddi2code_min2 = $to_kddi_min2;\n"; +print OUT "int mb_tbl_uni_kddi2code_max2 = $to_kddi_max2;\n"; +print OUT "int mb_tbl_uni_kddi2code_min3 = $to_kddi_min3;\n"; +print OUT "int mb_tbl_uni_kddi2code_max3 = $to_kddi_max3;\n\n"; #print "KDDI reverse 1\n"; @@ -303,7 +303,7 @@ $sb_max3 = 10153+901; if (1) { print "SoftBank\n"; - + foreach $key (sort {hex($a) <=> hex($b)} keys(%softbank)) { $s = $key; $pos = $s % 94; @@ -319,7 +319,7 @@ if (1) { $sb_v3[$key-$sb_min3] = $softbank{$key}; } } - + } $to_sb_min = 10263; @@ -362,12 +362,12 @@ push(@r_sb3_key, 0x00); push(@r_sb3_val, 0x00); -print OUT "int mb_tbl_code2uni_sb1_min = $sb_min1;\n"; -print OUT "int mb_tbl_code2uni_sb1_max = $sb_max1;\n"; -print OUT "int mb_tbl_code2uni_sb2_min = $sb_min2;\n"; -print OUT "int mb_tbl_code2uni_sb2_max = $sb_max2;\n"; -print OUT "int mb_tbl_code2uni_sb3_min = $sb_min3;\n"; -print OUT "int mb_tbl_code2uni_sb3_max = $sb_max3;\n\n"; +print OUT "int mb_tbl_code2uni_sb1_min = $sb_min1;\n"; +print OUT "int mb_tbl_code2uni_sb1_max = $sb_max1;\n"; +print OUT "int mb_tbl_code2uni_sb2_min = $sb_min2;\n"; +print OUT "int mb_tbl_code2uni_sb2_max = $sb_max2;\n"; +print OUT "int mb_tbl_code2uni_sb3_min = $sb_min3;\n"; +print OUT "int mb_tbl_code2uni_sb3_max = $sb_max3;\n\n"; #print "SoftBank 1\n"; @@ -387,12 +387,12 @@ print OUT "int mb_tbl_code2uni_sb3[] = {\n"; print OUT &show_code(@sb_v3); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_sb2code_min1 = $to_sb_min1;\n"; -print OUT "int mb_tbl_uni_sb2code_max1 = $to_sb_max1;\n"; -print OUT "int mb_tbl_uni_sb2code_min2 = $to_sb_min2;\n"; -print OUT "int mb_tbl_uni_sb2code_max2 = $to_sb_max2;\n"; -print OUT "int mb_tbl_uni_sb2code_min3 = $to_sb_min3;\n"; -print OUT "int mb_tbl_uni_sb2code_max3 = $to_sb_max3;\n\n"; +print OUT "int mb_tbl_uni_sb2code_min1 = $to_sb_min1;\n"; +print OUT "int mb_tbl_uni_sb2code_max1 = $to_sb_max1;\n"; +print OUT "int mb_tbl_uni_sb2code_min2 = $to_sb_min2;\n"; +print OUT "int mb_tbl_uni_sb2code_max2 = $to_sb_max2;\n"; +print OUT "int mb_tbl_uni_sb2code_min3 = $to_sb_min3;\n"; +print OUT "int mb_tbl_uni_sb2code_max3 = $to_sb_max3;\n\n"; #print "SB reverse 1\n"; diff --git a/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk b/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk index f0ad290e24..8703cd199a 100755 --- a/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk +++ b/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk @@ -56,7 +56,7 @@ END { print "" break; } - } + } print "};" if (IFNDEF_NAME) { diff --git a/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk b/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk index 02c73f2025..d93384f9d2 100644 --- a/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk +++ b/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk @@ -78,4 +78,4 @@ END { printf("{ 0x%04x, 0x%04x }", first, prev) } print "\n};\n" -} +} diff --git a/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp b/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp index a6459fe5ac..c9b87ea961 100644 --- a/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp +++ b/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp @@ -867,7 +867,7 @@ expect { } close -set test "full-width katakanas to full-width hiragana" +set test "full-width katakanas to full-width hiragana" spawn tests/conv_kana EUC-JP "c" expect_after { "\[^\r\n\]*\r\n" { fail $test } diff --git a/ext/mbstring/libmbfl/tests/sample.c b/ext/mbstring/libmbfl/tests/sample.c index d96196495f..02d1b0528a 100644 --- a/ext/mbstring/libmbfl/tests/sample.c +++ b/ext/mbstring/libmbfl/tests/sample.c @@ -31,7 +31,7 @@ int main() convd = mbfl_buffer_converter_new(from_encoding, to_encoding, 0); ret = mbfl_buffer_converter_feed_result(convd, &string, &result); - mbfl_buffer_converter_delete(convd); + mbfl_buffer_converter_delete(convd); puts(ret->val); return 1; diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index eecd8c2471..2ff304f277 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1447,7 +1447,7 @@ PHP_FUNCTION(mb_ereg_search_setpos) if ((position < 0) && (!Z_ISUNDEF(MBREX(search_str))) && (Z_TYPE(MBREX(search_str)) == IS_STRING)) { position += Z_STRLEN(MBREX(search_str)); } - + if (position < 0 || (!Z_ISUNDEF(MBREX(search_str)) && Z_TYPE(MBREX(search_str)) == IS_STRING && (size_t)position > Z_STRLEN(MBREX(search_str)))) { php_error_docref(NULL, E_WARNING, "Position is out of range"); MBREX(search_pos) = 0; diff --git a/ext/mbstring/tests/common.inc b/ext/mbstring/tests/common.inc index c686b0696c..adccb0ab73 100644 --- a/ext/mbstring/tests/common.inc +++ b/ext/mbstring/tests/common.inc @@ -6,7 +6,7 @@ // Custom Error Hanlder for testing function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { global $debug; - + $err_type = array ( 1 => "Error", // E_ERROR 2 => "Warning", // E_WARINING @@ -23,7 +23,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { 4096=> "Recoverable fatal error", // E_RECOVERABLE_ERROR 8192=> "Deprecated", // E_DEPRECATED ); - + if (!empty($debug)) { printf("%s: %s (%d)\n", $err_type[$err_no], $err_msg, $linenum); } @@ -46,7 +46,7 @@ class tc public $s1 = 'ÆüËܸìEUC-JP¤Îʸ»úÎó'; public $s2 = 'English Text'; - function __construct() + function __construct() { } } diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index c700dac819..c5dfe5dc5a 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -31,11 +31,11 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [ PHP_ARG_WITH(mysqli, for MySQLi support, [ --with-mysqli[=FILE] Include MySQLi support. FILE is the path - to mysql_config. If no value or mysqlnd is passed + to mysql_config. If no value or mysqlnd is passed as FILE, the MySQL native driver will be used]) PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, -[ --enable-embedded-mysqli +[ --enable-embedded-mysqli MYSQLi: Enable embedded support Note: Does not work with MySQL native driver!], no, no) @@ -65,7 +65,7 @@ elif test "$PHP_MYSQLI" != "no"; then else MYSQL_LIB_CFG='--libs' fi - + if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index 9213931393..0f8e82d398 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -31,7 +31,7 @@ if (PHP_MYSQLI != "no") { PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); } else { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && - CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQLI)) { EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index cbc932298b..bc72c838af 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -185,7 +185,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne MyG(num_active_persistent)++; /* clear error */ - php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); + php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); goto end; } else { diff --git a/ext/mysqli/package.xml b/ext/mysqli/package.xml index bfeeb71850..d31152e3bf 100644 --- a/ext/mysqli/package.xml +++ b/ext/mysqli/package.xml @@ -30,7 +30,7 @@ package.xml added to support installation using pear installer </notes> <configureoptions> <configureoption name="with-mysqli" default="autodetect" prompt="path to mysql_config tool?"/> - <configureoption name="enable-embedded-mysqli" default="no" prompt="embedd mysql server into PHP?"/> + <configureoption name="enable-embedded-mysqli" default="no" prompt="embedd mysql server into PHP?"/> </configureoptions> <filelist> <file role="src" name="config.m4"/> @@ -104,7 +104,7 @@ package.xml added to support installation using pear installer <file role="test" name="tests/058.phpt"/> <file role="test" name="tests/059.phpt"/> <file role="test" name="tests/060.phpt"/> - <file role="test" name="tests/connect.inc"/> + <file role="test" name="tests/connect.inc"/> </filelist> <deps> <dep type="php" rel="ge" version="5" /> diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32 index 52be8f563c..d2b8df3866 100644 --- a/ext/mysqlnd/config.w32 +++ b/ext/mysqlnd/config.w32 @@ -5,7 +5,7 @@ ARG_WITH("mysqlnd", "Mysql Native Client Driver", "yes"); if (PHP_MYSQLND != "no") { if (CHECK_LIB("ws2_32.lib", "mysqlnd")) { - mysqlnd_source = + mysqlnd_source = "mysqlnd_alloc.c " + "mysqlnd_auth.c " + "mysqlnd_block_alloc.c " + diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index 59b1349d63..73a53b2bba 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -208,7 +208,7 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement)(MYSQLND_CONN_DATA stmt->persistent = persistent; if (FAIL == mysqlnd_error_info_init(&stmt->error_info_impl, persistent)) { - break; + break; } stmt->error_info = &stmt->error_info_impl; diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index a9a603c6a9..cacaa8057b 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -734,7 +734,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_execute)(MYSQLND_STMT * const s, const enum_my if (command) { ret = command->run(command); command->free_command(command); - } + } } else { SET_CLIENT_ERROR(stmt->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "Couldn't generate the request. Possibly OOM."); } @@ -1069,7 +1069,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, const unsigned ret = command->run(command); command->free_command(command); if (ret == FAIL) { - COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); + COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); } } if (FAIL == ret) { diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 45b31a7210..b9cbb17894 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1469,7 +1469,7 @@ php_mysqlnd_read_row_ex(MYSQLND_PFC * pfc, size_t prealloc_more_bytes; DBG_ENTER("php_mysqlnd_read_row_ex"); - + /* To ease the process the server splits everything in packets up to 2^24 - 1. Even in the case the payload is evenly divisible by this value, the last @@ -1483,7 +1483,7 @@ php_mysqlnd_read_row_ex(MYSQLND_PFC * pfc, needs to be able to append a terminating \0 for atoi/atof. */ prealloc_more_bytes = 1; - + *data_size = 0; while (1) { if (FAIL == mysqlnd_read_header(pfc, vio, &header, stats, error_info)) { diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index ecee15fd1c..21fd94c8ec 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -12,28 +12,28 @@ dnl dnl Figure out which library file to link with for the Solid support. dnl AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[ - AC_MSG_CHECKING([Solid library file]) + AC_MSG_CHECKING([Solid library file]) ac_solid_uname_r=`uname -r 2>/dev/null` ac_solid_uname_s=`uname -s 2>/dev/null` case $ac_solid_uname_s in AIX) ac_solid_os=a3x;; # a4x for AIX4/ Solid 2.3/3.0 only HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10 IRIX) ac_solid_os=irx;; # Solid 2.3(?)/ 3.0 only - Linux) + Linux) if ldd -v /bin/sh | grep GLIBC > /dev/null; then AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ]) ac_solid_os=l2x else AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ]) ac_solid_os=lux - fi;; - SunOS) + fi;; + SunOS) ac_solid_os=ssx;; # should we deal with SunOS 4? - FreeBSD) + FreeBSD) if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ]) ac_solid_os=fex - else + else AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ]) ac_solid_os=fbx fi;; @@ -311,7 +311,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(birdstep,, [ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) - + AC_MSG_CHECKING(for Birdstep support) if test "$PHP_BIRDSTEP" != "no"; then if test "$PHP_BIRDSTEP" = "yes"; then @@ -321,7 +321,7 @@ PHP_ARG_WITH(birdstep,, ODBC_INCDIR=$PHP_BIRDSTEP/include ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR fi - + case $host_alias in *aix*[)] AC_DEFINE(AIX,1,[ ]);; @@ -361,7 +361,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(custom-odbc,, [ --with-custom-odbc[=DIR] Include user defined ODBC support. DIR is ODBC install base directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and - have some odbc.h in your include dirs. f.e. you should define + have some odbc.h in your include dirs. f.e. you should define following for Sybase SQL Anywhere 5.5.00 on QNX, prior to running this configure script: CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" @@ -394,7 +394,7 @@ PHP_ARG_WITH(iodbc,, if test "$PHP_IODBC" != "no"; then if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi + fi if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR) ODBC_TYPE=iodbc @@ -540,7 +540,7 @@ if test -n "$ODBC_TYPE"; then AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ]) fi fi - + AC_DEFINE(HAVE_UODBC,1,[ ]) PHP_SUBST(ODBC_SHARED_LIBADD) PHP_SUBST(ODBC_INCDIR) diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index d0af665746..d5a6fe2a9c 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -25,7 +25,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif - + #include "php.h" #include "php_globals.h" @@ -394,13 +394,13 @@ static PHP_GINIT_FUNCTION(odbc); */ zend_module_entry odbc_module_entry = { STANDARD_MODULE_HEADER, - "odbc", - odbc_functions, - PHP_MINIT(odbc), + "odbc", + odbc_functions, + PHP_MINIT(odbc), PHP_MSHUTDOWN(odbc), - PHP_RINIT(odbc), - PHP_RSHUTDOWN(odbc), - PHP_MINFO(odbc), + PHP_RINIT(odbc), + PHP_RSHUTDOWN(odbc), + PHP_MINFO(odbc), PHP_ODBC_VERSION, PHP_MODULE_GLOBALS(odbc), PHP_GINIT(odbc), @@ -424,7 +424,7 @@ static void _free_odbc_result(zend_resource *rsrc) odbc_result *res = (odbc_result *)rsrc->ptr; int i; RETCODE rc; - + if (res) { if (res->values) { for(i = 0; i < res->numcols; i++) { @@ -588,7 +588,7 @@ static PHP_INI_DISP(display_defPW) static PHP_INI_DISP(display_binmode) { char *value; - + if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) { value = ZSTR_VAL(ini_entry->orig_value); } else if (ini_entry->value) { @@ -680,7 +680,7 @@ static PHP_INI_DISP(display_cursortype) /* }}} */ -/* {{{ PHP_INI_BEGIN +/* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("odbc.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, @@ -701,7 +701,7 @@ PHP_INI_BEGIN() defaultbinmode, zend_odbc_globals, odbc_globals, display_binmode) STD_PHP_INI_BOOLEAN("odbc.check_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong, check_persistent, zend_odbc_globals, odbc_globals) - STD_PHP_INI_ENTRY_EX("odbc.default_cursortype", "3", PHP_INI_ALL, OnUpdateLong, + STD_PHP_INI_ENTRY_EX("odbc.default_cursortype", "3", PHP_INI_ALL, OnUpdateLong, default_cursortype, zend_odbc_globals, odbc_globals, display_cursortype) PHP_INI_END() /* }}} */ @@ -727,7 +727,7 @@ PHP_MINIT_FUNCTION(odbc) le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number); le_pconn = zend_register_list_destructors_ex(NULL, _close_odbc_pconn, "odbc link persistent", module_number); odbc_module_entry.type = type; - + REGISTER_STRING_CONSTANT("ODBC_TYPE", PHP_ODBC_TYPE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ODBC_BINMODE_RETURN", 1, CONST_CS | CONST_PERSISTENT); @@ -752,7 +752,7 @@ PHP_MINIT_FUNCTION(odbc) REGISTER_LONG_CONSTANT("SQL_CURSOR_KEYSET_DRIVEN", SQL_CURSOR_KEYSET_DRIVEN, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("SQL_CURSOR_DYNAMIC", SQL_CURSOR_DYNAMIC, CONST_PERSISTENT | CONST_CS); REGISTER_LONG_CONSTANT("SQL_CURSOR_STATIC", SQL_CURSOR_STATIC, CONST_PERSISTENT | CONST_CS); - + REGISTER_LONG_CONSTANT("SQL_KEYSET_SIZE", SQL_KEYSET_SIZE, CONST_PERSISTENT | CONST_CS); /* these are for the Data Source type */ @@ -870,7 +870,7 @@ PHP_MINFO_FUNCTION(odbc) DISPLAY_INI_ENTRIES(); -} +} /* }}} */ /* {{{ odbc_sql_error */ @@ -890,7 +890,7 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS) conn = SQL_NULL_HDBC; } - /* This leads to an endless loop in many drivers! + /* This leads to an endless loop in many drivers! * while(henv != SQL_NULL_HENV){ do { @@ -909,7 +909,7 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS) } else { php_error_docref(NULL, E_WARNING, "SQL error: %s, SQL state %s", ODBCG(lasterrormsg), ODBCG(laststate)); } - /* + /* } while (SQL_SUCCEEDED(rc)); } */ @@ -930,7 +930,7 @@ void php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode) if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if (mode) { result->longreadlen = flag; } else { @@ -962,13 +962,13 @@ int odbc_bindcols(odbc_result *result) rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_SQL_DESC_NAME, result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0); - rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE, + rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE, NULL, 0, NULL, &result->values[i].coltype); - + /* Don't bind LONG / BINARY columns, so that fetch behaviour can * be controlled by odbc_binmode() / odbc_longreadlen() */ - + switch(result->values[i].coltype) { case SQL_BINARY: case SQL_VARBINARY: @@ -979,7 +979,7 @@ int odbc_bindcols(odbc_result *result) #endif result->values[i].value = NULL; break; - + #ifdef HAVE_ADABAS case SQL_TIMESTAMP: result->values[i].value = (char *)emalloc(27); @@ -1059,7 +1059,7 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type) odbc_connection *conn; RETCODE rc; zval *pv_conn; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pv_conn) == FAILURE) { return; } @@ -1067,7 +1067,7 @@ void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type) if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) { RETURN_FALSE; } - + rc = SQLTransact(conn->henv, conn->hdbc, (SQLUSMALLINT)((type)?SQL_COMMIT:SQL_ROLLBACK)); if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLTransact"); @@ -1094,7 +1094,7 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type) { odbc_result *result; #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) - /* this seems to be necessary for Solid2.3 ( tested by + /* this seems to be necessary for Solid2.3 ( tested by * tammy@synchronis.com) and Solid 3.0 (tested by eric@terra.telemediair.nl) * Solid does not seem to declare a SQLINTEGER, but it does declare a * SQL_INTEGER which does not work (despite being the same type as a SDWORD. @@ -1163,7 +1163,7 @@ PHP_FUNCTION(odbc_close_all) } else if (p->type == le_pconn){ zend_list_close(p); /* Delete the persistent connection */ - zend_hash_apply_with_argument(&EG(persistent_list), + zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) _close_pconn_with_res, (void *)p); } } @@ -1211,10 +1211,10 @@ PHP_FUNCTION(odbc_prepare) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + result->numparams = 0; result->param_info = NULL; - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -1255,7 +1255,7 @@ PHP_FUNCTION(odbc_prepare) odbc_sql_error(conn, result->stmt, "SQLPrepare"); RETURN_FALSE; } - + SQLNumParams(result->stmt, &(result->numparams)); SQLNumResultCols(result->stmt, &(result->numcols)); @@ -1295,7 +1295,7 @@ PHP_FUNCTION(odbc_prepare) /* {{{ proto bool odbc_execute(resource result_id [, array parameters_array]) Execute a prepared statement */ PHP_FUNCTION(odbc_execute) -{ +{ zval *pv_res, *pv_param_arr, *tmp; typedef struct params_t { SQLLEN vallen; @@ -1308,9 +1308,9 @@ PHP_FUNCTION(odbc_execute) odbc_result *result; int numArgs, i, ne; RETCODE rc; - + numArgs = ZEND_NUM_ARGS(); - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|a", &pv_res, &pv_param_arr) == FAILURE) { return; } @@ -1318,7 +1318,7 @@ PHP_FUNCTION(odbc_execute) if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + /* XXX check for already bound parameters*/ if (result->numparams > 0 && numArgs == 1) { php_error_docref(NULL, E_WARNING, "No parameters to SQL statement given"); @@ -1336,7 +1336,7 @@ PHP_FUNCTION(odbc_execute) for(i = 0; i < result->numparams; i++) { params[i].fp = -1; } - + for(i = 1; i <= result->numparams; i++) { if ((tmp = zend_hash_get_current_data(Z_ARRVAL_P(pv_param_arr))) == NULL) { php_error_docref(NULL, E_WARNING,"Error getting parameter"); @@ -1363,7 +1363,7 @@ PHP_FUNCTION(odbc_execute) efree(params); RETURN_FALSE; } - + params[i-1].vallen = Z_STRLEN_P(tmp); params[i-1].fp = -1; @@ -1376,7 +1376,7 @@ PHP_FUNCTION(odbc_execute) if (Z_STRLEN_P(tmp) > 2 && Z_STRVAL_P(tmp)[0] == '\'' && Z_STRVAL_P(tmp)[Z_STRLEN_P(tmp) - 1] == '\'') { - + if (CHECK_ZVAL_NULL_PATH(tmp)) { RETURN_FALSE; } @@ -1431,7 +1431,7 @@ PHP_FUNCTION(odbc_execute) ¶ms[i-1].vallen); } if (rc == SQL_ERROR) { - odbc_sql_error(result->conn_ptr, result->stmt, "SQLBindParameter"); + odbc_sql_error(result->conn_ptr, result->stmt, "SQLBindParameter"); SQLFreeStmt(result->stmt, SQL_RESET_PARAMS); for (i = 0; i < result->numparams; i++) { if (params[i].fp != -1) { @@ -1448,7 +1448,7 @@ PHP_FUNCTION(odbc_execute) rc = SQLFreeStmt(result->stmt, SQL_CLOSE); if (rc == SQL_ERROR) { - odbc_sql_error(result->conn_ptr, result->stmt, "SQLFreeStmt"); + odbc_sql_error(result->conn_ptr, result->stmt, "SQLFreeStmt"); } rc = SQLExecute(result->stmt); @@ -1477,8 +1477,8 @@ PHP_FUNCTION(odbc_execute) odbc_sql_error(result->conn_ptr, result->stmt, "SQLExecute"); RETVAL_FALSE; } - } - + } + if (result->numparams > 0) { SQLFreeStmt(result->stmt, SQL_RESET_PARAMS); for(i = 0; i < result->numparams; i++) { @@ -1518,7 +1518,7 @@ PHP_FUNCTION(odbc_cursor) char *cursorname; odbc_result *result; RETCODE rc; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pv_res) == FAILURE) { return; } @@ -1531,7 +1531,7 @@ PHP_FUNCTION(odbc_cursor) if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { RETURN_FALSE; } - + if (max_len > 0) { cursorname = emalloc(max_len + 1); rc = SQLGetCursorName(result->stmt,cursorname,(SQLSMALLINT)max_len,&len); @@ -1594,12 +1594,12 @@ PHP_FUNCTION(odbc_data_source) } /* now we have the "connection" lets call the DataSource object */ - rc = SQLDataSources(conn->henv, + rc = SQLDataSources(conn->henv, fetch_type, server_name, (SQLSMALLINT)sizeof(server_name), &len1, - desc, + desc, (SQLSMALLINT)sizeof(desc), &len2); @@ -1641,7 +1641,7 @@ PHP_FUNCTION(odbc_exec) #endif numArgs = ZEND_NUM_ARGS(); - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|l", &pv_conn, &query, &query_len, &pv_flags) == FAILURE) { return; } @@ -1649,7 +1649,7 @@ PHP_FUNCTION(odbc_exec) if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) { RETURN_FALSE; } - + result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); @@ -1664,7 +1664,7 @@ PHP_FUNCTION(odbc_exec) efree(result); RETURN_FALSE; } - + #ifdef HAVE_SQL_EXTENDED_FETCH /* Solid doesn't have ExtendedFetch, if DriverManager is used, get Info, whether Driver supports ExtendedFetch */ @@ -1682,18 +1682,18 @@ PHP_FUNCTION(odbc_exec) #endif rc = SQLExecDirect(result->stmt, query, SQL_NTS); - if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO && rc != SQL_NO_DATA_FOUND) { + if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO && rc != SQL_NO_DATA_FOUND) { /* XXX FIXME we should really check out SQLSTATE with SQLError * in case rc is SQL_SUCCESS_WITH_INFO here. */ - odbc_sql_error(conn, result->stmt, "SQLExecDirect"); + odbc_sql_error(conn, result->stmt, "SQLExecDirect"); SQLFreeStmt(result->stmt, SQL_DROP); efree(result); RETURN_FALSE; } SQLNumResultCols(result->stmt, &(result->numcols)); - + /* For insert, update etc. cols == 0 */ if (result->numcols > 0) { if (!odbc_bindcols(result)) { @@ -1732,7 +1732,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pv_res, &pv_row) == FAILURE) { return; } - + rownum = pv_row; #else zval *pv_res, tmp; @@ -1765,9 +1765,9 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { RETURN_FALSE; } - + array_init(return_value); - + #ifdef HAVE_SQL_EXTENDED_FETCH if (rownum > 0 && result->fetch_abs) result->fetched = rownum; @@ -1796,11 +1796,11 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) if (IS_SQL_LONG(result->values[i].coltype) && result->longreadlen <= 0) { ZVAL_EMPTY_STRING(&tmp); break; - } + } if (buf == NULL) { buf = emalloc(result->longreadlen + 1); } - + rc = SQLGetData(result->stmt, (SQLUSMALLINT)(i + 1), sql_c_type, buf, result->longreadlen + 1, &result->values[i].vallen); if (rc == SQL_ERROR) { @@ -1866,7 +1866,7 @@ PHP_FUNCTION(odbc_fetch_array) #endif /* {{{ proto int odbc_fetch_into(resource result_id, array &result_array [, int rownumber]) - Fetch one result row into an array */ + Fetch one result row into an array */ PHP_FUNCTION(odbc_fetch_into) { int i; @@ -1886,7 +1886,7 @@ PHP_FUNCTION(odbc_fetch_into) if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/|l", &pv_res, &pv_res_arr, &pv_row) == FAILURE) { return; } - + rownum = pv_row; #else if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/", &pv_res, &pv_res_arr) == FAILURE) { @@ -1897,12 +1897,12 @@ PHP_FUNCTION(odbc_fetch_into) if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if (result->numcols == 0) { php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; } - + if (Z_TYPE_P(pv_res_arr) != IS_ARRAY) { array_init(pv_res_arr); } @@ -1940,7 +1940,7 @@ PHP_FUNCTION(odbc_fetch_into) ZVAL_EMPTY_STRING(&tmp); break; } - if (result->binmode == 1) sql_c_type = SQL_C_BINARY; + if (result->binmode == 1) sql_c_type = SQL_C_BINARY; case SQL_LONGVARCHAR: #if defined(ODBCVER) && (ODBCVER >= 0x0300) @@ -1982,23 +1982,23 @@ PHP_FUNCTION(odbc_fetch_into) zend_hash_index_update(Z_ARRVAL_P(pv_res_arr), i, &tmp); } if (buf) efree(buf); - RETURN_LONG(result->numcols); + RETURN_LONG(result->numcols); } /* }}} */ /* {{{ proto bool solid_fetch_prev(resource result_id) - */ + */ #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) PHP_FUNCTION(solid_fetch_prev) { odbc_result *result; RETCODE rc; zval *pv_res; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pv_res) == FAILURE) { return; } - + if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } @@ -2038,13 +2038,13 @@ PHP_FUNCTION(odbc_fetch_row) if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pv_res, &pv_row) == FAILURE) { return; } - + rownum = pv_row; - + if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if (result->numcols == 0) { php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; @@ -2064,19 +2064,19 @@ PHP_FUNCTION(odbc_fetch_row) if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { RETURN_FALSE; } - + if (ZEND_NUM_ARGS() > 1) { result->fetched = rownum; } else { result->fetched++; } - + RETURN_TRUE; -} +} /* }}} */ /* {{{ proto mixed odbc_result(resource result_id, mixed field) - Get result data */ + Get result data */ PHP_FUNCTION(odbc_result) { char *field; @@ -2099,23 +2099,23 @@ PHP_FUNCTION(odbc_result) if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pv_res, &pv_field) == FAILURE) { return; } - + if (Z_TYPE_P(pv_field) == IS_STRING) { field = Z_STRVAL_P(pv_field); } else { convert_to_long_ex(pv_field); field_ind = Z_LVAL_P(pv_field) - 1; } - + if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if ((result->numcols == 0)) { php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; } - + /* get field index if the field parameter was a string */ if (field != NULL) { if (result->values == NULL) { @@ -2154,7 +2154,7 @@ PHP_FUNCTION(odbc_result) if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { RETURN_FALSE; } - + result->fetched++; } @@ -2166,7 +2166,7 @@ PHP_FUNCTION(odbc_result) sql_c_type = SQL_C_BINARY; } if (result->binmode <= 0) { - break; + break; } case SQL_LONGVARCHAR: #if defined(ODBCVER) && (ODBCVER >= 0x0300) @@ -2179,7 +2179,7 @@ PHP_FUNCTION(odbc_result) fieldsize = result->longreadlen; } } else { - PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(field_ind + 1), + PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(field_ind + 1), (SQLUSMALLINT)((sql_c_type == SQL_C_BINARY) ? SQL_COLUMN_LENGTH : SQL_COLUMN_DISPLAY_SIZE), NULL, 0, NULL, &fieldsize); @@ -2189,7 +2189,7 @@ PHP_FUNCTION(odbc_result) field_str = zend_string_alloc(fieldsize, 0); /* SQLGetData will truncate CHAR data to fieldsize - 1 bytes and append \0. - * For binary data it is truncated to fieldsize bytes. + * For binary data it is truncated to fieldsize bytes. */ rc = SQLGetData(result->stmt, (SQLUSMALLINT)(field_ind + 1), sql_c_type, ZSTR_VAL(field_str), fieldsize, &result->values[field_ind].vallen); @@ -2207,7 +2207,7 @@ PHP_FUNCTION(odbc_result) zend_string_free(field_str); RETURN_FALSE; } - /* Reduce fieldlen by 1 if we have char data. One day we might + /* Reduce fieldlen by 1 if we have char data. One day we might have binary strings... */ if ((result->values[field_ind].coltype == SQL_LONGVARCHAR) #if defined(ODBCVER) && (ODBCVER >= 0x0300) @@ -2224,7 +2224,7 @@ PHP_FUNCTION(odbc_result) } RETURN_NEW_STR(field_str); break; - + default: if (result->values[field_ind].vallen == SQL_NULL_DATA) { RETURN_NULL(); @@ -2235,11 +2235,11 @@ PHP_FUNCTION(odbc_result) } /* If we come here, output unbound LONG and/or BINARY column data to the client */ - + /* We emalloc 1 byte more for SQL_C_CHAR (trailing \0) */ fieldsize = (sql_c_type == SQL_C_CHAR) ? 4096 : 4095; field = emalloc(fieldsize); - + /* Call SQLGetData() until SQL_SUCCESS is returned */ while(1) { rc = SQLGetData(result->stmt, (SQLUSMALLINT)(field_ind + 1),sql_c_type, field, fieldsize, &result->values[field_ind].vallen); @@ -2249,7 +2249,7 @@ PHP_FUNCTION(odbc_result) efree(field); RETURN_FALSE; } - + if (result->values[field_ind].vallen == SQL_NULL_DATA) { efree(field); RETURN_NULL(); @@ -2285,11 +2285,11 @@ PHP_FUNCTION(odbc_result_all) if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s", &pv_res, &pv_format, &pv_format_len) == FAILURE) { return; } - + if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if (result->numcols == 0) { php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; @@ -2298,21 +2298,21 @@ PHP_FUNCTION(odbc_result_all) if (result->fetch_abs) rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus); else -#endif +#endif rc = SQLFetch(result->stmt); if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { php_printf("<h2>No rows found</h2>\n"); RETURN_LONG(0); } - + /* Start table tag */ if (ZEND_NUM_ARGS() == 1) { php_printf("<table><tr>"); } else { php_printf("<table %s ><tr>", pv_format); } - + for (i = 0; i < result->numcols; i++) { php_printf("<th>%s</th>", result->values[i].name); } @@ -2332,14 +2332,14 @@ PHP_FUNCTION(odbc_result_all) php_printf("<td>Not printable</td>"); break; } - if (result->binmode <= 1) sql_c_type = SQL_C_BINARY; + if (result->binmode <= 1) sql_c_type = SQL_C_BINARY; case SQL_LONGVARCHAR: #if defined(ODBCVER) && (ODBCVER >= 0x0300) case SQL_WLONGVARCHAR: #endif - if (IS_SQL_LONG(result->values[i].coltype) && + if (IS_SQL_LONG(result->values[i].coltype) && result->longreadlen <= 0) { - php_printf("<td>Not printable</td>"); + php_printf("<td>Not printable</td>"); break; } @@ -2348,7 +2348,7 @@ PHP_FUNCTION(odbc_result_all) } rc = SQLGetData(result->stmt, (SQLUSMALLINT)(i + 1),sql_c_type, buf, result->longreadlen, &result->values[i].vallen); - + php_printf("<td>"); if (rc == SQL_ERROR) { @@ -2383,7 +2383,7 @@ PHP_FUNCTION(odbc_result_all) rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus); else #endif - rc = SQLFetch(result->stmt); + rc = SQLFetch(result->stmt); } php_printf("</table>\n"); if (buf) efree(buf); @@ -2416,9 +2416,9 @@ PHP_FUNCTION(odbc_free_result) efree(result->values); result->values = NULL; } - + zend_list_close(Z_RES_P(pv_res)); - + RETURN_TRUE; } /* }}} */ @@ -2443,14 +2443,14 @@ PHP_FUNCTION(odbc_pconnect) int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int cur_opt, int persistent) { RETCODE rc; - + *conn = (odbc_connection *)pemalloc(sizeof(odbc_connection), persistent); memset(*conn, 0, sizeof(odbc_connection)); (*conn)->persistent = persistent; SQLAllocEnv(&((*conn)->henv)); SQLAllocConnect((*conn)->henv, &((*conn)->hdbc)); - -#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) + +#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) SQLSetConnectOption((*conn)->hdbc, SQL_TRANSLATE_OPTION, SQL_SOLID_XLATOPT_NOCNV); #endif @@ -2513,7 +2513,7 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int /* Possible fix for bug #10250 * Needs testing on UnixODBC < 2.0.5 though. */ #if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC) || defined(PHP_WIN32) || defined (HAVE_IODBC) -/* * Uncomment the line above, and comment line below to fully test +/* * Uncomment the line above, and comment line below to fully test * #ifdef HAVE_EMPRESS */ { int direct = 0; @@ -2561,7 +2561,7 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int /* Persistent connections: two list-types le_pconn, le_conn and a plist * where hashed connection info is stored together with index pointer to - * the actual link of type le_pconn in the list. Only persistent + * the actual link of type le_pconn in the list. Only persistent * connections get hashed up. Normal connections use existing pconnections. * Maybe this has to change with regard to transactions on pconnections? * Possibly set autocommit to on on request shutdown. @@ -2588,14 +2588,14 @@ void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss|l", &db, &db_len, &uid, &uid_len, &pwd, &pwd_len, &pv_opt) == FAILURE) { return; } - + cur_opt = pv_opt; - + if (ZEND_NUM_ARGS() > 3) { /* Confirm the cur_opt range */ - if (! (cur_opt == SQL_CUR_USE_IF_NEEDED || - cur_opt == SQL_CUR_USE_ODBC || - cur_opt == SQL_CUR_USE_DRIVER || + if (! (cur_opt == SQL_CUR_USE_IF_NEEDED || + cur_opt == SQL_CUR_USE_ODBC || + cur_opt == SQL_CUR_USE_DRIVER || cur_opt == SQL_CUR_DEFAULT) ) { php_error_docref(NULL, E_WARNING, "Invalid Cursor type (%d)", cur_opt); RETURN_FALSE; @@ -2619,11 +2619,11 @@ try_and_get_another_connection: if (persistent) { zend_resource *le; - + /* the link is not in the persistent list */ if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hashed_details, hashed_len)) == NULL) { zend_resource new_le; - + if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) { php_error_docref(NULL, E_WARNING, "Too many open links (%ld)", ODBCG(num_links)); efree(hashed_details); @@ -2634,12 +2634,12 @@ try_and_get_another_connection: efree(hashed_details); RETURN_FALSE; } - + if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 1)) { efree(hashed_details); RETURN_FALSE; } - + new_le.type = le_pconn; new_le.ptr = db_conn; new_le.handle = -1; @@ -2670,13 +2670,13 @@ try_and_get_another_connection: UCHAR d_name[32]; SQLSMALLINT len; - ret = SQLGetInfo(db_conn->hdbc, - SQL_DATA_SOURCE_READ_ONLY, + ret = SQLGetInfo(db_conn->hdbc, + SQL_DATA_SOURCE_READ_ONLY, d_name, sizeof(d_name), &len); if(ret != SQL_SUCCESS || len == 0) { zend_hash_str_del(&EG(persistent_list), hashed_details, hashed_len); - /* Commented out to fix a possible double closure error + /* Commented out to fix a possible double closure error * when working with persistent connections as submitted by * bug #15758 * @@ -2691,7 +2691,7 @@ try_and_get_another_connection: RETVAL_RES(db_conn->res); } else { /* non persistent */ zend_resource *index_ptr, new_index_ptr; - + if ((index_ptr = zend_hash_str_find_ptr(&EG(regular_list), hashed_details, hashed_len)) != NULL) { zend_ulong conn_id; zend_resource *p; @@ -2765,11 +2765,11 @@ PHP_FUNCTION(odbc_close) } } } ZEND_HASH_FOREACH_END(); - + zend_list_close(Z_RES_P(pv_conn)); - + if(is_pconn){ - zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) _close_pconn_with_res, (void *) Z_RES_P(pv_conn)); + zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) _close_pconn_with_res, (void *) Z_RES_P(pv_conn)); } } /* }}} */ @@ -2781,7 +2781,7 @@ PHP_FUNCTION(odbc_num_rows) odbc_result *result; SQLLEN rows; zval *pv_res; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pv_res) == FAILURE) { return; } @@ -2874,30 +2874,30 @@ PHP_FUNCTION(odbc_field_name) odbc_result *result; zval *pv_res; zend_long pv_num; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &pv_res, &pv_num) == FAILURE) { return; } - + if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if (result->numcols == 0) { php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; } - + if (pv_num > result->numcols) { php_error_docref(NULL, E_WARNING, "Field index larger than number of fields"); RETURN_FALSE; } - + if (pv_num < 1) { php_error_docref(NULL, E_WARNING, "Field numbering starts at 1"); RETURN_FALSE; } - + RETURN_STRING(result->values[pv_num - 1].name); } /* }}} */ @@ -2924,7 +2924,7 @@ PHP_FUNCTION(odbc_field_type) php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; } - + if (pv_num > result->numcols) { php_error_docref(NULL, E_WARNING, "Field index larger than number of fields"); RETURN_FALSE; @@ -2952,7 +2952,7 @@ PHP_FUNCTION(odbc_field_len) Get the scale of a column */ PHP_FUNCTION(odbc_field_scale) { - odbc_column_lengths(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); + odbc_column_lengths(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ @@ -2968,11 +2968,11 @@ PHP_FUNCTION(odbc_field_num) if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &pv_res, &fname, &fname_len) == FAILURE) { return; } - + if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + if (result->numcols == 0) { php_error_docref(NULL, E_WARNING, "No tuples available at this result index"); RETURN_FALSE; @@ -3009,7 +3009,7 @@ PHP_FUNCTION(odbc_autocommit) if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) { RETURN_FALSE; } - + if (ZEND_NUM_ARGS() > 1) { rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT, (pv_onoff) ? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF); if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { @@ -3134,7 +3134,7 @@ PHP_FUNCTION(odbc_setoption) if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_handle), "ODBC result", le_result)) == NULL) { RETURN_FALSE; } - + rc = SQLSetStmtOption(result->stmt, (unsigned short) pv_opt, pv_val); if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) { @@ -3167,7 +3167,7 @@ PHP_FUNCTION(odbc_tables) size_t cat_len = 0, schema_len = 0, table_len = 0, type_len = 0; RETCODE rc; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &table, &table_len, &type, &type_len) == FAILURE) { return; } @@ -3177,7 +3177,7 @@ PHP_FUNCTION(odbc_tables) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3196,9 +3196,9 @@ PHP_FUNCTION(odbc_tables) schema = NULL; } - rc = SQLTables(result->stmt, - cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), + rc = SQLTables(result->stmt, + cat, SAFE_SQL_NTS(cat), + schema, SAFE_SQL_NTS(schema), table, SAFE_SQL_NTS(table), type, SAFE_SQL_NTS(type)); @@ -3246,7 +3246,7 @@ PHP_FUNCTION(odbc_columns) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3260,14 +3260,14 @@ PHP_FUNCTION(odbc_columns) RETURN_FALSE; } - /* + /* * Needed to make MS Access happy */ if (table && table_len && schema && schema_len == 0) { schema = NULL; } - rc = SQLColumns(result->stmt, + rc = SQLColumns(result->stmt, cat, (SQLSMALLINT) cat_len, schema, (SQLSMALLINT) schema_len, table, (SQLSMALLINT) table_len, @@ -3307,7 +3307,7 @@ PHP_FUNCTION(odbc_columnprivileges) char *cat = NULL, *schema, *table, *column; size_t cat_len = 0, schema_len, table_len, column_len; RETCODE rc; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &table, &table_len, &column, &column_len) == FAILURE) { return; @@ -3318,7 +3318,7 @@ PHP_FUNCTION(odbc_columnprivileges) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3332,7 +3332,7 @@ PHP_FUNCTION(odbc_columnprivileges) RETURN_FALSE; } - rc = SQLColumnPrivileges(result->stmt, + rc = SQLColumnPrivileges(result->stmt, cat, SAFE_SQL_NTS(cat), schema, SAFE_SQL_NTS(schema), table, SAFE_SQL_NTS(table), @@ -3374,7 +3374,7 @@ PHP_FUNCTION(odbc_foreignkeys) size_t pcat_len = 0, pschema_len, ptable_len, fcat_len, fschema_len, ftable_len; RETCODE rc; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs!sssss", &pv_conn, &pcat, &pcat_len, &pschema, &pschema_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs!sssss", &pv_conn, &pcat, &pcat_len, &pschema, &pschema_len, &ptable, &ptable_len, &fcat, &fcat_len, &fschema, &fschema_len, &ftable, &ftable_len) == FAILURE) { return; } @@ -3396,7 +3396,7 @@ PHP_FUNCTION(odbc_foreignkeys) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3410,12 +3410,12 @@ PHP_FUNCTION(odbc_foreignkeys) RETURN_FALSE; } - rc = SQLForeignKeys(result->stmt, - pcat, SAFE_SQL_NTS(pcat), - pschema, SAFE_SQL_NTS(pschema), - ptable, SAFE_SQL_NTS(ptable), - fcat, SAFE_SQL_NTS(fcat), - fschema, SAFE_SQL_NTS(fschema), + rc = SQLForeignKeys(result->stmt, + pcat, SAFE_SQL_NTS(pcat), + pschema, SAFE_SQL_NTS(pschema), + ptable, SAFE_SQL_NTS(ptable), + fcat, SAFE_SQL_NTS(fcat), + fschema, SAFE_SQL_NTS(fschema), ftable, SAFE_SQL_NTS(ftable) ); if (rc == SQL_ERROR) { @@ -3456,7 +3456,7 @@ PHP_FUNCTION(odbc_gettypeinfo) if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pv_conn, &pv_data_type) == FAILURE) { return; } - + data_type = (SQLSMALLINT) pv_data_type; if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_conn), "ODBC-Link", le_conn, le_pconn))) { @@ -3464,7 +3464,7 @@ PHP_FUNCTION(odbc_gettypeinfo) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3523,7 +3523,7 @@ PHP_FUNCTION(odbc_primarykeys) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3537,9 +3537,9 @@ PHP_FUNCTION(odbc_primarykeys) RETURN_FALSE; } - rc = SQLPrimaryKeys(result->stmt, - cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), + rc = SQLPrimaryKeys(result->stmt, + cat, SAFE_SQL_NTS(cat), + schema, SAFE_SQL_NTS(schema), table, SAFE_SQL_NTS(table) ); if (rc == SQL_ERROR) { @@ -3576,12 +3576,12 @@ PHP_FUNCTION(odbc_procedurecolumns) char *cat = NULL, *schema = NULL, *proc = NULL, *col = NULL; size_t cat_len = 0, schema_len = 0, proc_len = 0, col_len = 0; RETCODE rc; - + if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 5) { WRONG_PARAM_COUNT; } - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &proc, &proc_len, &col, &col_len) == FAILURE) { return; } @@ -3591,7 +3591,7 @@ PHP_FUNCTION(odbc_procedurecolumns) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3605,10 +3605,10 @@ PHP_FUNCTION(odbc_procedurecolumns) RETURN_FALSE; } - rc = SQLProcedureColumns(result->stmt, - cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), - proc, SAFE_SQL_NTS(proc), + rc = SQLProcedureColumns(result->stmt, + cat, SAFE_SQL_NTS(cat), + schema, SAFE_SQL_NTS(schema), + proc, SAFE_SQL_NTS(proc), col, SAFE_SQL_NTS(col) ); if (rc == SQL_ERROR) { @@ -3650,7 +3650,7 @@ PHP_FUNCTION(odbc_procedures) if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 4) { WRONG_PARAM_COUNT; } - + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!ss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &proc, &proc_len) == FAILURE) { return; } @@ -3660,7 +3660,7 @@ PHP_FUNCTION(odbc_procedures) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3674,9 +3674,9 @@ PHP_FUNCTION(odbc_procedures) RETURN_FALSE; } - rc = SQLProcedures(result->stmt, - cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), + rc = SQLProcedures(result->stmt, + cat, SAFE_SQL_NTS(cat), + schema, SAFE_SQL_NTS(schema), proc, SAFE_SQL_NTS(proc) ); if (rc == SQL_ERROR) { @@ -3720,7 +3720,7 @@ PHP_FUNCTION(odbc_specialcolumns) &name, &name_len, &vscope, &vnullable) == FAILURE) { return; } - + type = (SQLUSMALLINT) vtype; scope = (SQLUSMALLINT) vscope; nullable = (SQLUSMALLINT) vnullable; @@ -3730,7 +3730,7 @@ PHP_FUNCTION(odbc_specialcolumns) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3744,10 +3744,10 @@ PHP_FUNCTION(odbc_specialcolumns) RETURN_FALSE; } - rc = SQLSpecialColumns(result->stmt, + rc = SQLSpecialColumns(result->stmt, type, - cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), + cat, SAFE_SQL_NTS(cat), + schema, SAFE_SQL_NTS(schema), name, SAFE_SQL_NTS(name), scope, nullable); @@ -3792,7 +3792,7 @@ PHP_FUNCTION(odbc_statistics) &name, &name_len, &vunique, &vreserved) == FAILURE) { return; } - + unique = (SQLUSMALLINT) vunique; reserved = (SQLUSMALLINT) vreserved; @@ -3801,7 +3801,7 @@ PHP_FUNCTION(odbc_statistics) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3815,9 +3815,9 @@ PHP_FUNCTION(odbc_statistics) RETURN_FALSE; } - rc = SQLStatistics(result->stmt, + rc = SQLStatistics(result->stmt, cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), + schema, SAFE_SQL_NTS(schema), name, SAFE_SQL_NTS(name), unique, reserved); @@ -3866,7 +3866,7 @@ PHP_FUNCTION(odbc_tableprivileges) } result = (odbc_result *)ecalloc(1, sizeof(odbc_result)); - + rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt)); if (rc == SQL_INVALID_HANDLE) { efree(result); @@ -3880,9 +3880,9 @@ PHP_FUNCTION(odbc_tableprivileges) RETURN_FALSE; } - rc = SQLTablePrivileges(result->stmt, - cat, SAFE_SQL_NTS(cat), - schema, SAFE_SQL_NTS(schema), + rc = SQLTablePrivileges(result->stmt, + cat, SAFE_SQL_NTS(cat), + schema, SAFE_SQL_NTS(schema), table, SAFE_SQL_NTS(table)); if (rc == SQL_ERROR) { diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index 114ad255e6..68ff2b4edb 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -350,7 +350,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx } switch (Z_TYPE(op_array->literals[i])) { case IS_NULL: - /* Only checking MAY_MERGE for IS_NULL here + /* Only checking MAY_MERGE for IS_NULL here * is because only IS_NULL can be default value for class type hinting(RECV_INIT). */ if ((info[i].flags & LITERAL_MAY_MERGE)) { if (l_null < 0) { diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index 0708bf515d..c42b6d9856 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -158,7 +158,7 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa) shiftlist[i] = i - target; i++; } - + if (b->flags & ZEND_BB_UNREACHABLE_FREE) { /* Only keep the FREE for the loop var */ ZEND_ASSERT(op_array->opcodes[b->start].opcode == ZEND_FREE diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index 6a7765aa62..802587e8e9 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -80,7 +80,7 @@ typedef struct _sccp_ctx { zval bot; } sccp_ctx; -#define TOP ((zend_uchar)-1) +#define TOP ((zend_uchar)-1) #define BOT ((zend_uchar)-2) #define IS_TOP(zv) (Z_TYPE_P(zv) == TOP) #define IS_BOT(zv) (Z_TYPE_P(zv) == BOT) diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index f3251f7e14..d7af757bff 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2292,15 +2292,15 @@ static int zend_update_type_info(const zend_op_array *op_array, tmp = 0; if (ssa_ops[i].result_def >= 0) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def); - } - if (ssa_ops[i].op1_def >= 0) { + } + if (ssa_ops[i].op1_def >= 0) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); - } - if (ssa_ops[i].op2_def >= 0) { + } + if (ssa_ops[i].op2_def >= 0) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def); - } + } return 1; - } + } switch (opline->opcode) { case ZEND_ADD: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 4ab3983940..46a86a3109 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -521,7 +521,7 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int Z_FUNC(p->val)->common.function_name = new_interned_string(Z_FUNC(p->val)->common.function_name); } if (Z_FUNC(p->val)->common.arg_info && - (Z_FUNC(p->val)->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { + (Z_FUNC(p->val)->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { uint32_t i; uint32_t num_args = Z_FUNC(p->val)->common.num_args + 1; zend_arg_info *arg_info = Z_FUNC(p->val)->common.arg_info - 1; @@ -2066,7 +2066,7 @@ static zend_string* persistent_zend_resolve_path(const char *filename, int filen zend_string *resolved_path; int key_length; char *key = NULL; - + if (!ZCG(accel_directives).revalidate_path) { /* lookup by "not-real" path */ key = accel_make_persistent_key(filename, filename_len, &key_length); diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 7b500f023d..1e49c0d958 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -348,12 +348,12 @@ AC_MSG_CHECKING("whether flock struct is linux ordered") AC_TRY_RUN([ #include <fcntl.h> struct flock lock = { 1, 2, 3, 4, 5 }; - int main() { + int main() { if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { return 0; } return 1; - } + } ], [ flock_type=linux AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) @@ -364,15 +364,15 @@ AC_MSG_CHECKING("whether flock struct is BSD ordered") AC_TRY_RUN([ #include <fcntl.h> struct flock lock = { 1, 2, 3, 4, 5 }; - int main() { + int main() { if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { return 0; } return 1; - } + } ], [ flock_type=bsd - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) + AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) AC_MSG_RESULT("yes") ], AC_MSG_RESULT("no") ) diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32 index f32834e878..cd3391a46d 100644 --- a/ext/opcache/config.w32 +++ b/ext/opcache/config.w32 @@ -25,7 +25,7 @@ if (PHP_OPCACHE != "no") { ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c pass1_5.c pass2.c pass3.c optimize_func_calls.c block_pass.c optimize_temp_vars_5.c nop_removal.c compact_literals.c zend_cfg.c zend_dfg.c dfa_pass.c zend_ssa.c zend_inference.c zend_func_info.c zend_call_graph.c sccp.c scdf.c dce.c compact_vars.c zend_dump.c", "opcache", "OptimizerObj"); - + ADD_FLAG('CFLAGS_OPCACHE', "/I " + configure_module_dirname); } diff --git a/ext/openssl/README b/ext/openssl/README index 20a38332fb..18eb764cfc 100644 --- a/ext/openssl/README +++ b/ext/openssl/README @@ -274,7 +274,7 @@ Seal and open // now we try to decrypt data for one of the recipients $fp = fopen("/src/openssl-0.9.6/demos/sign/key.pem", "r"); - // Get PEM coded key into $pkey + // Get PEM coded key into $pkey $pkey = fread($fp, 8192); fclose($fp); // $key will be resource id for unpacked $pkey diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4 index a7bbf05f62..19ee27afd5 100644 --- a/ext/openssl/config0.m4 +++ b/ext/openssl/config0.m4 @@ -21,7 +21,7 @@ if test "$PHP_OPENSSL" != "no"; then AC_CHECK_FUNCS([RAND_egd]) - PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, + PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, [ AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ]) ], [ diff --git a/ext/openssl/tests/ServerClientTestCase.inc b/ext/openssl/tests/ServerClientTestCase.inc index fe46300389..f0e40fa535 100644 --- a/ext/openssl/tests/ServerClientTestCase.inc +++ b/ext/openssl/tests/ServerClientTestCase.inc @@ -96,7 +96,7 @@ class ServerClientTestCase eval($this->stripPhpTagsFromCode($proc1Code)); $this->cleanupWorkerProcess(); } - + public function wait() { fgets($this->isWorker ? STDIN : $this->workerStdOut); diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index d66a1dc088..a5a4c4dbfb 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1864,7 +1864,7 @@ static int php_openssl_enable_crypto(php_stream *stream, do { struct timeval cur_time, elapsed_time; - + if (sslsock->is_client) { n = SSL_connect(sslsock->ssl_handle); } else { @@ -1874,7 +1874,7 @@ static int php_openssl_enable_crypto(php_stream *stream, if (has_timeout) { gettimeofday(&cur_time, NULL); elapsed_time = php_openssl_subtract_timeval(cur_time, start_time); - + if (php_openssl_compare_timeval( elapsed_time, *timeout) > 0) { php_error_docref(NULL, E_WARNING, "SSL: Handshake timed out"); return -1; @@ -2070,7 +2070,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz if (errno == EAGAIN && err == SSL_ERROR_WANT_WRITE && read == 0) { retry = 1; } - + /* Also, on reads, we may get this condition on an EOF. We should check properly. */ if (read) { stream->eof = (retry == 0 && errno != EAGAIN && !SSL_pending(sslsock->ssl_handle)); @@ -2114,7 +2114,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz } } - /* Finally, we keep going until we got data, and an SSL_ERROR_NONE, unless we had an error. */ + /* Finally, we keep going until we got data, and an SSL_ERROR_NONE, unless we had an error. */ } while (retry); /* Tell PHP if we read / wrote bytes. */ @@ -2263,7 +2263,7 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_ int clisock; zend_bool nodelay = 0; zval *tmpzval = NULL; - + xparam->outputs.client = NULL; if ((tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL && diff --git a/ext/pcntl/README b/ext/pcntl/README index 7b80924e49..34313b2040 100644 --- a/ext/pcntl/README +++ b/ext/pcntl/README @@ -1,8 +1,8 @@ Process Control Module for PHP (pcntl) This module will attempt to implement all features related to process spawning and -control (fork(), waitpid(), signal(), WIF's, etc). This is extremely experimental, -with hope to become stable on most UNIX's. I greatly apreciate any feedback, fixes, +control (fork(), waitpid(), signal(), WIF's, etc). This is extremely experimental, +with hope to become stable on most UNIX's. I greatly apreciate any feedback, fixes, and or suggestions on how to improve/better implement this functionality. diff --git a/ext/pcntl/package.xml b/ext/pcntl/package.xml index b9127395c2..e6498bffc9 100644 --- a/ext/pcntl/package.xml +++ b/ext/pcntl/package.xml @@ -12,13 +12,13 @@ </maintainer> </maintainers> <description> -This module contains an interface to those functions defined -in the IEEE 1003.1 (POSIX.1) standards document which are not -accessible through other means. POSIX.1 for example defined the -open(), read(), write() and close() functions, too, which -traditionally have been part of PHP for a long time. Some more -system specific functions have not been available before, though, -and this module tries to remedy this by providing easy access +This module contains an interface to those functions defined +in the IEEE 1003.1 (POSIX.1) standards document which are not +accessible through other means. POSIX.1 for example defined the +open(), read(), write() and close() functions, too, which +traditionally have been part of PHP for a long time. Some more +system specific functions have not been available before, though, +and this module tries to remedy this by providing easy access to these functions. </description> <license>PHP</license> diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 3d6cb0775f..228111d351 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -187,7 +187,7 @@ const zend_function_entry pcntl_functions[] = { PHP_FE(pcntl_alarm, arginfo_pcntl_alarm) PHP_FE(pcntl_get_last_error, arginfo_pcntl_void) PHP_FALIAS(pcntl_errno, pcntl_get_last_error, NULL) - PHP_FE(pcntl_strerror, arginfo_pcntl_strerror) + PHP_FE(pcntl_strerror, arginfo_pcntl_strerror) #ifdef HAVE_GETPRIORITY PHP_FE(pcntl_getpriority, arginfo_pcntl_getpriority) #endif @@ -764,7 +764,7 @@ PHP_FUNCTION(pcntl_wait) #undef PHP_RUSAGE_COMMON #undef PHP_RUSAGE_TO_ARRAY -/* {{{ proto bool pcntl_wifexited(int status) +/* {{{ proto bool pcntl_wifexited(int status) Returns true if the child status code represents a successful exit */ PHP_FUNCTION(pcntl_wifexited) { diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 80c8a58721..95298a90b2 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -26,7 +26,7 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done - + if test -z "$PCRE_LIBDIR" ; then AC_MSG_ERROR([Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX]) fi @@ -53,7 +53,7 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality -L$PCRE_LIBDIR ]) PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR) - + AC_DEFINE(HAVE_PCRE, 1, [ ]) PHP_ADD_INCLUDE($PCRE_INCDIR) PHP_NEW_EXTENSION(pcre, php_pcre.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) diff --git a/ext/pcre/tests/skip_001.inc b/ext/pcre/tests/skip_001.inc index 410512d4e7..b989dbbb9a 100644 --- a/ext/pcre/tests/skip_001.inc +++ b/ext/pcre/tests/skip_001.inc @@ -1,4 +1,4 @@ -<?php +<?php if (!function_exists('setlocale')) { die('skip: setlocale() not available'); diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index 8cbf21733d..105c7da4d2 100755 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -42,7 +42,7 @@ if test "$PHP_PDO" != "no"; then [ PHP_ADD_EXTENSION_DEP(pdo, spl, true) ]) - + ifdef([PHP_INSTALL_HEADERS], [ dnl Sadly, this is a complete NOP for pecl extensions diff --git a/ext/pdo/package2.xml b/ext/pdo/package2.xml index add5a47fc3..9577767d65 100644 --- a/ext/pdo/package2.xml +++ b/ext/pdo/package2.xml @@ -97,7 +97,7 @@ http://pecl4win.php.net You should uninstall and re-install your individual database drivers whenever you upgrade the base PDO package, otherwise you will see an error about PDO API numbers when you run your PHP scripts. - + </notes> <contents> <dir name="/"> diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index 407c3fe4de..6f21fa71f3 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -40,7 +40,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then else AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory) fi - fi + fi if test "x$PHP_LIBDIR" = "x" ; then PHP_LIBDIR=lib diff --git a/ext/pdo_dblib/package2.xml b/ext/pdo_dblib/package2.xml index 8b726666db..3b9328d255 100644 --- a/ext/pdo_dblib/package2.xml +++ b/ext/pdo_dblib/package2.xml @@ -34,14 +34,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> - Packaging update; no functional changes in this release - Fix Bug #34777; segfault when retrieving non-existent error info - Fix Bug #35032; didn't find FreeTDS includes on some systems - + Windows binaries can be found at: http://pecl4win.php.net/ext.php/php_pdo_mssql.dll, however: you are *strongly* recommended to use PDO_ODBC instead of this driver on Windows platforms. - + </notes> <contents> <dir name="/"> diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index e6362cd7a0..0f7f3c7be8 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -55,7 +55,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_INCLUDE($FIREBIRD_INCDIR) fi - + PHP_CHECK_PDO_INCLUDES AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ]) diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32 index dc3ea0d17e..634ac4c8e9 100644 --- a/ext/pdo_firebird/config.w32 +++ b/ext/pdo_firebird/config.w32 @@ -6,7 +6,7 @@ if (PHP_PDO_FIREBIRD != "no") { if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD) || CHECK_LIB("gds32_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD) - ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", + ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD) ) { diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 46dc10760a..1c0f5b6071 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -224,7 +224,7 @@ static int firebird_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */ switch (var->sqltype & ~1) { case SQL_SHORT: case SQL_LONG: -#if SIZEOF_ZEND_LONG >= 8 +#if SIZEOF_ZEND_LONG >= 8 case SQL_INT64: #endif col->param_type = PDO_PARAM_INT; @@ -399,7 +399,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{ *(zend_long *)*ptr = *(ISC_LONG*)var->sqldata; break; case SQL_INT64: -#if SIZEOF_ZEND_LONG >= 8 +#if SIZEOF_ZEND_LONG >= 8 *len = sizeof(zend_long); *ptr = FETCH_BUF(S->fetch_buf[colno], zend_long, 1, NULL); *(zend_long *)*ptr = *(ISC_INT64*)var->sqldata; diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h b/ext/pdo_firebird/php_pdo_firebird_int.h index d0a48315d4..404b300ecc 100644 --- a/ext/pdo_firebird/php_pdo_firebird_int.h +++ b/ext/pdo_firebird/php_pdo_firebird_int.h @@ -62,7 +62,7 @@ typedef void (*info_func_t)(char*); #endif #if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(_WIN64) -# define PDO_FIREBIRD_HANDLE_INITIALIZER 0U +# define PDO_FIREBIRD_HANDLE_INITIALIZER 0U #else # define PDO_FIREBIRD_HANDLE_INITIALIZER NULL #endif diff --git a/ext/pdo_firebird/tests/skipif.inc b/ext/pdo_firebird/tests/skipif.inc index 5a6cd372d1..14b2ad4016 100644 --- a/ext/pdo_firebird/tests/skipif.inc +++ b/ext/pdo_firebird/tests/skipif.inc @@ -1,5 +1,5 @@ <?php /* $Id$ */ -if (!extension_loaded("interbase") || !extension_loaded("pdo_firebird")) print "skip"; +if (!extension_loaded("interbase") || !extension_loaded("pdo_firebird")) print "skip"; ?> diff --git a/ext/pdo_firebird/tests/testdb.inc b/ext/pdo_firebird/tests/testdb.inc index cbf2023094..e19ff9cb75 100644 --- a/ext/pdo_firebird/tests/testdb.inc +++ b/ext/pdo_firebird/tests/testdb.inc @@ -25,7 +25,7 @@ function init_db() function cleanup_db() { global $test_base; - + $r = ibase_connect($test_base); ibase_drop_db($r); } diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index f787cdf7fd..4991df04e9 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -53,7 +53,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then fi fi fi - + if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then dnl enables build of mysqnd library PHP_MYSQLND_ENABLED=yes @@ -113,8 +113,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [], [ AC_MSG_ERROR([PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information.]) ], [ - -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR - ]) + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR + ]) PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD) @@ -122,7 +122,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.]) ], [ -L$PDO_MYSQL_LIB_DIR - ]) + ]) PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz" fi diff --git a/ext/pdo_mysql/get_error_codes.php b/ext/pdo_mysql/get_error_codes.php index a1ed85016c..4605df564a 100644 --- a/ext/pdo_mysql/get_error_codes.php +++ b/ext/pdo_mysql/get_error_codes.php @@ -15,7 +15,7 @@ fputs(STDERR, "input doesn't look like a MySQL sql_state.h file\n"); exit(3); } - + echo "/* DO NOT EDIT THIS FILE!!! It is auto generated by get_error_codes.php */\n"; foreach ($codes as $code => $state) { echo "#ifdef $code\n"; @@ -23,5 +23,5 @@ echo "#endif\n"; } - + ?> diff --git a/ext/pdo_mysql/package2.xml b/ext/pdo_mysql/package2.xml index cee6cc7dea..0fde30b77f 100644 --- a/ext/pdo_mysql/package2.xml +++ b/ext/pdo_mysql/package2.xml @@ -58,7 +58,7 @@ will cause subsequent prepares to use emulation. - Fixed PECL Bug #5645; added mysql client library version information to phpinfo() output. Windows binaries can be found at http://pecl4win.php.net/ext.php/php_pdo_mysql.dll - + </notes> <contents> <dir name="/"> diff --git a/ext/pdo_mysql/tests/mysql_pdo_test.inc b/ext/pdo_mysql/tests/mysql_pdo_test.inc index 4e953ed7e1..d6d06be72f 100644 --- a/ext/pdo_mysql/tests/mysql_pdo_test.inc +++ b/ext/pdo_mysql/tests/mysql_pdo_test.inc @@ -141,7 +141,7 @@ class MySQLPDOTest extends PDOTest { } - static function detect_transactional_mysql_engine($db) { + static function detect_transactional_mysql_engine($db) { foreach ($db->query("show variables like 'have%'") as $row) { if (!empty($row) && $row[1] == 'YES' && ($row[0] == 'have_innodb' || $row[0] == 'have_bdb')) { return str_replace("have_", "", $row[0]); diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 212a1bb51e..12a9e897e0 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -57,7 +57,7 @@ AC_DEFUN([AC_PDO_OCI_CHECK_LIB_DIR],[ PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO, [ --with-pdo-oci[=DIR] PDO: Oracle OCI support. DIR defaults to [$]ORACLE_HOME. - Use --with-pdo-oci=instantclient,/path/to/instant/client/lib + Use --with-pdo-oci=instantclient,/path/to/instant/client/lib for an Oracle Instant Client installation.]) if test "$PHP_PDO_OCI" != "no"; then @@ -97,11 +97,11 @@ if test "$PHP_PDO_OCI" != "no"; then dnl Header directory for manual installation OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'` - + dnl Header directory for Instant Client SDK zip file install OCISDKZIPINC=$PDO_OCI_LIB_DIR/sdk/include - + if test -f "$OCISDKRPMINC/oci.h" ; then PHP_ADD_INCLUDE($OCISDKRPMINC) AC_MSG_RESULT($OCISDKRPMINC) @@ -170,7 +170,7 @@ if test "$PHP_PDO_OCI" != "no"; then ]) dnl - dnl Check if we need to add -locijdbc8 + dnl Check if we need to add -locijdbc8 dnl PHP_CHECK_LIBRARY(clntsh, OCILobIsTemporary, [ diff --git a/ext/pdo_oci/config.w32 b/ext/pdo_oci/config.w32 index 0edf885c01..2b63d19ecf 100755 --- a/ext/pdo_oci/config.w32 +++ b/ext/pdo_oci/config.w32 @@ -21,7 +21,7 @@ if (PHP_PDO_OCI != "no") { pdo_oci_lib_paths += pdo_oci_dirs[i] + "\\lib\\msvc;"; pdo_oci_inc_paths += pdo_oci_dirs[i] + "\\include;"; } - + pdo_oci_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;" pdo_oci_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;"; diff --git a/ext/pdo_oci/package2.xml b/ext/pdo_oci/package2.xml index 1f828d1f12..3fc931140c 100644 --- a/ext/pdo_oci/package2.xml +++ b/ext/pdo_oci/package2.xml @@ -35,7 +35,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> You require Oracle OCI 8 or higher client libraries (instantclient is also supported) installed on the machine where you intend to build and/or use this package. - + If you are running on windows, you can download the binary from here: http://pecl4win.php.net/ext.php/php_pdo_oci.dll </notes> diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index 2301e87b8d..a0b967b09e 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -6,13 +6,13 @@ define([PDO_ODBC_HELP_TEXT],[[ include and lib dirs are looked for under 'dir'. 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic - If ',dir' part is omitted, default for the flavour + If ',dir' part is omitted, default for the flavour you have selected will be used. e.g.: --with-pdo-odbc=unixODBC - will check for unixODBC under /usr/local. You may attempt - to use an otherwise unsupported driver using the \"generic\" + will check for unixODBC under /usr/local. You may attempt + to use an otherwise unsupported driver using the \"generic\" flavour. The syntax for generic ODBC support is: --with-pdo-odbc=generic,dir,libname,ldflags,cflags @@ -34,7 +34,7 @@ AC_DEFUN([PDO_ODBC_CHECK_HEADER],[ AC_MSG_RESULT(no) fi ]) - + if test "$PHP_PDO_ODBC" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then @@ -111,7 +111,7 @@ if test "$PHP_PDO_ODBC" != "no"; then PDO_ODBC_INCDIR="$pdo_odbc_def_incdir" PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir" fi - + AC_MSG_RESULT([$pdo_odbc_flavour libs $PDO_ODBC_LIBDIR, headers $PDO_ODBC_INCDIR]) diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index ddbecf25b7..e83abf5c13 100644 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -578,7 +578,7 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno) may affect others as well. If we are SQL_VARCHAR, SQL_VARBINARY, or SQL_WVARCHAR (or any of the long variations) and zero is returned from colsize then consider it long */ - if (0 == colsize && + if (0 == colsize && (S->cols[colno].coltype == SQL_VARCHAR || S->cols[colno].coltype == SQL_LONGVARCHAR || #ifdef SQL_WVARCHAR diff --git a/ext/pdo_odbc/package2.xml b/ext/pdo_odbc/package2.xml index 3eb99d1416..1071571155 100644 --- a/ext/pdo_odbc/package2.xml +++ b/ext/pdo_odbc/package2.xml @@ -34,7 +34,7 @@ You require either IBM DB2 CLI libraries or unixODBC to use this package. If you are running on windows, you can download the binary from here: http://pecl4win.php.net/ext.php/php_pdo_odbc.dll - + </notes> <contents> <dir name="/"> diff --git a/ext/pdo_pgsql/package2.xml b/ext/pdo_pgsql/package2.xml index e397958a7d..fbe9a11df4 100644 --- a/ext/pdo_pgsql/package2.xml +++ b/ext/pdo_pgsql/package2.xml @@ -45,7 +45,7 @@ This PECL release corresponds to PHP 5.1.3. - Fixed bug #36176 (PDO_PGSQL - PDO::exec() does not return number of rows affected by the operation). (Ilia) - Fixed prepared statement name conflict handling in PDO_PGSQL. (Thies, Ilia) -- repackage with package2.xml +- repackage with package2.xml - Added PDO::pgsqlLOBCreate(), PDO::pgsqlLOBOpen() and PDO::pgsqlLOBUnlink(). You require PostgreSQL client libraries installed on the machine where you diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index 71ea9efce5..403c86936c 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -5,7 +5,7 @@ ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); if (PHP_PDO_SQLITE != "no") { EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + configure_module_dirname); - + ADD_EXTENSION_DEP('pdo_sqlite', 'pdo'); // If pdo_sqlite is static, and sqlite3 is also static, then we don't add a second copy of the sqlite3 libs if (PHP_PDO_SQLITE_SHARED || PHP_SQLITE3_SHARED || PHP_SQLITE3 == 'no') { diff --git a/ext/pgsql/README b/ext/pgsql/README index 86df804fbd..26f7aad02d 100644 --- a/ext/pgsql/README +++ b/ext/pgsql/README @@ -1,27 +1,27 @@ ==== About This Module === -PostgreSQL module provides access to PostgreSQL server from +PostgreSQL module provides access to PostgreSQL server from PHP script. This module uses PostgreSQL C client lib called libpq. -It is important that you use libpq that is later than backend -(PostgreSQL Server) version. Otherwise, you may experience -strange problems. +It is important that you use libpq that is later than backend +(PostgreSQL Server) version. Otherwise, you may experience +strange problems. -Please send e-mail to yohgaki@php.net if you have comments for +Please send e-mail to yohgaki@php.net if you have comments for pgsql module. I appreciate your feedback. ==== API Change === -Older PHP than 4.2.0, pg_loimport()/pg_loexport() connection +Older PHP than 4.2.0, pg_loimport()/pg_loexport() connection parameter as last parameter, not like other functions. From 4.2.0, -connection parameter became 1st parameter. Old syntax is preserved, +connection parameter became 1st parameter. Old syntax is preserved, but it will raise NOTICE error message. pg_connect()/pg_pconnect() has obsolete multi parameter syntax. This syntax will be deleted in 4.3.0 or later. -Omitting connectin parameter is NOT recommended. Connection +Omitting connectin parameter is NOT recommended. Connection parameter may be required for future PHP version. Specify connection always if you don't want to rewrite code when it is changed. -==== Function Name Change ==== +==== Function Name Change ==== Function names are going to be changed to confirm coding standard. MySQL module has been done this already. Function names will be changed as follows. @@ -29,8 +29,8 @@ be changed as follows. pg_errormessage -> pg_error_message pg_cmdtuples -> pg_affected_rows pg_fieldnum -> pg_field_num -and so on. Except pg_cmdtuples, under scores '_' will be added to -names. +and so on. Except pg_cmdtuples, under scores '_' will be added to +names. Older names will become aliases of new functions for backward compatibility. @@ -39,14 +39,14 @@ Manual will be updated when this change is committed to CVS source. ==== Configure Option Notes ==== You cannot specify PostgreSQL source directly to build PostgreSQL -module with specific version. You need to install PostgreSQL +module with specific version. You need to install PostgreSQL somewhere in your system to build PHP with PostgreSQL support. ==== Note For PostgreSQL 7.2 ==== I've tested up to 7.2.2. ==== TODO List === -Make pg_convert() smater. +Make pg_convert() smater. - Better regex - User defiend type support Support async connection. @@ -57,7 +57,7 @@ WARNING: API/behavior may be changed without notice. Async query can improve application performance *significantly*. Please test and report any failure to -yohgaki@php.net +yohgaki@php.net There are some cases that async functions blocks process. Even if process was blocked, functions work as expected. (except it blocks @@ -65,13 +65,13 @@ process) These are cases that process is blocked. Refer to libpq manual for details. Followings are common cases that async functions are blocked. - - If libpq is compile with USE_SSL, some async functions are + - If libpq is compile with USE_SSL, some async functions are blocked. - - If libpq under Win32 is *NOT* compiled with - WIN32_NON_BLOCKING_CONNECTIONS, non-blocking connection will block. + - If libpq under Win32 is *NOT* compiled with + WIN32_NON_BLOCKING_CONNECTIONS, non-blocking connection will block. -Async function may also block if you have not retrive result and -send or execute query. If there is result left on connection, +Async function may also block if you have not retrive result and +send or execute query. If there is result left on connection, pg_send_query() will block until last query is completed. Garbages are cleaned when resource is cleaned up. There is no need to @@ -84,7 +84,7 @@ API may be changed. NOTE: These functions are added in PHP 4.2.0 unless they are mentioned. ------------------------------------------------------------------- -bool pg_send_query(resource connection, string query) +bool pg_send_query(resource connection, string query) Sends async query to backend. Result may be retrieved with pg_get_result(). It does not accept multiple query, but it accepts @@ -92,7 +92,7 @@ multiple queries at once. Each result may be retrieved separately by pg_get_result(). -------------------------------------------------------------------- -bool pg_cancel_query(resource connection) +bool pg_cancel_query(resource connection) Cancels currently executing async query already sent to PostgreSQL server. This function is useful when user request time consuming query @@ -100,7 +100,7 @@ to server. It cannot cancel query executed by pg_exec(), since pg_exec() is a blocking function. -------------------------------------------------------------------- -resource pg_get_result(resource conn) +resource pg_get_result(resource conn) Gets pgsql query result resource. Returned value can be fed to pg_result()/pg_fetch_*(). pg_get_result() may block if result is not @@ -112,7 +112,7 @@ in connection, it returns false. -------------------------------------------------------------------- bool pg_connection_busy(resource connection) -Returns connections is executing query or not. +Returns connections is executing query or not. -------------------------------------------------------------------- int pg_connection_status(resource connection) @@ -129,7 +129,7 @@ connection parameter. It's useful for error recovery. -------------------------------------------------------------------- string pg_result_error(resource result) -Get error message associated with result +Get error message associated with result -------------------------------------------------------------------- int pg_result_status(resource result) @@ -166,7 +166,7 @@ Large Object Functions -------------------------------------------------------------------- int pg_lo_tell(resource large_object) -Returns current position of large object +Returns current position of large object -------------------------------------------------------------------- bool pg_lo_lseek(resource large_object, int offset[, int whence]) @@ -179,7 +179,7 @@ Notice message function -------------------------------------------------------------------- string pg_last_notice(resource connection) -Returns the last notice set by the backend +Returns the last notice set by the backend This function is fully implemed in only in current CVS version. PHP 4.3.0 supposed to included fully implemented version. @@ -201,35 +201,35 @@ array pg_convert(resource db, string table, array values) -------------------------------------------------------------------- bool pg_insert(resource db, string table, array values[, bool convert[, bool async]]) - Insert values (filed=>value) to table + Insert values (filed=>value) to table -------------------------------------------------------------------- bool pg_update(resource db, string table, array fields, array ids[, bool convert[, bool async]]) - Update table using values (field=>value) and ids (id=>value) + Update table using values (field=>value) and ids (id=>value) -------------------------------------------------------------------- bool pg_delete(resource db, string table, array ids[, bool convert[, bool async]]) - Delete records has ids (id=>value) + Delete records has ids (id=>value) -------------------------------------------------------------------- array pg_select(resource db, string table, array ids[, bool convert]) - Select records that has ids (id=>value) + Select records that has ids (id=>value) -------------------------------------------------------------------- array pg_get_notify([resource db[, notify]]) - Get notify message on the connection + Get notify message on the connection -------------------------------------------------------------------- string pg_unescape_bytea(string bytea_data) - Unescape bytea field data + Unescape bytea field data -------------------------------------------------------------------- bool pg_ping(resource db) ping database connection and try to reset connection if it's - broken + broken ------------------------------------------------------------------- -Again, experimental functions are subject to be changed without +Again, experimental functions are subject to be changed without notice. diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 0ec34c4c25..8201e88dba 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -31,7 +31,7 @@ if test "$PHP_PGSQL" != "no"; then else PGSQL_SEARCH_PATHS=$PHP_PGSQL fi - + for i in $PGSQL_SEARCH_PATHS; do for j in include include/pgsql include/postgres include/postgresql ""; do if test -r "$i/$j/libpq-fe.h"; then @@ -44,7 +44,7 @@ if test "$PHP_PGSQL" != "no"; then done for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do - if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi done diff --git a/ext/pgsql/mysql_users.php b/ext/pgsql/mysql_users.php index edfaa1cddc..44d4f1b66d 100644 --- a/ext/pgsql/mysql_users.php +++ b/ext/pgsql/mysql_users.php @@ -2,7 +2,7 @@ /* * File: mysql_users.php * Author: Yasuo Ohgaki <yohgaki@php.net> - * + * * This file contains example user defined functions that does * similar to MySQL functions. They can be implemented as module * functions, but there won't be many users need them. @@ -12,11 +12,11 @@ /* * mysql_list_dbs() - * - * This function should be needed, since PostgreSQL connection + * + * This function should be needed, since PostgreSQL connection * binds database. */ -function pg_list_dbs($db) +function pg_list_dbs($db) { assert(is_resource($db)); $query = ' @@ -24,7 +24,7 @@ SELECT d.datname as "Name", u.usename as "Owner", pg_encoding_to_char(d.encoding) as "Encoding" -FROM +FROM pg_database d LEFT JOIN pg_user u ON d.datdba = u.usesysid ORDER BY 1; '; @@ -35,7 +35,7 @@ ORDER BY 1; /* * mysql_list_tables() */ -function pg_list_tables($db) +function pg_list_tables($db) { assert(is_resource($db)); $query = " @@ -58,7 +58,7 @@ ORDER BY 1; * * See also pg_meta_data(). It returns field definition as array. */ -function pg_list_fields($db, $table) +function pg_list_fields($db, $table) { assert(is_resource($db)); $query = " diff --git a/ext/pgsql/tests/README b/ext/pgsql/tests/README index 1a29a34e64..5321d1f48d 100644 --- a/ext/pgsql/tests/README +++ b/ext/pgsql/tests/README @@ -1,15 +1,15 @@ -Test scripts assumes: +Test scripts assumes: - PostgreSQL server is installed locally - there is a PostgreSQL account for the users running the test scripts - there is database named "test" -For instance, if your login name is 'testuser', you should have PostgreSQL -user account named 'testuser' and grant that user access to the database +For instance, if your login name is 'testuser', you should have PostgreSQL +user account named 'testuser' and grant that user access to the database 'test'. -If you have account and database, type "createdb test" from command prompt -to create the database to execute the test scripts. By executing the above -command as the same user running the tests you ensure that the user is +If you have account and database, type "createdb test" from command prompt +to create the database to execute the test scripts. By executing the above +command as the same user running the tests you ensure that the user is granted access to the database. If you find problems in PostgreSQL module, please mail to diff --git a/ext/phar/LICENSE b/ext/phar/LICENSE index a683822b74..3ecdfdab80 100644 --- a/ext/phar/LICENSE +++ b/ext/phar/LICENSE @@ -1,7 +1,7 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2018 The PHP Group. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions @@ -9,22 +9,22 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group@php.net. - + 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group@php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" - + 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -41,27 +41,27 @@ are met: "This product includes PHP software, freely available from <http://www.php.net/software/>". -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------- +-------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group@php.net. -For more information on the PHP Group and the PHP project, +For more information on the PHP Group and the PHP project, please see <http://www.php.net>. PHP includes the Zend Engine, freely available at diff --git a/ext/phar/gdbhelp b/ext/phar/gdbhelp index 5411858671..14ff89c56b 100644 --- a/ext/phar/gdbhelp +++ b/ext/phar/gdbhelp @@ -21,9 +21,9 @@ define ____print_pharht set $temp = *(phar_archive_data*)$p->pDataPtr ____print_str $temp.fname $temp.fname_len printf " => " - + if $arg1 == 0 - + printf "%i (alias ", $temp.refcount ____print_str $temp.alias $temp.alias_len printf ")\n" diff --git a/ext/phar/package.xml b/ext/phar/package.xml index 4a9798e252..3f24e459a2 100644 --- a/ext/phar/package.xml +++ b/ext/phar/package.xml @@ -18,7 +18,7 @@ write access is disabled by the phar.readonly ini variable. Executable phar archives can be created using the streams API or with the Phar class, if the phar.readonly ini variable is set to false. -Full support for MD5 and SHA1 signatures is possible. Signatures can be required +Full support for MD5 and SHA1 signatures is possible. Signatures can be required if the ini variable phar.require_hash is set to true. When PECL extension hash is available then SHA-256 and SHA-512 signatures are supported as well. @@ -1389,7 +1389,7 @@ Major feature functionality release * add PharFileInfo::hasMetadata(), PharFileInfo::delMetadata() [Marcus] * add Phar::hasMetadata(), Phar::delMetadata() [Marcus] * fix Phar::CanWrite() [Marcus] -* add preliminary phar command (phar.php) [Marcus] +* add preliminary phar command (phar.php) [Marcus] * add phar command (phar.phar) [Marcus] * list all available compression methods using Phar::getSupportedCompression() [Marcus] * remove RINIT [Marcus] diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in index 26451508fc..36a8cc503e 100644 --- a/ext/phar/phar.1.in +++ b/ext/phar/phar.1.in @@ -11,7 +11,7 @@ file called a "phar" (PHP Archive) for easy distribution and installation. .P With the \fBphar\fP command you can create, update or extract PHP archives. .P -Commands: +Commands: add compress delete extract help help-list info list meta-del meta-get meta-set pack sign stub-get stub-set tree version @@ -39,7 +39,7 @@ Provide an \fIalias\fP name for the phar file. .TP .PD .B \-c \fIalgo\fP -Compression algorithm (see +Compression algorithm (see .SM .B COMPRESSION ) @@ -63,7 +63,7 @@ Required arguments: .TP 15 .PD .B \-c \fIalgo\fP -Compression algorithm (see +Compression algorithm (see .SM .B COMPRESSION ) @@ -280,14 +280,14 @@ The hash mark itself '#!' and the newline character are optional. .TP .PD .B \-c \fIalgo\fP -Compression algorithm (see +Compression algorithm (see .SM .B COMPRESSION ) .TP .PD .B \-h \fIhash\fP -Selects the \fIhash\fP algorithm (see +Selects the \fIhash\fP algorithm (see .SM .B HASH ) @@ -336,7 +336,7 @@ Specifies the phar \fIfile\fP to work on. .TP .PD .B \-h \fIhash\fP -Selects the \fIhash\fP algorithm (see +Selects the \fIhash\fP algorithm (see .SM .B HASH ) @@ -502,7 +502,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphar\fP, version @PHP_VERSION@. diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc index 7e7d61851e..c28de0aa7a 100644 --- a/ext/phar/phar/phar.inc +++ b/ext/phar/phar/phar.inc @@ -12,7 +12,7 @@ // {{{ class Phar extends PHP_Archive /** * Phar class - * + * * @ingroup Phar * @brief Phar implementation * @author Marcus Boerger diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index a58a9f060a..9decdaf972 100644 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc @@ -12,11 +12,11 @@ // {{{ class PharCommand extends CLICommand /** * PharCommand class - * + * * This class handles the handling of the phar * commands. It will be used from command line/console * in order to retrieve and execute phar functions. - * + * * @ingroup Phar * @brief Phar console command implementation * @author Marcus Boerger @@ -47,7 +47,7 @@ class PharCommand extends CLICommand // {{{ static function phar_args /** * Phar arguments - * + * * This function contains all the phar commands * * @param string $which Which argument is chosen. @@ -185,7 +185,7 @@ class PharCommand extends CLICommand // {{{ static function strEndsWith /** * String Ends With - * + * * Whether a string ends with another needle. * * @param string $haystack The haystack @@ -285,7 +285,7 @@ class PharCommand extends CLICommand // {{{ static function cli_arg_typ_pharfile /** * Argument type existing Phar file - * + * * Return filename of an existing Phar. * * @param string $arg The file in the phar to open. @@ -312,10 +312,10 @@ class PharCommand extends CLICommand // {{{ static function cli_arg_typ_pharurl /** * Argument type Phar url-like - * + * * Check the argument as cli_arg_Typ_phar and return its name prefixed * with phar:// - * + * * Ex: * <code> * $arg = 'pharchive.phar/file.php'; @@ -544,9 +544,9 @@ class PharCommand extends CLICommand // {{{ function cli_cmd_run_pack /** * Pack a new Phar - * + * * This function will try to pack a new Phar archive. - * + * * @see Exit to make sure that we are done. */ public function cli_cmd_run_pack() @@ -617,7 +617,7 @@ class PharCommand extends CLICommand * * This function will take a directory and iterate through * it and get the files to insert into the Phar archive. - * + * * @param Phar $phar The phar object. * @param string $input The input directory * @param string $regex The regex used in RegexIterator. @@ -712,7 +712,7 @@ class PharCommand extends CLICommand // {{{ public function phar_dir_operation /** * Directory operations - * + * * Phar directory operations. * * @param RecursiveIteratorIterator $dir The recursiveIteratorIterator object. @@ -801,9 +801,9 @@ class PharCommand extends CLICommand // {{{ public function cli_cmd_run_tree /** * Cli Command Run Tree - * + * * Set the phar_dir_operation with a directorygraphiterator. - * + * * @see DirectoryGraphIterator * @see $this->phar_dir_operation * @@ -834,7 +834,7 @@ class PharCommand extends CLICommand // {{{ static function cli_cmd_arg_extract /** * Cli Command Arguments Extract - * + * * The arguments for the extract function. * * @return array The arguments for the extraction. @@ -855,7 +855,7 @@ class PharCommand extends CLICommand // {{{ public function cli_cmd_run_extract /** * Run Extract - * + * * Run the extraction of a phar Archive. * * @see $this->phar_dir_operation @@ -889,7 +889,7 @@ class PharCommand extends CLICommand // {{{ public function phar_dir_extract /** * Extract to a directory - * + * * This function will extract the content of a Phar * to a directory and create new files and directories * depending on the permissions on that folder. @@ -1085,7 +1085,7 @@ class PharCommand extends CLICommand // {{{ public function cli_cmd_run_stub_get /** * Cli Command Run Stub - * + * * Get arguments and store them into a stub. * * @param arguments $args @@ -1102,7 +1102,7 @@ class PharCommand extends CLICommand // {{{ public function cli_cmd_inf_compress /** * Cli Command Inf Compress - * + * * Cli Command compress informations * * @return string A description of the command. diff --git a/ext/phar/shortarc.php b/ext/phar/shortarc.php index e5ac8bab6d..2c1f40dfe4 100644 --- a/ext/phar/shortarc.php +++ b/ext/phar/shortarc.php @@ -127,7 +127,7 @@ class Extract_Phar } while (strlen($last) && strlen($m) < $L[1]); if (strlen($m) < $L[1]) { - die('ERROR: manifest length read was "' . + die('ERROR: manifest length read was "' . strlen($m) .'" should be "' . $L[1] . '"'); } diff --git a/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc b/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc index b0eba6cc69..b5222f5805 100644 --- a/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc +++ b/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc @@ -32,7 +32,7 @@ class corrupt_tarmaker /** * save a file inside this package - * + * * This code is modified from Vincent Lascaux's File_Archive * package, which is licensed under the LGPL license. * @param string relative path within the package @@ -152,7 +152,7 @@ class corrupt_tarmaker /** * Create an internal directory, creating parent directories as needed - * + * * @param string $dir */ function mkdir($dir) 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 deeaa41761..52f5a23507 100644 --- a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc +++ b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc @@ -33,7 +33,7 @@ class danger_tarmaker /** * save a file inside this package - * + * * This code is modified from Vincent Lascaux's File_Archive * package, which is licensed under the LGPL license. * @param string relative path within the package @@ -145,7 +145,7 @@ class danger_tarmaker /** * Create an internal directory, creating parent directories as needed - * + * * @param string $dir */ function mkdir($dir) diff --git a/ext/phar/tests/tar/files/tarmaker.php.inc b/ext/phar/tests/tar/files/tarmaker.php.inc index 9b8d348fbb..0df7ee9933 100644 --- a/ext/phar/tests/tar/files/tarmaker.php.inc +++ b/ext/phar/tests/tar/files/tarmaker.php.inc @@ -32,7 +32,7 @@ class tarmaker /** * save a file inside this package - * + * * This code is modified from Vincent Lascaux's File_Archive * package, which is licensed under the LGPL license. * @param string relative path within the package @@ -144,7 +144,7 @@ class tarmaker /** * Create an internal directory, creating parent directories as needed - * + * * @param string $dir */ function mkdir($dir) diff --git a/ext/phar/tests/zip/files/zipmaker.php.inc b/ext/phar/tests/zip/files/zipmaker.php.inc index aceab0d26b..ad16fda659 100644 --- a/ext/phar/tests/zip/files/zipmaker.php.inc +++ b/ext/phar/tests/zip/files/zipmaker.php.inc @@ -51,7 +51,7 @@ class zipmaker /** * Create an internal directory, creating parent directories as needed - * + * * This is a no-op for the tar creator * @param string $dir */ diff --git a/ext/posix/package.xml b/ext/posix/package.xml index 231c5bee20..4cf4b9ce65 100644 --- a/ext/posix/package.xml +++ b/ext/posix/package.xml @@ -12,12 +12,12 @@ </maintainer> </maintainers> <description> -Process Control support in PHP implements the Unix style -of process creation, program execution, signal handling -and process termination. Process Control should not be -enabled within a webserver environment and unexpected -results may happen if any Process Control functions -are used within a webserver environment. +Process Control support in PHP implements the Unix style +of process creation, program execution, signal handling +and process termination. Process Control should not be +enabled within a webserver environment and unexpected +results may happen if any Process Control functions +are used within a webserver environment. </description> <license>PHP</license> <release> diff --git a/ext/pspell/README b/ext/pspell/README index 2e68a2cb9d..58806289db 100644 --- a/ext/pspell/README +++ b/ext/pspell/README @@ -43,9 +43,9 @@ pspell_new() and specifying the custom dictionary as the first parameter. The parameter probably should begin with '/' because otherwise it will be relative to $HOME, which is probably set to "/root". This is probably not what you want because you need write access for nobody to be able to write -to a dictionary. Once the dictionary is open, you can use -pspell_add_to_personal() to add words to the wordlist and finally -pspell_save_wordlist() to save it. +to a dictionary. Once the dictionary is open, you can use +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 diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index 0a00370fce..d63df8bef9 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -2,7 +2,7 @@ dnl dnl $Id$ dnl -PHP_ARG_WITH(libedit,for libedit readline replacement, +PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) if test "$PHP_LIBEDIT" = "no"; then @@ -93,11 +93,11 @@ elif test "$PHP_LIBEDIT" != "no"; then PHP_CHECK_LIBRARY(edit, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(edit library required by readline not found) ], [ - -L$READLINE_DIR/$PHP_LIBDIR + -L$READLINE_DIR/$PHP_LIBDIR ]) PHP_CHECK_LIBRARY(edit, rl_callback_read_char, diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 00ce0a8272..f1096fbe81 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1577,7 +1577,7 @@ ZEND_METHOD(reflection_function, __construct) if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "O", &closure, zend_ce_closure) == SUCCESS) { fptr = (zend_function*)zend_get_closure_method_def(closure); Z_ADDREF_P(closure); - } else { + } else { if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) { return; } @@ -2948,7 +2948,7 @@ ZEND_METHOD(reflection_type, __toString) return; } GET_REFLECTION_OBJECT_PTR(param); - + RETURN_STR(reflection_type_name(param)); } /* }}} */ @@ -2959,12 +2959,12 @@ ZEND_METHOD(reflection_named_type, getName) { reflection_object *intern; type_reference *param; - + if (zend_parse_parameters_none() == FAILURE) { return; } GET_REFLECTION_OBJECT_PTR(param); - + RETURN_STR(reflection_type_name(param)); } /* }}} */ @@ -6764,7 +6764,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */ INIT_CLASS_ENTRY(_reflection_entry, "ReflectionType", reflection_type_functions); _reflection_entry.create_object = reflection_objects_new; reflection_type_ptr = zend_register_internal_class(&_reflection_entry); - + INIT_CLASS_ENTRY(_reflection_entry, "ReflectionNamedType", reflection_named_type_functions); _reflection_entry.create_object = reflection_objects_new; reflection_named_type_ptr = zend_register_internal_class_ex(&_reflection_entry, reflection_type_ptr); diff --git a/ext/reflection/tests/exception.inc b/ext/reflection/tests/exception.inc index e403339965..da3fceaac7 100644 --- a/ext/reflection/tests/exception.inc +++ b/ext/reflection/tests/exception.inc @@ -4,11 +4,11 @@ class ReflectionExceptionEx extends ReflectionException { $this->errno = $_errno; $this->errmsg = $_errmsg; } - + function getErrno() { return $this->errno; } - + function getErrmsg() { return $this->errmsg; } diff --git a/ext/session/mod_files.bat b/ext/session/mod_files.bat index b6a8babae8..83f85eb66b 100644 --- a/ext/session/mod_files.bat +++ b/ext/session/mod_files.bat @@ -8,7 +8,7 @@ IF _%1_==_AUTO_ ( IF _%2_==__ ( ECHO Usage %0 ^<basedir^> ^<depth^> ^[^hash_bits^] ECHO. - ECHO Where ^<basedir^> is the session directory + ECHO Where ^<basedir^> is the session directory ECHO ^<depth^> is the number of levels defined in session.save_path ECHO ^[hash_bits^] is the number of bits defined in session.hash_bits_per_character EXIT /B 1 diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index d8da991c6d..b313d8bb65 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -29,7 +29,7 @@ * PS_READ_FUNC() - Read data from storage. * PS_GC_FUNC() - Perform GC. Called by probability * (session.gc_probability/session.gc_divisor). - * PS_WRITE_FUNC() or PS_UPDATE_TIMESTAMP() + * PS_WRITE_FUNC() or PS_UPDATE_TIMESTAMP() * - Write session data or update session data timestamp. * It depends on session data change. * PS_CLOSE_FUNC() - Clean up module data created by PS_OPEN_FUNC(). diff --git a/ext/session/package.xml b/ext/session/package.xml index 03fcbf66da..bfca714e1a 100644 --- a/ext/session/package.xml +++ b/ext/session/package.xml @@ -18,8 +18,8 @@ </maintainer> </maintainers> <description> -Session support in PHP consists of a way to preserve certain data -across subsequent accesses. This enables you to build more customized +Session support in PHP consists of a way to preserve certain data +across subsequent accesses. This enables you to build more customized applications and increase the appeal of your web site. </description> <license>PHP</license> diff --git a/ext/session/tests/save_handler.inc b/ext/session/tests/save_handler.inc index 4d5ac75d03..15ad29029f 100644 --- a/ext/session/tests/save_handler.inc +++ b/ext/session/tests/save_handler.inc @@ -110,7 +110,7 @@ function gc($maxlifetime) { $directory = opendir($session_save_path."/"); $length = strlen(SESSION_FILE_PREFIX); while (($file = readdir($directory)) !== FALSE) { - $qualified = ($session_save_path."/".$file); + $qualified = ($session_save_path."/".$file); if (is_file($qualified) === TRUE) { if (substr($file, 0, $length) === SESSION_FILE_PREFIX && (filemtime($qualified) + $maxlifetime <= time() )) { unlink($qualified); diff --git a/ext/shmop/README b/ext/shmop/README index c4970376b0..1bb95b220e 100644 --- a/ext/shmop/README +++ b/ext/shmop/README @@ -9,32 +9,32 @@ Shared Memory Operations Extension to PHP offers high level features which are extremely bothersome for basic SHM we had in mind. After spending a day trying to reverse engineer and figure out the format of sysvshm we decided that it would be much easier to - add our own extension to php for simple SHM operations, we were right :)). + add our own extension to php for simple SHM operations, we were right :)). the functions are: - + int shmop_open(int key, string flags, int mode, int size) - + key - the key of/for the shared memory block - flags - 4 flags are avalible + flags - 4 flags are avalible a for read only access (sets SHM_RDONLY) w for read & write access c create or open an existing segment (sets IPC_CREATE) n create a new segment and fail if one already exists under same name (sets IPC_CREATE|IPC_EXCL) - (the n flag is mostly useful for security perpouses, so that you don't end up opening a faked segment + (the n flag is mostly useful for security perpouses, so that you don't end up opening a faked segment if someone guesses your key) mode - acsess mode same as for a file (0644) for example size - size of the block in bytes - + returns an indentifier - + char shmop_read(int shmid, int start, int count) shmid - shmid from which to read start - offset from which to start reading count - how many bytes to read - + returns the data read int shmop_write(int shmid, string data, int offset) @@ -42,28 +42,28 @@ int shmop_write(int shmid, string data, int offset) shmid - shmid from which to read data - string to put into shared memory offset - offset in shm to write from - + returns bytes written - + int shmop_size(int shmid) shmid - shmid for which to return the size - + returns the size in bytes of the shm segment - - + + int shmop_delete(int shmid) marks the segment for deletion, the segment will be deleted when all processes mapping it will detach shmid - shmid which to mark for deletion - + returns 1 if all ok, zero on failure - + int shmop_close(int shmid) shmid - shmid which to close - + returns zero - + diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4 index 6c1709d715..4017982a54 100644 --- a/ext/shmop/config.m4 +++ b/ext/shmop/config.m4 @@ -1,5 +1,5 @@ dnl $Id$ -PHP_ARG_ENABLE(shmop, whether to enable shmop support, +PHP_ARG_ENABLE(shmop, whether to enable shmop support, [ --enable-shmop Enable shmop support]) if test "$PHP_SHMOP" != "no"; then diff --git a/ext/shmop/package.xml b/ext/shmop/package.xml index 669da64bcf..07c3edafcf 100644 --- a/ext/shmop/package.xml +++ b/ext/shmop/package.xml @@ -18,7 +18,7 @@ </maintainers> <description> Portable Shared Memory access - </description> + </description> <license>PHP</license> <release> <state>stable</state> diff --git a/ext/shmop/package2.xml b/ext/shmop/package2.xml index a8b00f371c..f5a20c86b8 100644 --- a/ext/shmop/package2.xml +++ b/ext/shmop/package2.xml @@ -26,7 +26,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> </stability> <license uri="http://www.php.net/license">PHP</license> <notes>package.xml added to support installation using pear installer - + </notes> <contents> <dir name="/"> diff --git a/ext/simplexml/README b/ext/simplexml/README index bb9240d103..406b312002 100755 --- a/ext/simplexml/README +++ b/ext/simplexml/README @@ -8,12 +8,12 @@ SimpleXML objects follow four basic rules: 4) string conversion allows to access TEXT data When iterating properties then the extension always iterates over -all nodes with that element name. Thus method children() must be +all nodes with that element name. Thus method children() must be called to iterate over subnodes. But also doing the following: foreach ($obj->node_name as $elem) { // do something with $elem } -always results in iteration of 'node_name' elements. So no further +always results in iteration of 'node_name' elements. So no further check is needed to distinguish the number of nodes of that type. When an elements TEXT data is being accessed through a property @@ -29,6 +29,6 @@ TODO ==== At the moment property access to multiple elements of the same -name returns an array of SimpleXML objects. This should be an +name returns an array of SimpleXML objects. This should be an object of a new type instead so that all kinds of linkage, assignment and deleting would work. diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4 index ec1b2b2cc5..cb0b843852 100644 --- a/ext/simplexml/config.m4 +++ b/ext/simplexml/config.m4 @@ -11,8 +11,8 @@ fi if test "$PHP_SIMPLEXML" != "no"; then - if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) + if test "$PHP_LIBXML" = "no"; then + AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) fi PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [ diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 909b4e652c..413be72087 100755 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe>
\ No newline at end of file diff --git a/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml b/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml index 909b4e652c..413be72087 100644 --- a/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml +++ b/ext/simplexml/tests/sxeç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe>
\ No newline at end of file diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index dd7a3bf68d..7342872c32 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -37,7 +37,7 @@ if test "$PHP_SNMP" != "no"; then else AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).]) fi - else + else AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.]) fi diff --git a/ext/snmp/tests/README b/ext/snmp/tests/README index 0db1a4f82b..6b4e8d9705 100644 --- a/ext/snmp/tests/README +++ b/ext/snmp/tests/README @@ -31,7 +31,7 @@ On Linux/FreeBSD - Install package net-snmpd (name may differ based on your distribution). - Replace config file (by default this is /etc/snmp/snmpd.conf on Linux and /usr/local/etc/snmp/snmpd.conf on FreeBSD) with snmpd.conf supplied. - + Before launching daemon make sure that there is no file /var/net-snmp/snmpd.conf Delete it if exists. Ingoring to to so will fail SNMPv3 tests. diff --git a/ext/snmp/tests/skipif.inc b/ext/snmp/tests/skipif.inc index 4d37902636..72423251fd 100644 --- a/ext/snmp/tests/skipif.inc +++ b/ext/snmp/tests/skipif.inc @@ -1,11 +1,11 @@ <?php extension_loaded('snmp') or die('skip snmp extension not available in this build'); - + require_once (dirname(__FILE__).'/snmp_include.inc'); //test server is available // this require snmpget to work ... -//snmpget ( string $hostname , string $community , +//snmpget ( string $hostname , string $community , //string $object_id [, int $timeout [, int $retries ]] ) if (snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout) === false) diff --git a/ext/soap/config.m4 b/ext/soap/config.m4 index ea39dd7894..4a01bc006a 100644 --- a/ext/soap/config.m4 +++ b/ext/soap/config.m4 @@ -11,8 +11,8 @@ fi if test "$PHP_SOAP" != "no"; then - if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml]) + if test "$PHP_LIBXML" = "no"; then + AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml]) fi PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [ diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php index 009e1f0409..2c3eecae6e 100644 --- a/ext/soap/interop/client_round2_interop.php +++ b/ext/soap/interop/client_round2_interop.php @@ -200,7 +200,7 @@ class Interop_Client } else if (!$all) $sql .= "where status=1"; $sql .= " order by endpointName"; - + $db_ep = $this->dbc->getAll($sql,NULL, DB_FETCHMODE_ASSOC ); if (DB::isError($db_ep)) { @@ -263,7 +263,7 @@ class Interop_Client $success = $result['fault']->faultcode; $pos = strpos($success,':'); if ($pos !== false) { - $success = substr($success,$pos+1); + $success = substr($success,$pos+1); } $error = $result['fault']->faultstring; if (!$wire) $wire= $result['fault']->detail; @@ -452,7 +452,7 @@ try { // compare header results $headers_ok = TRUE; if ($soap_test->headers || $soap_test->headers_expect) { - $headers_ok = $this->compareResult($soap_test->headers_expect, $result_headers); + $headers_ok = $this->compareResult($soap_test->headers_expect, $result_headers); } # we need to decode what we sent so we can compare! @@ -514,7 +514,7 @@ try { $res =$fault->faultcode; $pos = strpos($res,':'); if ($pos !== false) { - $res = substr($res,$pos+1); + $res = substr($res,$pos+1); } } // save the wire diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php index ccf479a5cc..dc1ab42f84 100644 --- a/ext/soap/interop/client_round2_params.php +++ b/ext/soap/interop/client_round2_params.php @@ -109,7 +109,7 @@ class SOAP_Test { $res = $fault->faultcode; $pos = strpos($res,':'); if ($pos !== false) { - $res = substr($res,$pos+1); + $res = substr($res,$pos+1); } if ($html) { print "<font color=\"#ff0000\">FAILED: [$res] {$fault->faultstring}</font>\n"; diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 44e4a142f5..b894a1eabf 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -826,7 +826,7 @@ try_again: zend_ulong numindx; int res = zend_hash_get_current_key(Z_ARRVAL_P(cookies), &key, &numindx); data = zend_hash_get_current_data(Z_ARRVAL_P(cookies)); - + if (res == HASH_KEY_IS_STRING && Z_TYPE_P(data) == IS_ARRAY) { zval *value; diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 90c53288a2..4cf0323a0a 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2329,7 +2329,7 @@ PHP_METHOD(SoapClient, SoapClient) context = php_stream_context_from_zval(tmp, 1); Z_ADDREF_P(tmp); } else { - context = php_stream_context_alloc(); + context = php_stream_context_alloc(); } if ((tmp = zend_hash_str_find(ht, "location", sizeof("location")-1)) != NULL && 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 6561ff135c..b65da2782c 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc @@ -2,7 +2,7 @@ class SOAP_Interop_GroupD { function echoString($inputString) - { + { return array("return"=>$inputString->param0); } diff --git a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc index 74ca5775f0..af74db7c74 100644 --- a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc +++ b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc @@ -102,7 +102,7 @@ class SOAP_Interop_GroupI { return array("return"=>$boolean->inputBoolean); } - function echoComplexTypeAsSimpleTypes($input) + function echoComplexTypeAsSimpleTypes($input) { if (isset($input->inputComplexType)) { $ret = array("outputInteger" => $input->inputComplexType->varInt, @@ -116,7 +116,7 @@ class SOAP_Interop_GroupI { } } - function echoSimpleTypesAsComplexType($input) + function echoSimpleTypesAsComplexType($input) { $ret = array("varInt" => $input->inputInteger, "varFloat" => $input->inputFloat); diff --git a/ext/soap/tests/schema/test_schema.inc b/ext/soap/tests/schema/test_schema.inc index bfc4ce0db4..7afc4e697c 100644 --- a/ext/soap/tests/schema/test_schema.inc +++ b/ext/soap/tests/schema/test_schema.inc @@ -44,7 +44,7 @@ $wsdl = <<<EOF </binding> <service name="testService"> <port name="testPort" binding="tns:testBinding"> - <soap:address location="test://" /> + <soap:address location="test://" /> </port> </service> </definitions> diff --git a/ext/sockets/package.xml b/ext/sockets/package.xml index 5fa67d9939..8fb5a70dd4 100644 --- a/ext/sockets/package.xml +++ b/ext/sockets/package.xml @@ -30,8 +30,8 @@ </maintainer> </maintainers> <description> -The socket extension implements a low-level interface to the socket -communication functions based on the popular BSD sockets, providing +The socket extension implements a low-level interface to the socket +communication functions based on the popular BSD sockets, providing the possibility to act as a socket server as well as a client. </description> <license>PHP</license> diff --git a/ext/spl/README b/ext/spl/README index 28373a3eda..0f0e1e31b0 100755 --- a/ext/spl/README +++ b/ext/spl/README @@ -1,7 +1,7 @@ -This is an extension that aims to implement some efficient data access +This is an extension that aims to implement some efficient data access interfaces and classes. You'll find the classes documented using php code in the file spl.php or in the corresponding .inc file in the examples -subdirectory. Based on the internal implementations or the files in the +subdirectory. Based on the internal implementations or the files in the examples subdirectory there are also some .php files to experiment with. For more information look at: http://php.net/manual/en/book.spl.php diff --git a/ext/spl/config.m4 b/ext/spl/config.m4 index 2f77946ce5..63427fb286 100755 --- a/ext/spl/config.m4 +++ b/ext/spl/config.m4 @@ -1,7 +1,7 @@ dnl $Id$ dnl config.m4 for extension SPL - AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) + AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h]) PHP_ADD_EXTENSION_DEP(spl, pcre, true) diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc index 5871e7d63b..2ccd0d1be8 100644 --- a/ext/spl/examples/autoload.inc +++ b/ext/spl/examples/autoload.inc @@ -23,7 +23,7 @@ function __load_class($classname, $dir) return false; } -/** +/** * @brief Class loader for SPL example classes * @author Marcus Boerger * @version 1.0 diff --git a/ext/spl/examples/dba_array.php b/ext/spl/examples/dba_array.php index 346ac1f2f7..f217c34546 100755 --- a/ext/spl/examples/dba_array.php +++ b/ext/spl/examples/dba_array.php @@ -11,7 +11,7 @@ * If \<value\> is specified then \<key\> is set to \<value\> in \<file\>. * Else the value of \<key\> is printed only. * - * Note: configure with --enable-dba + * Note: configure with --enable-dba */ if ($argc < 4) { diff --git a/ext/spl/examples/dba_dump.php b/ext/spl/examples/dba_dump.php index 2c698d427a..7ea8e76255 100755 --- a/ext/spl/examples/dba_dump.php +++ b/ext/spl/examples/dba_dump.php @@ -11,7 +11,7 @@ * Show all groups in the ini file specified by \<file\>. * The regular expression \<regex\> is used to filter the by setting name. * - * Note: configure with --enable-dba + * Note: configure with --enable-dba */ if ($argc < 3) { diff --git a/ext/spl/examples/dbaarray.inc b/ext/spl/examples/dbaarray.inc index d448ad7299..d6ee56f442 100644 --- a/ext/spl/examples/dbaarray.inc +++ b/ext/spl/examples/dbaarray.inc @@ -49,12 +49,12 @@ class DbaArray extends DbaReader implements ArrayAccess */ function offsetGet($name) { - $data = dba_fetch($name, $this->db); + $data = dba_fetch($name, $this->db); if($data) { //return unserialize($data); return $data; } - else + else { return NULL; } diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc index b09791239b..01de37e990 100644 --- a/ext/spl/examples/dbareader.inc +++ b/ext/spl/examples/dbareader.inc @@ -32,7 +32,7 @@ class DbaReader implements Iterator throw new exception('Could not open file ' . $file); } } - + /** * Close database. */ @@ -60,7 +60,7 @@ class DbaReader implements Iterator /** * Fetches the current data if $key is valid - */ + */ private function fetch_data() { if ($this->key !== false) { $this->val = dba_fetch($this->key, $this->db); diff --git a/ext/spl/examples/directoryfilterdots.inc b/ext/spl/examples/directoryfilterdots.inc index 37f14b7106..454bd90883 100644 --- a/ext/spl/examples/directoryfilterdots.inc +++ b/ext/spl/examples/directoryfilterdots.inc @@ -28,7 +28,7 @@ class DirectoryFilterDots extends RecursiveFilterIterator } /** @return whether the current entry is neither '.' nor '..' - */ + */ function accept() { return !$this->getInnerIterator()->isDot(); diff --git a/ext/spl/examples/directorygraphiterator.inc b/ext/spl/examples/directorygraphiterator.inc index 5808e3b89e..3f0bb263e2 100644 --- a/ext/spl/examples/directorygraphiterator.inc +++ b/ext/spl/examples/directorygraphiterator.inc @@ -23,9 +23,9 @@ class DirectoryGraphIterator extends DirectoryTreeIterator new ParentIterator( new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME ) - ), + ), CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD - ), + ), parent::SELF_FIRST ); } diff --git a/ext/spl/examples/directorytreeiterator.inc b/ext/spl/examples/directorytreeiterator.inc index 8e65d0db12..8454d9e305 100644 --- a/ext/spl/examples/directorytreeiterator.inc +++ b/ext/spl/examples/directorytreeiterator.inc @@ -24,27 +24,27 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator parent::__construct( new RecursiveCachingIterator( new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME - ), + ), CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD - ), + ), parent::SELF_FIRST ); } /** @return the current element prefixed with ASCII graphics - */ + */ function current() { $tree = ''; for ($l=0; $l < $this->getDepth(); $l++) { $tree .= $this->getSubIterator($l)->hasNext() ? '| ' : ' '; } - return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') + return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') . $this->getSubIterator($l)->__toString(); } /** Aggregates the inner iterator - */ + */ function __call($func, $params) { return call_user_func_array(array($this->getSubIterator(), $func), $params); diff --git a/ext/spl/examples/dualiterator.inc b/ext/spl/examples/dualiterator.inc index 4cee203436..eeb8ae869c 100644 --- a/ext/spl/examples/dualiterator.inc +++ b/ext/spl/examples/dualiterator.inc @@ -24,9 +24,9 @@ class DualIterator implements Iterator const KEY_LHS = 0x10; const KEY_RHS = 0x20; const KEY_0 = 0x00; - + const DEFAULT_FLAGS = 0x13; - + private $lhs; private $rhs; private $flags; @@ -37,7 +37,7 @@ class DualIterator implements Iterator * @param rhs Right Hand Side Iterator * @param flags iteration flags */ - function __construct(Iterator $lhs, Iterator $rhs, + function __construct(Iterator $lhs, Iterator $rhs, $flags = 0x13 /*DualIterator::DEFAULT_FLAGS*/) { $this->lhs = $lhs; @@ -74,22 +74,22 @@ class DualIterator implements Iterator } /** rewind both inner iterators - */ + */ function rewind() { $this->lhs->rewind(); - $this->rhs->rewind(); + $this->rhs->rewind(); } /** @return whether both inner iterators are valid - */ + */ function valid() { - return $this->lhs->valid() && $this->rhs->valid(); + return $this->lhs->valid() && $this->rhs->valid(); } /** @return current value depending on CURRENT_* flags - */ + */ function current() { switch($this->flags & 0x0F) @@ -107,7 +107,7 @@ class DualIterator implements Iterator } /** @return key value depending on KEY_* flags - */ + */ function key() { switch($this->flags & 0xF0) @@ -123,14 +123,14 @@ class DualIterator implements Iterator } /** move both inner iterators forward - */ + */ function next() { $this->lhs->next(); $this->rhs->next(); } - /** @return whether both inner iterators are valid and have identical + /** @return whether both inner iterators are valid and have identical * current and key values or both are non valid. */ function areIdentical() @@ -141,7 +141,7 @@ class DualIterator implements Iterator : $this->lhs->valid() == $this->rhs->valid(); } - /** @return whether both inner iterators are valid and have equal current + /** @return whether both inner iterators are valid and have equal current * and key values or both are non valid. */ function areEqual() @@ -162,14 +162,14 @@ class DualIterator implements Iterator * @note If one implements RecursiveIterator the other must do as well. * And if both do then a recursive comparison is being used. */ - static function compareIterators(Iterator $lhs, Iterator $rhs, + static function compareIterators(Iterator $lhs, Iterator $rhs, $identical = false) { if ($lhs instanceof RecursiveIterator) { if ($rhs instanceof RecursiveIterator) { - $it = new RecursiveDualIterator($lhs, $rhs, + $it = new RecursiveDualIterator($lhs, $rhs, self::CURRENT_0 | self::KEY_0); $it = new RecursiveCompareDualIterator($it); } diff --git a/ext/spl/examples/findregex.php b/ext/spl/examples/findregex.php index b43ee0cbbc..288c0924b1 100755 --- a/ext/spl/examples/findregex.php +++ b/ext/spl/examples/findregex.php @@ -1,5 +1,5 @@ <?php - + /** @file findregex.php * @brief Program Find a specific file by name. * @ingroup Examples @@ -33,4 +33,4 @@ foreach(new RegexFindFile($argv[1], $argv[2]) as $file) echo $file->getPathname()."\n"; } -?>
\ No newline at end of file +?>
\ No newline at end of file diff --git a/ext/spl/examples/ini_groups.php b/ext/spl/examples/ini_groups.php index 5136911096..4c6c89bd70 100755 --- a/ext/spl/examples/ini_groups.php +++ b/ext/spl/examples/ini_groups.php @@ -11,7 +11,7 @@ * Show all groups in the ini file specified by \<file\>. * The regular expression \<regex\> is used to filter the result. * - * Note: configure with --enable-dba + * Note: configure with --enable-dba */ if ($argc < 2) { diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc index 62cfa3e029..cb2bb04a57 100644 --- a/ext/spl/examples/inigroups.inc +++ b/ext/spl/examples/inigroups.inc @@ -18,11 +18,11 @@ if (!class_exists("DbaReader", false)) require_once("dbareader.inc"); * @version 1.1 * * Using this class you can iterator over all groups of a ini file. - * + * * This class uses a 'is-a' relation to KeyFilter in contrast to a 'has-a' - * relation. Doing so both current() and key() methods must be overwritten. + * relation. Doing so both current() and key() methods must be overwritten. * If it would use a 'has-a' relation there would be much more to type... - * but for puritists that would allow correctness in so far as then no + * but for puritists that would allow correctness in so far as then no * key() would be needed. */ class IniGroups extends KeyFilter diff --git a/ext/spl/examples/keyfilter.inc b/ext/spl/examples/keyfilter.inc index eaf6b77364..abc925ec43 100644 --- a/ext/spl/examples/keyfilter.inc +++ b/ext/spl/examples/keyfilter.inc @@ -16,7 +16,7 @@ * * Instances of this class act as a filter around iterators whose elements * are strings. In other words you can put an iterator into the constructor - * and the instance will only return elements which match the given regular + * and the instance will only return elements which match the given regular * expression. */ class KeyFilter extends FilterIterator @@ -38,13 +38,13 @@ class KeyFilter extends FilterIterator $this->regex = $regex; } - /** \return whether the current key mathes the regular expression + /** \return whether the current key mathes the regular expression */ function accept() { return ereg($this->regex, $this->getInnerIterator()->key()); } - + /** @return regular expression used as filter */ function getRegex() @@ -57,7 +57,7 @@ class KeyFilter extends FilterIterator */ protected function __clone() { - // disallow clone + // disallow clone } } diff --git a/ext/spl/examples/phar_from_dir.php b/ext/spl/examples/phar_from_dir.php index 2ee15ca1e6..d75788e840 100755 --- a/ext/spl/examples/phar_from_dir.php +++ b/ext/spl/examples/phar_from_dir.php @@ -9,7 +9,7 @@ * * Usage: php phar_create_from_dir.php \<archive\> \<directory\> [\<regex\>] * - * Create phar archive \<archive\> using entries from \<directory\> that + * Create phar archive \<archive\> using entries from \<directory\> that * optionally match \<regex\>. */ diff --git a/ext/spl/examples/recursivecomparedualiterator.inc b/ext/spl/examples/recursivecomparedualiterator.inc index 75265c1d58..5b63e9f0b3 100644 --- a/ext/spl/examples/recursivecomparedualiterator.inc +++ b/ext/spl/examples/recursivecomparedualiterator.inc @@ -33,7 +33,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator } /** Rewind iteration andcomparison process. Starting with $equal = true. - */ + */ function rewind() { $this->equal = true; @@ -49,7 +49,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator && !$this->getInnerIterator()->getRHS()->valid(); } - /** @return whether both inner iterators are valid and have identical + /** @return whether both inner iterators are valid and have identical * current and key values or both are non valid. */ function areIdentical() @@ -57,7 +57,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator return $this->equal && $this->getInnerIterator()->areIdentical(); } - /** @return whether both inner iterators are valid and have equal current + /** @return whether both inner iterators are valid and have equal current * and key values or both are non valid. */ function areEqual() diff --git a/ext/spl/examples/recursivedualiterator.inc b/ext/spl/examples/recursivedualiterator.inc index cfa3bccbbc..a56984e083 100644 --- a/ext/spl/examples/recursivedualiterator.inc +++ b/ext/spl/examples/recursivedualiterator.inc @@ -24,7 +24,7 @@ class RecursiveDualIterator extends DualIterator implements RecursiveIterator * @param rhs Right Hand Side Iterator * @param flags iteration flags */ - function __construct(RecursiveIterator $lhs, RecursiveIterator $rhs, + function __construct(RecursiveIterator $lhs, RecursiveIterator $rhs, $flags = 0x33 /*DualIterator::DEFAULT_FLAGS*/) { parent::__construct($lhs, $rhs, $flags); @@ -34,10 +34,10 @@ class RecursiveDualIterator extends DualIterator implements RecursiveIterator */ function hasChildren() { - return $this->getLHS()->hasChildren() && $this->getRHS()->hasChildren(); + return $this->getLHS()->hasChildren() && $this->getRHS()->hasChildren(); } - /** @return new RecursiveDualIterator (late binding) for the two inner + /** @return new RecursiveDualIterator (late binding) for the two inner * iterators current children. */ function getChildren() diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc index 944a4ac5a5..ff4963bc72 100644 --- a/ext/spl/examples/searchiterator.inc +++ b/ext/spl/examples/searchiterator.inc @@ -38,7 +38,7 @@ abstract class SearchIterator extends FilterIterator { return !$this->done && parent::valid(); } - + /** Do not move forward but instead mark as finished. * @return void */ @@ -48,7 +48,7 @@ abstract class SearchIterator extends FilterIterator } /** Aggregates the inner iterator - */ + */ function __call($func, $params) { return call_user_func_array(array($this->getInnerIterator(), $func), $params); diff --git a/ext/spl/internal/appenditerator.inc b/ext/spl/internal/appenditerator.inc index 28e32b15f6..72eb258136 100644 --- a/ext/spl/internal/appenditerator.inc +++ b/ext/spl/internal/appenditerator.inc @@ -34,7 +34,7 @@ class AppendIterator implements OuterIterator * the AppendIterator itself becomes valid. However there will be no * call to $it->rewind(). Also if the current state is invalid the inner * ArrayIterator will be rewound und forwarded to the appended element. - */ + */ function append(Iterator $it) { $this->iterators->append($it); @@ -84,7 +84,7 @@ class AppendIterator implements OuterIterator return $this->iterators->valid() ? $this->getInnerIterator()->key() : NULL; } - /** Move to the next element. If this means to another Iterator that + /** Move to the next element. If this means to another Iterator that * rewind that Iterator. * @return void */ @@ -112,7 +112,7 @@ class AppendIterator implements OuterIterator } /** Aggregates the inner iterator - */ + */ function __call($func, $params) { return call_user_func_array(array($this->getInnerIterator(), $func), $params); diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc index 4d4bf8dbff..077ac726cf 100644 --- a/ext/spl/internal/cachingiterator.inc +++ b/ext/spl/internal/cachingiterator.inc @@ -18,8 +18,8 @@ * This iterator wrapper does a one ahead iteration. This way it knows whether * the inner iterator has one more element. * - * @note If you want to convert the elements into strings and the inner - * Iterator is an internal Iterator then you need to provide the + * @note If you want to convert the elements into strings and the inner + * Iterator is an internal Iterator then you need to provide the * flag CALL_TOSTRING to do the conversion when the actual element * is being fetched. Otherwise the conversion would happen with the * already changed iterator. If you do not need this then it you should @@ -41,7 +41,7 @@ class CachingIterator implements OuterIterator /** Construct from another iterator * * @param it Iterator to cache - * @param flags Bitmask: + * @param flags Bitmask: * - CALL_TOSTRING (whether to call __toString() for every element) */ function __construct(Iterator $it, $flags = self::CALL_TOSTRING) @@ -63,7 +63,7 @@ class CachingIterator implements OuterIterator $this->it->rewind(); $this->next(); } - + /** Forward to the next element */ function next() @@ -85,7 +85,7 @@ class CachingIterator implements OuterIterator } $this->it->next(); } - + /** @return whether the iterator is valid */ function valid() @@ -99,7 +99,7 @@ class CachingIterator implements OuterIterator { return $this->it->valid(); } - + /** @return the current element */ function current() @@ -123,8 +123,8 @@ class CachingIterator implements OuterIterator { return call_user_func_array(array($this->it, $func), $params); } - - /** @return the string represenatation that was generated for the current + + /** @return the string represenatation that was generated for the current * element * @throw exception when CALL_TOSTRING was not specified in constructor */ @@ -144,10 +144,10 @@ class CachingIterator implements OuterIterator } return $this->strValue; } - + /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; diff --git a/ext/spl/internal/filteriterator.inc b/ext/spl/internal/filteriterator.inc index 3330cc9e47..e11e467a10 100644 --- a/ext/spl/internal/filteriterator.inc +++ b/ext/spl/internal/filteriterator.inc @@ -15,12 +15,12 @@ * @version 1.1 * @since PHP 5.0 * - * Instances of this class act as a filter around iterators. In other words - * you can put an iterator into the constructor and the instance will only + * Instances of this class act as a filter around iterators. In other words + * you can put an iterator into the constructor and the instance will only * return selected (accepted) elements. * - * The only thing that needs to be done to make this work is implementing - * method accept(). Typically this invloves reading the current element or + * The only thing that needs to be done to make this work is implementing + * method accept(). Typically this invloves reading the current element or * key of the inner Iterator and checking whether it is acceptable. */ abstract class FilterIterator implements OuterIterator @@ -39,7 +39,7 @@ abstract class FilterIterator implements OuterIterator /** * Rewind the inner iterator. */ - function rewind() { + function rewind() { $this->it->rewind(); $this->fetch(); } @@ -76,38 +76,38 @@ abstract class FilterIterator implements OuterIterator $this->it->next(); $this->fetch(); } - + /** * @return Whether more elements are available */ function valid() { return $this->it->valid(); } - + /** * @return The current key */ function key() { return $this->it->key(); } - + /** * @return The current value */ function current() { return $this->it->current(); } - + /** * hidden __clone */ protected function __clone() { - // disallow clone + // disallow clone } /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc index 451d05da32..cdf89d8306 100644 --- a/ext/spl/internal/iteratoriterator.inc +++ b/ext/spl/internal/iteratoriterator.inc @@ -13,8 +13,8 @@ * @brief Basic Iterator wrapper * @since PHP 5.1 * - * This iterator wrapper allows to convert anything that is traversable into - * an Iterator. It is very important to understand that most classes that do + * This iterator wrapper allows to convert anything that is traversable into + * an Iterator. It is very important to understand that most classes that do * not implement Iterator have their reasone to. Most likely they do not allow * the full Iterator feature set. If so you need to provide techniques to * prevent missuse. If you do not you must expect exceptions or fatal errors. @@ -32,7 +32,7 @@ } \endcode * - * As you can see in the example this approach requires that the class to + * As you can see in the example this approach requires that the class to * downcast to is actually a base class of the specified iterator to wrap. * Omitting the downcast in the above example would result in an endless loop * since IteratorIterator::__construct() would call SomeClass::getIterator(). diff --git a/ext/spl/internal/limititerator.inc b/ext/spl/internal/limititerator.inc index c5bddead78..00c4122872 100644 --- a/ext/spl/internal/limititerator.inc +++ b/ext/spl/internal/limititerator.inc @@ -47,7 +47,7 @@ class LimitIterator implements OuterIterator $this->count = $count; $this->pos = 0; } - + /** Seek to specified position * @param position offset to seek to (relative to beginning not offset * specified in constructor). @@ -78,14 +78,14 @@ class LimitIterator implements OuterIterator $this->pos = 0; $this->seek($this->offset); } - + /** @return whether iterator is valid */ function valid() { return ($this->count == -1 || $this->pos < $this->offset + $this->count) && $this->it->valid(); } - + /** @return current key */ function key() { @@ -105,7 +105,7 @@ class LimitIterator implements OuterIterator $this->pos++; } - /** @return current position relative to zero (not to offset specified in + /** @return current position relative to zero (not to offset specified in * constructor). */ function getPosition() { @@ -114,7 +114,7 @@ class LimitIterator implements OuterIterator /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc index cc377fcc6b..69a223444d 100644 --- a/ext/spl/internal/parentiterator.inc +++ b/ext/spl/internal/parentiterator.inc @@ -15,8 +15,8 @@ * @version 1.2 * @since PHP 5.1 * - * This extended FilterIterator allows a recursive iteration using - * RecursiveIteratorIterator that only shows those elements which have + * This extended FilterIterator allows a recursive iteration using + * RecursiveIteratorIterator that only shows those elements which have * children. */ class ParentIterator extends RecursiveFilterIterator diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc index a9450e12a5..2059b97c1c 100644 --- a/ext/spl/internal/recursivearrayiterator.inc +++ b/ext/spl/internal/recursivearrayiterator.inc @@ -18,12 +18,12 @@ * Passes the RecursiveIterator interface to the inner Iterator and provides * the same functionality as FilterIterator. This allows you to skip parents * and all their childs before loading them all. You need to care about - * function getChildren() because it may not always suit your needs. The + * function getChildren() because it may not always suit your needs. The * builtin behavior uses reflection to return a new instance of the exact same * class it is called from. That is you extend RecursiveFilterIterator and * getChildren() will create instance of that class. The problem is that doing * this does not transport any state or control information of your accept() - * implementation to the new instance. To overcome this problem you might + * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the * control vaules manually. */ @@ -52,7 +52,7 @@ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator } return $this->ref->newInstance($this->current()); } - + private $ref; } diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc index cd5d3e31f5..3ae127ad94 100644 --- a/ext/spl/internal/recursivecachingiterator.inc +++ b/ext/spl/internal/recursivecachingiterator.inc @@ -25,7 +25,7 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera /** Construct from another iterator * * @param it Iterator to cache - * @param flags Bitmask: + * @param flags Bitmask: * - CALL_TOSTRING (whether to call __toString() for every element) * - CATCH_GET_CHILD (whether to catch exceptions when trying to get childs) */ @@ -35,7 +35,7 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera } /** Rewind Iterator - */ + */ function rewind(); { $this->hasChildren = false; @@ -74,13 +74,13 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera } parent::next(); } - + private $ref; /** @return whether the current element has children * @note The check whether the Iterator for the children can be created was * already executed. Hence when flag CATCH_GET_CHILD was given in - * constructor this function returns false so that getChildren does + * constructor this function returns false so that getChildren does * not try to access those children. */ function hasChildren() diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc index b089919a30..87d98da885 100644 --- a/ext/spl/internal/recursivefilteriterator.inc +++ b/ext/spl/internal/recursivefilteriterator.inc @@ -18,12 +18,12 @@ * Passes the RecursiveIterator interface to the inner Iterator and provides * the same functionality as FilterIterator. This allows you to skip parents * and all their childs before loading them all. You need to care about - * function getChildren() because it may not always suit your needs. The + * function getChildren() because it may not always suit your needs. The * builtin behavior uses reflection to return a new instance of the exact same * class it is called from. That is you extend RecursiveFilterIterator and * getChildren() will create instance of that class. The problem is that doing * this does not transport any state or control information of your accept() - * implementation to the new instance. To overcome this problem you might + * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the * control vaules manually. */ @@ -35,7 +35,7 @@ abstract class RecursiveFilterIterator extends FilterIterator implements Recursi { parent::__construct($it); } - + /** @return whether the current element has children */ function hasChildren() @@ -55,7 +55,7 @@ abstract class RecursiveFilterIterator extends FilterIterator implements Recursi } return $this->ref->newInstance($this->getInnerIterator()->getChildren()); } - + private $ref; } diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc index 1eab3d69b2..6e6c023486 100644 --- a/ext/spl/internal/recursiveiterator.inc +++ b/ext/spl/internal/recursiveiterator.inc @@ -20,7 +20,7 @@ interface RecursiveIterator extends Iterator /** @return whether the current element has children */ function hasChildren(); - + /** @return the sub iterator for the current element * @note The returned object must implement RecursiveIterator. */ diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index 35fa801e78..c22a92bf71 100644 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc @@ -15,8 +15,8 @@ * @version 1.2 * @since PHP 5.0 * - * The objects of this class are created by instances of RecursiveIterator. - * Elements of those iterators may be traversable themselves. If so these + * The objects of this class are created by instances of RecursiveIterator. + * Elements of those iterators may be traversable themselves. If so these * sub elements are recursed into. */ class RecursiveIteratorIterator implements OuterIterator @@ -47,7 +47,7 @@ class RecursiveIteratorIterator implements OuterIterator * @param flags Control flags, zero or any combination of the following * (since PHP 5.1). * - CATCH_GET_CHILD which catches exceptions during - * getChildren() calls and simply jumps to the next + * getChildren() calls and simply jumps to the next * element. */ function __construct(RecursiveIterator $it, $mode = self::LEAVES_ONLY, $flags = 0) @@ -69,7 +69,7 @@ class RecursiveIteratorIterator implements OuterIterator $this->ait[0]->recursed = false; callNextElement(true); } - + /** @return whether iterator is valid */ function valid() @@ -85,7 +85,7 @@ class RecursiveIteratorIterator implements OuterIterator } return false; } - + /** @return current key */ function key() @@ -93,7 +93,7 @@ class RecursiveIteratorIterator implements OuterIterator $it = $this->ait[$this->count]; return $it->key(); } - + /** @return current element */ function current() @@ -101,7 +101,7 @@ class RecursiveIteratorIterator implements OuterIterator $it = $this->ait[$this->count]; return $it->current(); } - + /** Forward to next element */ function next() @@ -153,7 +153,7 @@ class RecursiveIteratorIterator implements OuterIterator callNextElement(true); } - /** @return Sub Iterator at given level or if unspecified the current sub + /** @return Sub Iterator at given level or if unspecified the current sub * Iterator */ function getSubIterator($level = NULL) @@ -166,7 +166,7 @@ class RecursiveIteratorIterator implements OuterIterator /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; @@ -201,7 +201,7 @@ class RecursiveIteratorIterator implements OuterIterator function beginChildren() { } - + /** Called after current child iterator is invalid and right before it * gets destructed. * @since PHP 5.1 @@ -226,7 +226,7 @@ class RecursiveIteratorIterator implements OuterIterator } } } - + /** Called when the next element is available */ function nextElement() diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc index ffcff0ce47..4223104398 100644 --- a/ext/spl/internal/recursiveregexiterator.inc +++ b/ext/spl/internal/recursiveregexiterator.inc @@ -15,20 +15,20 @@ * @version 1.0 * @since PHP 5.1 * - * This filter iterator assumes that the inner iterator + * This filter iterator assumes that the inner iterator */ class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator { /** - * Constructs a regular expression filter around an iterator whose + * Constructs a regular expression filter around an iterator whose * elemnts or keys are strings. * * @param it inner iterator * @param regex the regular expression to match - * @param mode operation mode (one of self::MATCH, self::GET_MATCH, + * @param mode operation mode (one of self::MATCH, self::GET_MATCH, * self::ALL_MATCHES, self::SPLIT) * @param flags special flags (self::USE_KEY) - * @param preg_flags global PREG_* flags, see preg_match(), + * @param preg_flags global PREG_* flags, see preg_match(), * preg_match_all(), preg_split() */ function __construct(RecursiveIterator $it, $regex, $mode = 0, $flags = 0, $preg_flags = 0) { @@ -54,7 +54,7 @@ class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator } return $this->ref->newInstance($this->getInnerIterator()->getChildren()); } - + private $ref; } diff --git a/ext/spl/internal/regexiterator.inc b/ext/spl/internal/regexiterator.inc index c6addb93d2..706eff33a7 100644 --- a/ext/spl/internal/regexiterator.inc +++ b/ext/spl/internal/regexiterator.inc @@ -15,11 +15,11 @@ * @version 1.0 * @since PHP 5.1 * - * This filter iterator assumes that the inner iterator + * This filter iterator assumes that the inner iterator */ class RegexIterator extends FilterIterator { - const USE_KEY = 0x00000001; /**< If present in $flags the key is + const USE_KEY = 0x00000001; /**< If present in $flags the key is used rather then the current value. */ const MATCH = 0; /**< Mode: Executed a plain match only */ @@ -27,26 +27,26 @@ class RegexIterator extends FilterIterator const ALL_MATCHES = 2; /**< Mode: Return all matches (if any) */ const SPLIT = 3; /**< Mode: Return the split values (if any) */ const REPLACE = 4; /**< Mode: Replace the input key or current */ - + private $regex; /**< the regular expression to match against */ - private $mode; /**< operation mode (one of self::MATCH, + private $mode; /**< operation mode (one of self::MATCH, self::GET_MATCH, self::ALL_MATCHES, self::SPLIT) */ private $flags; /**< special flags (self::USE_KEY) */ - private $preg_flags;/**< PREG_* flags, see preg_match(), preg_match_all(), - preg_split() */ + private $preg_flags;/**< PREG_* flags, see preg_match(), preg_match_all(), + preg_split() */ private $key; /**< the value used for key() */ private $current; /**< the value used for current() */ /** - * Constructs a regular expression filter around an iterator whose + * Constructs a regular expression filter around an iterator whose * elemnts or keys are strings. * * @param it inner iterator * @param regex the regular expression to match - * @param mode operation mode (one of self::MATCH, self::GET_MATCH, + * @param mode operation mode (one of self::MATCH, self::GET_MATCH, * self::ALL_MATCHES, self::SPLIT) * @param flags special flags (self::USE_KEY) - * @param preg_flags global PREG_* flags, see preg_match(), + * @param preg_flags global PREG_* flags, see preg_match(), * preg_match_all(), preg_split() */ function __construct(Iterator $it, $regex, $mode = 0, $flags = 0, $preg_flags = 0) { diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc index b4f66bde4d..7728636981 100644 --- a/ext/spl/internal/seekableiterator.inc +++ b/ext/spl/internal/seekableiterator.inc @@ -25,8 +25,8 @@ interface SeekableIterator extends Iterator * \param $index position to seek to * \return void * - * The method should throw an exception if it is not possible to seek to - * the given position. Typically this exception should be of type + * The method should throw an exception if it is not possible to seek to + * the given position. Typically this exception should be of type * OutOfBoundsException. \code function seek($index); diff --git a/ext/spl/internal/spldoublylinkedlist.inc b/ext/spl/internal/spldoublylinkedlist.inc index e87e4b11d5..f01b6306a7 100644 --- a/ext/spl/internal/spldoublylinkedlist.inc +++ b/ext/spl/internal/spldoublylinkedlist.inc @@ -15,8 +15,8 @@ * The SplDoublyLinkedList class provides the main functionalities of a * doubly linked list (DLL). * @note The following userland implementation of Iterator is a bit different - * from the internal one. Internally, iterators generated by nested - * foreachs are independent, while they share the same traverse pointer + * from the internal one. Internally, iterators generated by nested + * foreachs are independent, while they share the same traverse pointer * in userland. */ class SplDoublyLinkedList implements Iterator, ArrayAccess, Countable @@ -113,7 +113,7 @@ class SplDoublyLinkedList implements Iterator, ArrayAccess, Countable return ($this->count() == 0); } - /** Changes the iteration mode. There are two orthogonal sets of modes that + /** Changes the iteration mode. There are two orthogonal sets of modes that * can be set: * - The direction of the iteration (either one or the other) * - SplDoublyLnkedList::IT_MODE_LIFO (Stack style) diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc index df941c6307..4b0c757b81 100644 --- a/ext/spl/internal/splfileobject.inc +++ b/ext/spl/internal/splfileobject.inc @@ -28,15 +28,15 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt private $flags = 0; private $delimiter= ','; private $enclosure= '"'; - + /** * Constructs a new file object - * + * * @param $file_name The name of the stream to open * @param $open_mode The file open mode * @param $use_include_path Whether to search in include paths * @param $context A stream context - * @throw RuntimeException If file cannot be opened (e.g. insufficient + * @throw RuntimeException If file cannot be opened (e.g. insufficient * access rights). */ function __construct($file_name, $open_mode = 'r', $use_include_path = false, $context = NULL) @@ -48,7 +48,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt } $this->fname = $file_name; } - + /** * @return whether the end of the stream is reached */ @@ -65,13 +65,13 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt $this->freeLine(); $this->lnum++; $buf = fgets($this->fp, $this->max_len); - + return $buf; } /** * @param delimiter character used as field separator - * @param enclosure end of + * @param enclosure end of * @return array containing read data */ function fgetcsv($delimiter = NULL, $enclosure = NULL) @@ -88,7 +88,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt case 2: break; } - return fgetcsv($this->fp, $this->max_len, $delimiter, $enclosure); + return fgetcsv($this->fp, $this->max_len, $delimiter, $enclosure); } /** @@ -140,7 +140,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt /** * @param pos new file position * @param whence seek method (SEEK_SET, SEEK_CUR, SEEK_END) - * @return Upon success, returns 0; otherwise, returns -1. Note that + * @return Upon success, returns 0; otherwise, returns -1. Note that * seeking past EOF is not considered an error. */ function fseek($pos, $whence = SEEK_SET) @@ -179,7 +179,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt /** Scan the next line * @param $format string specifying format to parse - */ + */ function fscanf($format /* , ... */) { $this->freeLine(); @@ -276,11 +276,11 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt { return !$this->eof(); } - + /** * @note Fill current line buffer if not done yet. - * @return line buffer - */ + * @return line buffer + */ function current() { if (is_null($this->line)) @@ -291,20 +291,20 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt } /** - * @return line number + * @return line number * @note fgetc() will increase the line number when reaing a new line char. * This has the effect key() called on a read a new line will already * return the increased line number. * @note Line counting works as long as you only read the file and do not * use fseek(). - */ + */ function key() { return $this->lnum; } /** Invalidate current line buffer. - */ + */ function next() { $this->freeLine(); @@ -342,7 +342,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt * @note If you DO overload this function key() and current() will increment * $this->lnum automatically. If not then function reaLine() will do * that for you. - */ + */ function getCurrentLine() { $this->freeLine(); @@ -363,7 +363,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt /** * @param $line_pos Seek to this line - */ + */ function seek($line_pos) { $this->rewind(); diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc index ffc6c99488..f27da4e001 100644 --- a/ext/spl/internal/splobjectstorage.inc +++ b/ext/spl/internal/splobjectstorage.inc @@ -31,21 +31,21 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess { rewind($this->storage); } - + /** @return whether iterator is valid */ function valid() { return key($this->storage) !== false; } - + /** @return current key */ function key() { return $this->index; } - + /** @return current object */ function current() @@ -53,7 +53,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $element = current($this->storage); return $element ? $element[0] : NULL } - + /** @return get current object's associated information * @since 5.3.0 */ @@ -62,7 +62,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $element = current($this->storage); return $element ? $element[1] : NULL } - + /** @return set current object's associated information * @since 5.3.0 */ @@ -72,7 +72,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $this->storage[$this->index][1] = $inf; } } - + /** Forward to next element */ function next() diff --git a/ext/spl/internal/splqueue.inc b/ext/spl/internal/splqueue.inc index 368a2597f3..259e8ddd12 100644 --- a/ext/spl/internal/splqueue.inc +++ b/ext/spl/internal/splqueue.inc @@ -11,7 +11,7 @@ /** @ingroup SPL * @brief Implementation of a Queue through a DoublyLinkedList. As SplQueue - * extends SplDoublyLinkedList, unshift() and pop() are still available + * extends SplDoublyLinkedList, unshift() and pop() are still available * even though they don't make much sense for a queue. For convenience, * two aliases are available: * - enqueue() is an alias of push() @@ -26,7 +26,7 @@ class SplQueue extends SplDoublyLinkedList { protected $_it_mode = parent::IT_MODE_FIFO; - /** Changes the iteration mode. There are two orthogonal sets of modes that + /** Changes the iteration mode. There are two orthogonal sets of modes that * can be set: * * - The behavior of the iterator (either one or the other) diff --git a/ext/spl/internal/splstack.inc b/ext/spl/internal/splstack.inc index 70b1443846..05436b585d 100644 --- a/ext/spl/internal/splstack.inc +++ b/ext/spl/internal/splstack.inc @@ -10,7 +10,7 @@ */ /** @ingroup SPL - * @brief Implementation of a stack through a DoublyLinkedList. As SplStack + * @brief Implementation of a stack through a DoublyLinkedList. As SplStack * extends SplDoublyLinkedList, shift() and unshift() are still available even * though they don't make much sense for a stack. * @since PHP 5.3 @@ -22,7 +22,7 @@ class SplStack extends SplDoublyLinkedList { protected $_it_mode = parent::IT_MODE_LIFO; - /** Changes the iteration mode. There are two orthogonal sets of modes that + /** Changes the iteration mode. There are two orthogonal sets of modes that * can be set: * * - The behavior of the iterator (either one or the other) diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 714ab46656..1d969be2ff 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -348,7 +348,7 @@ static zval *spl_fixedarray_object_read_dimension(zval *object, zval *offset, in if (type == BP_VAR_IS && intern->fptr_offset_has) { SEPARATE_ARG_IF_REF(offset); - zend_call_method_with_1_params(object, intern->std.ce, &intern->fptr_offset_has, "offsetexists", rv, offset); + zend_call_method_with_1_params(object, intern->std.ce, &intern->fptr_offset_has, "offsetexists", rv, offset); if (UNEXPECTED(Z_ISUNDEF_P(rv))) { zval_ptr_dtor(offset); return NULL; diff --git a/ext/standard/assert.c b/ext/standard/assert.c index f7fbc2602b..1f8a4eff78 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -279,7 +279,7 @@ PHP_FUNCTION(assert) if (ASSERTG(bail)) { zend_bailout(); } - + RETURN_FALSE; } /* }}} */ diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 365caa51d0..0f98293047 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -147,7 +147,7 @@ static size_t browscap_compute_regex_len(zend_string *pattern) { break; } } - + return len + sizeof("~^$~")-1; } @@ -365,7 +365,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb "Skipping excessively long pattern of length %zd", ZSTR_LEN(pattern)); break; } - + entry = ctx->current_entry = pemalloc(sizeof(browscap_entry), persistent); zend_hash_update_ptr(bdata->htab, pattern, entry); @@ -411,7 +411,7 @@ static int browscap_read_file(char *filename, browser_data *browdata, int persis fh.type = ZEND_HANDLE_FP; browdata->htab = pemalloc(sizeof *browdata->htab, persistent); - zend_hash_init_ex(browdata->htab, 0, NULL, + zend_hash_init_ex(browdata->htab, 0, NULL, persistent ? browscap_entry_dtor_persistent : browscap_entry_dtor, persistent, 0); browdata->kv_size = 16 * 1024; diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index b800aaa12f..a9231d8421 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -13,14 +13,14 @@ int main(int argc, char **argv) char *filename = tmpnam(NULL); char buffer[64]; int result = 0; - + FILE *fp = fopen(filename, "wb"); if (NULL == fp) return 0; fputs("line 1\n", fp); fputs("line 2\n", fp); fclose(fp); - + fp = fopen(filename, "rb+"); if (NULL == fp) return 0; @@ -58,7 +58,7 @@ if test "$ac_cv_func_crypt" = "no"; then AC_DEFINE(HAVE_CRYPT, 1, [ ]) ]) fi - + AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ AC_TRY_RUN([ #if HAVE_UNISTD_H @@ -124,7 +124,7 @@ int main() { char salt[15], answer[40]; char *encrypted; - salt[0]='$'; salt[1]='1'; salt[2]='$'; + salt[0]='$'; salt[1]='1'; salt[2]='$'; salt[3]='r'; salt[4]='a'; salt[5]='s'; salt[6]='m'; salt[7]='u'; salt[8]='s'; salt[9]='l'; salt[10]='e'; salt[11]='$'; @@ -267,7 +267,7 @@ else AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des]) fi -dnl +dnl dnl Check for __attribute__ ((__aligned__)) support in the compiler dnl AC_CACHE_CHECK(whether the compiler supports aligned attribute, ac_cv_attribute_aligned,[ @@ -289,7 +289,7 @@ dnl dnl log2 could be used to improve the log function, however it requires C99. The check for log2 should be turned on, dnl as soon as we support C99. AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass mempcpy strpncpy) -AC_FUNC_FNMATCH +AC_FUNC_FNMATCH dnl dnl Check if there is a support means of creating a new process diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index ee1935fe87..deb9692863 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -38,7 +38,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \ '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); PHP_INSTALL_HEADERS("", "ext/standard"); if (PHP_MBREGEX != "no") { - CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma") + CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma") } ADD_MAKEFILE_FRAGMENT(); PHP_INSTALL_HEADERS("", "ext/standard"); diff --git a/ext/standard/html_tables/ents_html5.txt b/ext/standard/html_tables/ents_html5.txt index 18defb29b4..005bebbe20 100644 --- a/ext/standard/html_tables/ents_html5.txt +++ b/ext/standard/html_tables/ents_html5.txt @@ -1,2125 +1,2125 @@ -AElig 000C6 -AMP 00026 -Aacute 000C1 -Abreve 00102 -Acirc 000C2 -Acy 00410 -Afr 1D504 -Agrave 000C0 -Alpha 00391 -Amacr 00100 -And 02A53 -Aogon 00104 -Aopf 1D538 -ApplyFunction 02061 -Aring 000C5 -Ascr 1D49C -Assign 02254 -Atilde 000C3 -Auml 000C4 -Backslash 02216 -Barv 02AE7 -Barwed 02306 -Bcy 00411 -Because 02235 -Bernoullis 0212C -Beta 00392 -Bfr 1D505 -Bopf 1D539 -Breve 002D8 -Bscr 0212C -Bumpeq 0224E -CHcy 00427 -COPY 000A9 -Cacute 00106 -Cap 022D2 -CapitalDifferentialD 02145 -Cayleys 0212D -Ccaron 0010C -Ccedil 000C7 -Ccirc 00108 -Cconint 02230 -Cdot 0010A -Cedilla 000B8 -CenterDot 000B7 -Cfr 0212D -Chi 003A7 -CircleDot 02299 -CircleMinus 02296 -CirclePlus 02295 -CircleTimes 02297 -ClockwiseContourIntegral 02232 -CloseCurlyDoubleQuote 0201D -CloseCurlyQuote 02019 -Colon 02237 -Colone 02A74 -Congruent 02261 -Conint 0222F -ContourIntegral 0222E -Copf 02102 -Coproduct 02210 -CounterClockwiseContourIntegral 02233 -Cross 02A2F -Cscr 1D49E -Cup 022D3 -CupCap 0224D -DD 02145 -DDotrahd 02911 -DJcy 00402 -DScy 00405 -DZcy 0040F -Dagger 02021 -Darr 021A1 -Dashv 02AE4 -Dcaron 0010E -Dcy 00414 -Del 02207 -Delta 00394 -Dfr 1D507 -DiacriticalAcute 000B4 -DiacriticalDot 002D9 -DiacriticalDoubleAcute 002DD -DiacriticalGrave 00060 -DiacriticalTilde 002DC -Diamond 022C4 -DifferentialD 02146 -Dopf 1D53B -Dot 000A8 -DotDot 020DC -DotEqual 02250 -DoubleContourIntegral 0222F -DoubleDot 000A8 -DoubleDownArrow 021D3 -DoubleLeftArrow 021D0 -DoubleLeftRightArrow 021D4 -DoubleLeftTee 02AE4 -DoubleLongLeftArrow 027F8 -DoubleLongLeftRightArrow 027FA -DoubleLongRightArrow 027F9 -DoubleRightArrow 021D2 -DoubleRightTee 022A8 -DoubleUpArrow 021D1 -DoubleUpDownArrow 021D5 -DoubleVerticalBar 02225 -DownArrow 02193 -DownArrowBar 02913 -DownArrowUpArrow 021F5 -DownBreve 00311 -DownLeftRightVector 02950 -DownLeftTeeVector 0295E -DownLeftVector 021BD -DownLeftVectorBar 02956 -DownRightTeeVector 0295F -DownRightVector 021C1 -DownRightVectorBar 02957 -DownTee 022A4 -DownTeeArrow 021A7 -Downarrow 021D3 -Dscr 1D49F -Dstrok 00110 -ENG 0014A -ETH 000D0 -Eacute 000C9 -Ecaron 0011A -Ecirc 000CA -Ecy 0042D -Edot 00116 -Efr 1D508 -Egrave 000C8 -Element 02208 -Emacr 00112 -EmptySmallSquare 025FB -EmptyVerySmallSquare 025AB -Eogon 00118 -Eopf 1D53C -Epsilon 00395 -Equal 02A75 -EqualTilde 02242 -Equilibrium 021CC -Escr 02130 -Esim 02A73 -Eta 00397 -Euml 000CB -Exists 02203 -ExponentialE 02147 -Fcy 00424 -Ffr 1D509 -FilledSmallSquare 025FC -FilledVerySmallSquare 025AA -Fopf 1D53D -ForAll 02200 -Fouriertrf 02131 -Fscr 02131 -GJcy 00403 -GT 0003E -Gamma 00393 -Gammad 003DC -Gbreve 0011E -Gcedil 00122 -Gcirc 0011C -Gcy 00413 -Gdot 00120 -Gfr 1D50A -Gg 022D9 -Gopf 1D53E -GreaterEqual 02265 -GreaterEqualLess 022DB -GreaterFullEqual 02267 -GreaterGreater 02AA2 -GreaterLess 02277 -GreaterSlantEqual 02A7E -GreaterTilde 02273 -Gscr 1D4A2 -Gt 0226B -HARDcy 0042A -Hacek 002C7 -Hat 0005E -Hcirc 00124 -Hfr 0210C -HilbertSpace 0210B -Hopf 0210D -HorizontalLine 02500 -Hscr 0210B -Hstrok 00126 -HumpDownHump 0224E -HumpEqual 0224F -IEcy 00415 -IJlig 00132 -IOcy 00401 -Iacute 000CD -Icirc 000CE -Icy 00418 -Idot 00130 -Ifr 02111 -Igrave 000CC -Im 02111 -Imacr 0012A -ImaginaryI 02148 -Implies 021D2 -Int 0222C -Integral 0222B -Intersection 022C2 -InvisibleComma 02063 -InvisibleTimes 02062 -Iogon 0012E -Iopf 1D540 -Iota 00399 -Iscr 02110 -Itilde 00128 -Iukcy 00406 -Iuml 000CF -Jcirc 00134 -Jcy 00419 -Jfr 1D50D -Jopf 1D541 -Jscr 1D4A5 -Jsercy 00408 -Jukcy 00404 -KHcy 00425 -KJcy 0040C -Kappa 0039A -Kcedil 00136 -Kcy 0041A -Kfr 1D50E -Kopf 1D542 -Kscr 1D4A6 -LJcy 00409 -LT 0003C -Lacute 00139 -Lambda 0039B -Lang 027EA -Laplacetrf 02112 -Larr 0219E -Lcaron 0013D -Lcedil 0013B -Lcy 0041B -LeftAngleBracket 027E8 -LeftArrow 02190 -LeftArrowBar 021E4 -LeftArrowRightArrow 021C6 -LeftCeiling 02308 -LeftDoubleBracket 027E6 -LeftDownTeeVector 02961 -LeftDownVector 021C3 -LeftDownVectorBar 02959 -LeftFloor 0230A -LeftRightArrow 02194 -LeftRightVector 0294E -LeftTee 022A3 -LeftTeeArrow 021A4 -LeftTeeVector 0295A -LeftTriangle 022B2 -LeftTriangleBar 029CF -LeftTriangleEqual 022B4 -LeftUpDownVector 02951 -LeftUpTeeVector 02960 -LeftUpVector 021BF -LeftUpVectorBar 02958 -LeftVector 021BC -LeftVectorBar 02952 -Leftarrow 021D0 -Leftrightarrow 021D4 -LessEqualGreater 022DA -LessFullEqual 02266 -LessGreater 02276 -LessLess 02AA1 -LessSlantEqual 02A7D -LessTilde 02272 -Lfr 1D50F -Ll 022D8 -Lleftarrow 021DA -Lmidot 0013F -LongLeftArrow 027F5 -LongLeftRightArrow 027F7 -LongRightArrow 027F6 -Longleftarrow 027F8 -Longleftrightarrow 027FA -Longrightarrow 027F9 -Lopf 1D543 -LowerLeftArrow 02199 -LowerRightArrow 02198 -Lscr 02112 -Lsh 021B0 -Lstrok 00141 -Lt 0226A -Map 02905 -Mcy 0041C -MediumSpace 0205F -Mellintrf 02133 -Mfr 1D510 -MinusPlus 02213 -Mopf 1D544 -Mscr 02133 -Mu 0039C -NJcy 0040A -Nacute 00143 -Ncaron 00147 -Ncedil 00145 -Ncy 0041D -NegativeMediumSpace 0200B -NegativeThickSpace 0200B -NegativeThinSpace 0200B -NegativeVeryThinSpace 0200B -NestedGreaterGreater 0226B -NestedLessLess 0226A -NewLine 0000A -Nfr 1D511 -NoBreak 02060 -NonBreakingSpace 000A0 -Nopf 02115 -Not 02AEC -NotCongruent 02262 -NotCupCap 0226D -NotDoubleVerticalBar 02226 -NotElement 02209 -NotEqual 02260 +AElig 000C6 +AMP 00026 +Aacute 000C1 +Abreve 00102 +Acirc 000C2 +Acy 00410 +Afr 1D504 +Agrave 000C0 +Alpha 00391 +Amacr 00100 +And 02A53 +Aogon 00104 +Aopf 1D538 +ApplyFunction 02061 +Aring 000C5 +Ascr 1D49C +Assign 02254 +Atilde 000C3 +Auml 000C4 +Backslash 02216 +Barv 02AE7 +Barwed 02306 +Bcy 00411 +Because 02235 +Bernoullis 0212C +Beta 00392 +Bfr 1D505 +Bopf 1D539 +Breve 002D8 +Bscr 0212C +Bumpeq 0224E +CHcy 00427 +COPY 000A9 +Cacute 00106 +Cap 022D2 +CapitalDifferentialD 02145 +Cayleys 0212D +Ccaron 0010C +Ccedil 000C7 +Ccirc 00108 +Cconint 02230 +Cdot 0010A +Cedilla 000B8 +CenterDot 000B7 +Cfr 0212D +Chi 003A7 +CircleDot 02299 +CircleMinus 02296 +CirclePlus 02295 +CircleTimes 02297 +ClockwiseContourIntegral 02232 +CloseCurlyDoubleQuote 0201D +CloseCurlyQuote 02019 +Colon 02237 +Colone 02A74 +Congruent 02261 +Conint 0222F +ContourIntegral 0222E +Copf 02102 +Coproduct 02210 +CounterClockwiseContourIntegral 02233 +Cross 02A2F +Cscr 1D49E +Cup 022D3 +CupCap 0224D +DD 02145 +DDotrahd 02911 +DJcy 00402 +DScy 00405 +DZcy 0040F +Dagger 02021 +Darr 021A1 +Dashv 02AE4 +Dcaron 0010E +Dcy 00414 +Del 02207 +Delta 00394 +Dfr 1D507 +DiacriticalAcute 000B4 +DiacriticalDot 002D9 +DiacriticalDoubleAcute 002DD +DiacriticalGrave 00060 +DiacriticalTilde 002DC +Diamond 022C4 +DifferentialD 02146 +Dopf 1D53B +Dot 000A8 +DotDot 020DC +DotEqual 02250 +DoubleContourIntegral 0222F +DoubleDot 000A8 +DoubleDownArrow 021D3 +DoubleLeftArrow 021D0 +DoubleLeftRightArrow 021D4 +DoubleLeftTee 02AE4 +DoubleLongLeftArrow 027F8 +DoubleLongLeftRightArrow 027FA +DoubleLongRightArrow 027F9 +DoubleRightArrow 021D2 +DoubleRightTee 022A8 +DoubleUpArrow 021D1 +DoubleUpDownArrow 021D5 +DoubleVerticalBar 02225 +DownArrow 02193 +DownArrowBar 02913 +DownArrowUpArrow 021F5 +DownBreve 00311 +DownLeftRightVector 02950 +DownLeftTeeVector 0295E +DownLeftVector 021BD +DownLeftVectorBar 02956 +DownRightTeeVector 0295F +DownRightVector 021C1 +DownRightVectorBar 02957 +DownTee 022A4 +DownTeeArrow 021A7 +Downarrow 021D3 +Dscr 1D49F +Dstrok 00110 +ENG 0014A +ETH 000D0 +Eacute 000C9 +Ecaron 0011A +Ecirc 000CA +Ecy 0042D +Edot 00116 +Efr 1D508 +Egrave 000C8 +Element 02208 +Emacr 00112 +EmptySmallSquare 025FB +EmptyVerySmallSquare 025AB +Eogon 00118 +Eopf 1D53C +Epsilon 00395 +Equal 02A75 +EqualTilde 02242 +Equilibrium 021CC +Escr 02130 +Esim 02A73 +Eta 00397 +Euml 000CB +Exists 02203 +ExponentialE 02147 +Fcy 00424 +Ffr 1D509 +FilledSmallSquare 025FC +FilledVerySmallSquare 025AA +Fopf 1D53D +ForAll 02200 +Fouriertrf 02131 +Fscr 02131 +GJcy 00403 +GT 0003E +Gamma 00393 +Gammad 003DC +Gbreve 0011E +Gcedil 00122 +Gcirc 0011C +Gcy 00413 +Gdot 00120 +Gfr 1D50A +Gg 022D9 +Gopf 1D53E +GreaterEqual 02265 +GreaterEqualLess 022DB +GreaterFullEqual 02267 +GreaterGreater 02AA2 +GreaterLess 02277 +GreaterSlantEqual 02A7E +GreaterTilde 02273 +Gscr 1D4A2 +Gt 0226B +HARDcy 0042A +Hacek 002C7 +Hat 0005E +Hcirc 00124 +Hfr 0210C +HilbertSpace 0210B +Hopf 0210D +HorizontalLine 02500 +Hscr 0210B +Hstrok 00126 +HumpDownHump 0224E +HumpEqual 0224F +IEcy 00415 +IJlig 00132 +IOcy 00401 +Iacute 000CD +Icirc 000CE +Icy 00418 +Idot 00130 +Ifr 02111 +Igrave 000CC +Im 02111 +Imacr 0012A +ImaginaryI 02148 +Implies 021D2 +Int 0222C +Integral 0222B +Intersection 022C2 +InvisibleComma 02063 +InvisibleTimes 02062 +Iogon 0012E +Iopf 1D540 +Iota 00399 +Iscr 02110 +Itilde 00128 +Iukcy 00406 +Iuml 000CF +Jcirc 00134 +Jcy 00419 +Jfr 1D50D +Jopf 1D541 +Jscr 1D4A5 +Jsercy 00408 +Jukcy 00404 +KHcy 00425 +KJcy 0040C +Kappa 0039A +Kcedil 00136 +Kcy 0041A +Kfr 1D50E +Kopf 1D542 +Kscr 1D4A6 +LJcy 00409 +LT 0003C +Lacute 00139 +Lambda 0039B +Lang 027EA +Laplacetrf 02112 +Larr 0219E +Lcaron 0013D +Lcedil 0013B +Lcy 0041B +LeftAngleBracket 027E8 +LeftArrow 02190 +LeftArrowBar 021E4 +LeftArrowRightArrow 021C6 +LeftCeiling 02308 +LeftDoubleBracket 027E6 +LeftDownTeeVector 02961 +LeftDownVector 021C3 +LeftDownVectorBar 02959 +LeftFloor 0230A +LeftRightArrow 02194 +LeftRightVector 0294E +LeftTee 022A3 +LeftTeeArrow 021A4 +LeftTeeVector 0295A +LeftTriangle 022B2 +LeftTriangleBar 029CF +LeftTriangleEqual 022B4 +LeftUpDownVector 02951 +LeftUpTeeVector 02960 +LeftUpVector 021BF +LeftUpVectorBar 02958 +LeftVector 021BC +LeftVectorBar 02952 +Leftarrow 021D0 +Leftrightarrow 021D4 +LessEqualGreater 022DA +LessFullEqual 02266 +LessGreater 02276 +LessLess 02AA1 +LessSlantEqual 02A7D +LessTilde 02272 +Lfr 1D50F +Ll 022D8 +Lleftarrow 021DA +Lmidot 0013F +LongLeftArrow 027F5 +LongLeftRightArrow 027F7 +LongRightArrow 027F6 +Longleftarrow 027F8 +Longleftrightarrow 027FA +Longrightarrow 027F9 +Lopf 1D543 +LowerLeftArrow 02199 +LowerRightArrow 02198 +Lscr 02112 +Lsh 021B0 +Lstrok 00141 +Lt 0226A +Map 02905 +Mcy 0041C +MediumSpace 0205F +Mellintrf 02133 +Mfr 1D510 +MinusPlus 02213 +Mopf 1D544 +Mscr 02133 +Mu 0039C +NJcy 0040A +Nacute 00143 +Ncaron 00147 +Ncedil 00145 +Ncy 0041D +NegativeMediumSpace 0200B +NegativeThickSpace 0200B +NegativeThinSpace 0200B +NegativeVeryThinSpace 0200B +NestedGreaterGreater 0226B +NestedLessLess 0226A +NewLine 0000A +Nfr 1D511 +NoBreak 02060 +NonBreakingSpace 000A0 +Nopf 02115 +Not 02AEC +NotCongruent 02262 +NotCupCap 0226D +NotDoubleVerticalBar 02226 +NotElement 02209 +NotEqual 02260 NotEqualTilde 02242 00338 -NotExists 02204 -NotGreater 0226F -NotGreaterEqual 02271 +NotExists 02204 +NotGreater 0226F +NotGreaterEqual 02271 NotGreaterFullEqual 02267 00338 NotGreaterGreater 0226B 00338 -NotGreaterLess 02279 +NotGreaterLess 02279 NotGreaterSlantEqual 02A7E 00338 -NotGreaterTilde 02275 +NotGreaterTilde 02275 NotHumpDownHump 0224E 00338 NotHumpEqual 0224F 00338 -NotLeftTriangle 022EA +NotLeftTriangle 022EA NotLeftTriangleBar 029CF 00338 -NotLeftTriangleEqual 022EC -NotLess 0226E -NotLessEqual 02270 -NotLessGreater 02278 +NotLeftTriangleEqual 022EC +NotLess 0226E +NotLessEqual 02270 +NotLessGreater 02278 NotLessLess 0226A 00338 NotLessSlantEqual 02A7D 00338 -NotLessTilde 02274 +NotLessTilde 02274 NotNestedGreaterGreater 02AA2 00338 NotNestedLessLess 02AA1 00338 -NotPrecedes 02280 +NotPrecedes 02280 NotPrecedesEqual 02AAF 00338 -NotPrecedesSlantEqual 022E0 -NotReverseElement 0220C -NotRightTriangle 022EB +NotPrecedesSlantEqual 022E0 +NotReverseElement 0220C +NotRightTriangle 022EB NotRightTriangleBar 029D0 00338 -NotRightTriangleEqual 022ED +NotRightTriangleEqual 022ED NotSquareSubset 0228F 00338 -NotSquareSubsetEqual 022E2 +NotSquareSubsetEqual 022E2 NotSquareSuperset 02290 00338 -NotSquareSupersetEqual 022E3 +NotSquareSupersetEqual 022E3 NotSubset 02282 020D2 -NotSubsetEqual 02288 -NotSucceeds 02281 +NotSubsetEqual 02288 +NotSucceeds 02281 NotSucceedsEqual 02AB0 00338 -NotSucceedsSlantEqual 022E1 +NotSucceedsSlantEqual 022E1 NotSucceedsTilde 0227F 00338 NotSuperset 02283 020D2 -NotSupersetEqual 02289 -NotTilde 02241 -NotTildeEqual 02244 -NotTildeFullEqual 02247 -NotTildeTilde 02249 -NotVerticalBar 02224 -Nscr 1D4A9 -Ntilde 000D1 -Nu 0039D -OElig 00152 -Oacute 000D3 -Ocirc 000D4 -Ocy 0041E -Odblac 00150 -Ofr 1D512 -Ograve 000D2 -Omacr 0014C -Omega 003A9 -Omicron 0039F -Oopf 1D546 -OpenCurlyDoubleQuote 0201C -OpenCurlyQuote 02018 -Or 02A54 -Oscr 1D4AA -Oslash 000D8 -Otilde 000D5 -Otimes 02A37 -Ouml 000D6 -OverBar 0203E -OverBrace 023DE -OverBracket 023B4 -OverParenthesis 023DC -PartialD 02202 -Pcy 0041F -Pfr 1D513 -Phi 003A6 -Pi 003A0 -PlusMinus 000B1 -Poincareplane 0210C -Popf 02119 -Pr 02ABB -Precedes 0227A -PrecedesEqual 02AAF -PrecedesSlantEqual 0227C -PrecedesTilde 0227E -Prime 02033 -Product 0220F -Proportion 02237 -Proportional 0221D -Pscr 1D4AB -Psi 003A8 -QUOT 00022 -Qfr 1D514 -Qopf 0211A -Qscr 1D4AC -RBarr 02910 -REG 000AE -Racute 00154 -Rang 027EB -Rarr 021A0 -Rarrtl 02916 -Rcaron 00158 -Rcedil 00156 -Rcy 00420 -Re 0211C -ReverseElement 0220B -ReverseEquilibrium 021CB -ReverseUpEquilibrium 0296F -Rfr 0211C -Rho 003A1 -RightAngleBracket 027E9 -RightArrow 02192 -RightArrowBar 021E5 -RightArrowLeftArrow 021C4 -RightCeiling 02309 -RightDoubleBracket 027E7 -RightDownTeeVector 0295D -RightDownVector 021C2 -RightDownVectorBar 02955 -RightFloor 0230B -RightTee 022A2 -RightTeeArrow 021A6 -RightTeeVector 0295B -RightTriangle 022B3 -RightTriangleBar 029D0 -RightTriangleEqual 022B5 -RightUpDownVector 0294F -RightUpTeeVector 0295C -RightUpVector 021BE -RightUpVectorBar 02954 -RightVector 021C0 -RightVectorBar 02953 -Rightarrow 021D2 -Ropf 0211D -RoundImplies 02970 -Rrightarrow 021DB -Rscr 0211B -Rsh 021B1 -RuleDelayed 029F4 -SHCHcy 00429 -SHcy 00428 -SOFTcy 0042C -Sacute 0015A -Sc 02ABC -Scaron 00160 -Scedil 0015E -Scirc 0015C -Scy 00421 -Sfr 1D516 -ShortDownArrow 02193 -ShortLeftArrow 02190 -ShortRightArrow 02192 -ShortUpArrow 02191 -Sigma 003A3 -SmallCircle 02218 -Sopf 1D54A -Sqrt 0221A -Square 025A1 -SquareIntersection 02293 -SquareSubset 0228F -SquareSubsetEqual 02291 -SquareSuperset 02290 -SquareSupersetEqual 02292 -SquareUnion 02294 -Sscr 1D4AE -Star 022C6 -Sub 022D0 -Subset 022D0 -SubsetEqual 02286 -Succeeds 0227B -SucceedsEqual 02AB0 -SucceedsSlantEqual 0227D -SucceedsTilde 0227F -SuchThat 0220B -Sum 02211 -Sup 022D1 -Superset 02283 -SupersetEqual 02287 -Supset 022D1 -THORN 000DE -TRADE 02122 -TSHcy 0040B -TScy 00426 -Tab 00009 -Tau 003A4 -Tcaron 00164 -Tcedil 00162 -Tcy 00422 -Tfr 1D517 -Therefore 02234 -Theta 00398 +NotSupersetEqual 02289 +NotTilde 02241 +NotTildeEqual 02244 +NotTildeFullEqual 02247 +NotTildeTilde 02249 +NotVerticalBar 02224 +Nscr 1D4A9 +Ntilde 000D1 +Nu 0039D +OElig 00152 +Oacute 000D3 +Ocirc 000D4 +Ocy 0041E +Odblac 00150 +Ofr 1D512 +Ograve 000D2 +Omacr 0014C +Omega 003A9 +Omicron 0039F +Oopf 1D546 +OpenCurlyDoubleQuote 0201C +OpenCurlyQuote 02018 +Or 02A54 +Oscr 1D4AA +Oslash 000D8 +Otilde 000D5 +Otimes 02A37 +Ouml 000D6 +OverBar 0203E +OverBrace 023DE +OverBracket 023B4 +OverParenthesis 023DC +PartialD 02202 +Pcy 0041F +Pfr 1D513 +Phi 003A6 +Pi 003A0 +PlusMinus 000B1 +Poincareplane 0210C +Popf 02119 +Pr 02ABB +Precedes 0227A +PrecedesEqual 02AAF +PrecedesSlantEqual 0227C +PrecedesTilde 0227E +Prime 02033 +Product 0220F +Proportion 02237 +Proportional 0221D +Pscr 1D4AB +Psi 003A8 +QUOT 00022 +Qfr 1D514 +Qopf 0211A +Qscr 1D4AC +RBarr 02910 +REG 000AE +Racute 00154 +Rang 027EB +Rarr 021A0 +Rarrtl 02916 +Rcaron 00158 +Rcedil 00156 +Rcy 00420 +Re 0211C +ReverseElement 0220B +ReverseEquilibrium 021CB +ReverseUpEquilibrium 0296F +Rfr 0211C +Rho 003A1 +RightAngleBracket 027E9 +RightArrow 02192 +RightArrowBar 021E5 +RightArrowLeftArrow 021C4 +RightCeiling 02309 +RightDoubleBracket 027E7 +RightDownTeeVector 0295D +RightDownVector 021C2 +RightDownVectorBar 02955 +RightFloor 0230B +RightTee 022A2 +RightTeeArrow 021A6 +RightTeeVector 0295B +RightTriangle 022B3 +RightTriangleBar 029D0 +RightTriangleEqual 022B5 +RightUpDownVector 0294F +RightUpTeeVector 0295C +RightUpVector 021BE +RightUpVectorBar 02954 +RightVector 021C0 +RightVectorBar 02953 +Rightarrow 021D2 +Ropf 0211D +RoundImplies 02970 +Rrightarrow 021DB +Rscr 0211B +Rsh 021B1 +RuleDelayed 029F4 +SHCHcy 00429 +SHcy 00428 +SOFTcy 0042C +Sacute 0015A +Sc 02ABC +Scaron 00160 +Scedil 0015E +Scirc 0015C +Scy 00421 +Sfr 1D516 +ShortDownArrow 02193 +ShortLeftArrow 02190 +ShortRightArrow 02192 +ShortUpArrow 02191 +Sigma 003A3 +SmallCircle 02218 +Sopf 1D54A +Sqrt 0221A +Square 025A1 +SquareIntersection 02293 +SquareSubset 0228F +SquareSubsetEqual 02291 +SquareSuperset 02290 +SquareSupersetEqual 02292 +SquareUnion 02294 +Sscr 1D4AE +Star 022C6 +Sub 022D0 +Subset 022D0 +SubsetEqual 02286 +Succeeds 0227B +SucceedsEqual 02AB0 +SucceedsSlantEqual 0227D +SucceedsTilde 0227F +SuchThat 0220B +Sum 02211 +Sup 022D1 +Superset 02283 +SupersetEqual 02287 +Supset 022D1 +THORN 000DE +TRADE 02122 +TSHcy 0040B +TScy 00426 +Tab 00009 +Tau 003A4 +Tcaron 00164 +Tcedil 00162 +Tcy 00422 +Tfr 1D517 +Therefore 02234 +Theta 00398 ThickSpace 0205F 0200A -ThinSpace 02009 -Tilde 0223C -TildeEqual 02243 -TildeFullEqual 02245 -TildeTilde 02248 -Topf 1D54B -TripleDot 020DB -Tscr 1D4AF -Tstrok 00166 -Uacute 000DA -Uarr 0219F -Uarrocir 02949 -Ubrcy 0040E -Ubreve 0016C -Ucirc 000DB -Ucy 00423 -Udblac 00170 -Ufr 1D518 -Ugrave 000D9 -Umacr 0016A -UnderBar 0005F -UnderBrace 023DF -UnderBracket 023B5 -UnderParenthesis 023DD -Union 022C3 -UnionPlus 0228E -Uogon 00172 -Uopf 1D54C -UpArrow 02191 -UpArrowBar 02912 -UpArrowDownArrow 021C5 -UpDownArrow 02195 -UpEquilibrium 0296E -UpTee 022A5 -UpTeeArrow 021A5 -Uparrow 021D1 -Updownarrow 021D5 -UpperLeftArrow 02196 -UpperRightArrow 02197 -Upsi 003D2 -Upsilon 003A5 -Uring 0016E -Uscr 1D4B0 -Utilde 00168 -Uuml 000DC -VDash 022AB -Vbar 02AEB -Vcy 00412 -Vdash 022A9 -Vdashl 02AE6 -Vee 022C1 -Verbar 02016 -Vert 02016 -VerticalBar 02223 -VerticalLine 0007C -VerticalSeparator 02758 -VerticalTilde 02240 -VeryThinSpace 0200A -Vfr 1D519 -Vopf 1D54D -Vscr 1D4B1 -Vvdash 022AA -Wcirc 00174 -Wedge 022C0 -Wfr 1D51A -Wopf 1D54E -Wscr 1D4B2 -Xfr 1D51B -Xi 0039E -Xopf 1D54F -Xscr 1D4B3 -YAcy 0042F -YIcy 00407 -YUcy 0042E -Yacute 000DD -Ycirc 00176 -Ycy 0042B -Yfr 1D51C -Yopf 1D550 -Yscr 1D4B4 -Yuml 00178 -ZHcy 00416 -Zacute 00179 -Zcaron 0017D -Zcy 00417 -Zdot 0017B -ZeroWidthSpace 0200B -Zeta 00396 -Zfr 02128 -Zopf 02124 -Zscr 1D4B5 -aacute 000E1 -abreve 00103 -ac 0223E +ThinSpace 02009 +Tilde 0223C +TildeEqual 02243 +TildeFullEqual 02245 +TildeTilde 02248 +Topf 1D54B +TripleDot 020DB +Tscr 1D4AF +Tstrok 00166 +Uacute 000DA +Uarr 0219F +Uarrocir 02949 +Ubrcy 0040E +Ubreve 0016C +Ucirc 000DB +Ucy 00423 +Udblac 00170 +Ufr 1D518 +Ugrave 000D9 +Umacr 0016A +UnderBar 0005F +UnderBrace 023DF +UnderBracket 023B5 +UnderParenthesis 023DD +Union 022C3 +UnionPlus 0228E +Uogon 00172 +Uopf 1D54C +UpArrow 02191 +UpArrowBar 02912 +UpArrowDownArrow 021C5 +UpDownArrow 02195 +UpEquilibrium 0296E +UpTee 022A5 +UpTeeArrow 021A5 +Uparrow 021D1 +Updownarrow 021D5 +UpperLeftArrow 02196 +UpperRightArrow 02197 +Upsi 003D2 +Upsilon 003A5 +Uring 0016E +Uscr 1D4B0 +Utilde 00168 +Uuml 000DC +VDash 022AB +Vbar 02AEB +Vcy 00412 +Vdash 022A9 +Vdashl 02AE6 +Vee 022C1 +Verbar 02016 +Vert 02016 +VerticalBar 02223 +VerticalLine 0007C +VerticalSeparator 02758 +VerticalTilde 02240 +VeryThinSpace 0200A +Vfr 1D519 +Vopf 1D54D +Vscr 1D4B1 +Vvdash 022AA +Wcirc 00174 +Wedge 022C0 +Wfr 1D51A +Wopf 1D54E +Wscr 1D4B2 +Xfr 1D51B +Xi 0039E +Xopf 1D54F +Xscr 1D4B3 +YAcy 0042F +YIcy 00407 +YUcy 0042E +Yacute 000DD +Ycirc 00176 +Ycy 0042B +Yfr 1D51C +Yopf 1D550 +Yscr 1D4B4 +Yuml 00178 +ZHcy 00416 +Zacute 00179 +Zcaron 0017D +Zcy 00417 +Zdot 0017B +ZeroWidthSpace 0200B +Zeta 00396 +Zfr 02128 +Zopf 02124 +Zscr 1D4B5 +aacute 000E1 +abreve 00103 +ac 0223E acE 0223E 00333 -acd 0223F -acirc 000E2 -acute 000B4 -acy 00430 -aelig 000E6 -af 02061 -afr 1D51E -agrave 000E0 -alefsym 02135 -aleph 02135 -alpha 003B1 -amacr 00101 -amalg 02A3F -amp 00026 -and 02227 -andand 02A55 -andd 02A5C -andslope 02A58 -andv 02A5A -ang 02220 -ange 029A4 -angle 02220 -angmsd 02221 -angmsdaa 029A8 -angmsdab 029A9 -angmsdac 029AA -angmsdad 029AB -angmsdae 029AC -angmsdaf 029AD -angmsdag 029AE -angmsdah 029AF -angrt 0221F -angrtvb 022BE -angrtvbd 0299D -angsph 02222 -angst 000C5 -angzarr 0237C -aogon 00105 -aopf 1D552 -ap 02248 -apE 02A70 -apacir 02A6F -ape 0224A -apid 0224B -apos 00027 -approx 02248 -approxeq 0224A -aring 000E5 -ascr 1D4B6 -ast 0002A -asymp 02248 -asympeq 0224D -atilde 000E3 -auml 000E4 -awconint 02233 -awint 02A11 -bNot 02AED -backcong 0224C -backepsilon 003F6 -backprime 02035 -backsim 0223D -backsimeq 022CD -barvee 022BD -barwed 02305 -barwedge 02305 -bbrk 023B5 -bbrktbrk 023B6 -bcong 0224C -bcy 00431 -bdquo 0201E -becaus 02235 -because 02235 -bemptyv 029B0 -bepsi 003F6 -bernou 0212C -beta 003B2 -beth 02136 -between 0226C -bfr 1D51F -bigcap 022C2 -bigcirc 025EF -bigcup 022C3 -bigodot 02A00 -bigoplus 02A01 -bigotimes 02A02 -bigsqcup 02A06 -bigstar 02605 -bigtriangledown 025BD -bigtriangleup 025B3 -biguplus 02A04 -bigvee 022C1 -bigwedge 022C0 -bkarow 0290D -blacklozenge 029EB -blacksquare 025AA -blacktriangle 025B4 -blacktriangledown 025BE -blacktriangleleft 025C2 -blacktriangleright 025B8 -blank 02423 -blk12 02592 -blk14 02591 -blk34 02593 -block 02588 +acd 0223F +acirc 000E2 +acute 000B4 +acy 00430 +aelig 000E6 +af 02061 +afr 1D51E +agrave 000E0 +alefsym 02135 +aleph 02135 +alpha 003B1 +amacr 00101 +amalg 02A3F +amp 00026 +and 02227 +andand 02A55 +andd 02A5C +andslope 02A58 +andv 02A5A +ang 02220 +ange 029A4 +angle 02220 +angmsd 02221 +angmsdaa 029A8 +angmsdab 029A9 +angmsdac 029AA +angmsdad 029AB +angmsdae 029AC +angmsdaf 029AD +angmsdag 029AE +angmsdah 029AF +angrt 0221F +angrtvb 022BE +angrtvbd 0299D +angsph 02222 +angst 000C5 +angzarr 0237C +aogon 00105 +aopf 1D552 +ap 02248 +apE 02A70 +apacir 02A6F +ape 0224A +apid 0224B +apos 00027 +approx 02248 +approxeq 0224A +aring 000E5 +ascr 1D4B6 +ast 0002A +asymp 02248 +asympeq 0224D +atilde 000E3 +auml 000E4 +awconint 02233 +awint 02A11 +bNot 02AED +backcong 0224C +backepsilon 003F6 +backprime 02035 +backsim 0223D +backsimeq 022CD +barvee 022BD +barwed 02305 +barwedge 02305 +bbrk 023B5 +bbrktbrk 023B6 +bcong 0224C +bcy 00431 +bdquo 0201E +becaus 02235 +because 02235 +bemptyv 029B0 +bepsi 003F6 +bernou 0212C +beta 003B2 +beth 02136 +between 0226C +bfr 1D51F +bigcap 022C2 +bigcirc 025EF +bigcup 022C3 +bigodot 02A00 +bigoplus 02A01 +bigotimes 02A02 +bigsqcup 02A06 +bigstar 02605 +bigtriangledown 025BD +bigtriangleup 025B3 +biguplus 02A04 +bigvee 022C1 +bigwedge 022C0 +bkarow 0290D +blacklozenge 029EB +blacksquare 025AA +blacktriangle 025B4 +blacktriangledown 025BE +blacktriangleleft 025C2 +blacktriangleright 025B8 +blank 02423 +blk12 02592 +blk14 02591 +blk34 02593 +block 02588 bne 0003D 020E5 bnequiv 02261 020E5 -bnot 02310 -bopf 1D553 -bot 022A5 -bottom 022A5 -bowtie 022C8 -boxDL 02557 -boxDR 02554 -boxDl 02556 -boxDr 02553 -boxH 02550 -boxHD 02566 -boxHU 02569 -boxHd 02564 -boxHu 02567 -boxUL 0255D -boxUR 0255A -boxUl 0255C -boxUr 02559 -boxV 02551 -boxVH 0256C -boxVL 02563 -boxVR 02560 -boxVh 0256B -boxVl 02562 -boxVr 0255F -boxbox 029C9 -boxdL 02555 -boxdR 02552 -boxdl 02510 -boxdr 0250C -boxh 02500 -boxhD 02565 -boxhU 02568 -boxhd 0252C -boxhu 02534 -boxminus 0229F -boxplus 0229E -boxtimes 022A0 -boxuL 0255B -boxuR 02558 -boxul 02518 -boxur 02514 -boxv 02502 -boxvH 0256A -boxvL 02561 -boxvR 0255E -boxvh 0253C -boxvl 02524 -boxvr 0251C -bprime 02035 -breve 002D8 -brvbar 000A6 -bscr 1D4B7 -bsemi 0204F -bsim 0223D -bsime 022CD -bsol 0005C -bsolb 029C5 -bsolhsub 027C8 -bull 02022 -bullet 02022 -bump 0224E -bumpE 02AAE -bumpe 0224F -bumpeq 0224F -cacute 00107 -cap 02229 -capand 02A44 -capbrcup 02A49 -capcap 02A4B -capcup 02A47 -capdot 02A40 +bnot 02310 +bopf 1D553 +bot 022A5 +bottom 022A5 +bowtie 022C8 +boxDL 02557 +boxDR 02554 +boxDl 02556 +boxDr 02553 +boxH 02550 +boxHD 02566 +boxHU 02569 +boxHd 02564 +boxHu 02567 +boxUL 0255D +boxUR 0255A +boxUl 0255C +boxUr 02559 +boxV 02551 +boxVH 0256C +boxVL 02563 +boxVR 02560 +boxVh 0256B +boxVl 02562 +boxVr 0255F +boxbox 029C9 +boxdL 02555 +boxdR 02552 +boxdl 02510 +boxdr 0250C +boxh 02500 +boxhD 02565 +boxhU 02568 +boxhd 0252C +boxhu 02534 +boxminus 0229F +boxplus 0229E +boxtimes 022A0 +boxuL 0255B +boxuR 02558 +boxul 02518 +boxur 02514 +boxv 02502 +boxvH 0256A +boxvL 02561 +boxvR 0255E +boxvh 0253C +boxvl 02524 +boxvr 0251C +bprime 02035 +breve 002D8 +brvbar 000A6 +bscr 1D4B7 +bsemi 0204F +bsim 0223D +bsime 022CD +bsol 0005C +bsolb 029C5 +bsolhsub 027C8 +bull 02022 +bullet 02022 +bump 0224E +bumpE 02AAE +bumpe 0224F +bumpeq 0224F +cacute 00107 +cap 02229 +capand 02A44 +capbrcup 02A49 +capcap 02A4B +capcup 02A47 +capdot 02A40 caps 02229 0FE00 -caret 02041 -caron 002C7 -ccaps 02A4D -ccaron 0010D -ccedil 000E7 -ccirc 00109 -ccups 02A4C -ccupssm 02A50 -cdot 0010B -cedil 000B8 -cemptyv 029B2 -cent 000A2 -centerdot 000B7 -cfr 1D520 -chcy 00447 -check 02713 -checkmark 02713 -chi 003C7 -cir 025CB -cirE 029C3 -circ 002C6 -circeq 02257 -circlearrowleft 021BA -circlearrowright 021BB -circledR 000AE -circledS 024C8 -circledast 0229B -circledcirc 0229A -circleddash 0229D -cire 02257 -cirfnint 02A10 -cirmid 02AEF -cirscir 029C2 -clubs 02663 -clubsuit 02663 -colon 0003A -colone 02254 -coloneq 02254 -comma 0002C -commat 00040 -comp 02201 -compfn 02218 -complement 02201 -complexes 02102 -cong 02245 -congdot 02A6D -conint 0222E -copf 1D554 -coprod 02210 -copy 000A9 -copysr 02117 -crarr 021B5 -cross 02717 -cscr 1D4B8 -csub 02ACF -csube 02AD1 -csup 02AD0 -csupe 02AD2 -ctdot 022EF -cudarrl 02938 -cudarrr 02935 -cuepr 022DE -cuesc 022DF -cularr 021B6 -cularrp 0293D -cup 0222A -cupbrcap 02A48 -cupcap 02A46 -cupcup 02A4A -cupdot 0228D -cupor 02A45 +caret 02041 +caron 002C7 +ccaps 02A4D +ccaron 0010D +ccedil 000E7 +ccirc 00109 +ccups 02A4C +ccupssm 02A50 +cdot 0010B +cedil 000B8 +cemptyv 029B2 +cent 000A2 +centerdot 000B7 +cfr 1D520 +chcy 00447 +check 02713 +checkmark 02713 +chi 003C7 +cir 025CB +cirE 029C3 +circ 002C6 +circeq 02257 +circlearrowleft 021BA +circlearrowright 021BB +circledR 000AE +circledS 024C8 +circledast 0229B +circledcirc 0229A +circleddash 0229D +cire 02257 +cirfnint 02A10 +cirmid 02AEF +cirscir 029C2 +clubs 02663 +clubsuit 02663 +colon 0003A +colone 02254 +coloneq 02254 +comma 0002C +commat 00040 +comp 02201 +compfn 02218 +complement 02201 +complexes 02102 +cong 02245 +congdot 02A6D +conint 0222E +copf 1D554 +coprod 02210 +copy 000A9 +copysr 02117 +crarr 021B5 +cross 02717 +cscr 1D4B8 +csub 02ACF +csube 02AD1 +csup 02AD0 +csupe 02AD2 +ctdot 022EF +cudarrl 02938 +cudarrr 02935 +cuepr 022DE +cuesc 022DF +cularr 021B6 +cularrp 0293D +cup 0222A +cupbrcap 02A48 +cupcap 02A46 +cupcup 02A4A +cupdot 0228D +cupor 02A45 cups 0222A 0FE00 -curarr 021B7 -curarrm 0293C -curlyeqprec 022DE -curlyeqsucc 022DF -curlyvee 022CE -curlywedge 022CF -curren 000A4 -curvearrowleft 021B6 -curvearrowright 021B7 -cuvee 022CE -cuwed 022CF -cwconint 02232 -cwint 02231 -cylcty 0232D -dArr 021D3 -dHar 02965 -dagger 02020 -daleth 02138 -darr 02193 -dash 02010 -dashv 022A3 -dbkarow 0290F -dblac 002DD -dcaron 0010F -dcy 00434 -dd 02146 -ddagger 02021 -ddarr 021CA -ddotseq 02A77 -deg 000B0 -delta 003B4 -demptyv 029B1 -dfisht 0297F -dfr 1D521 -dharl 021C3 -dharr 021C2 -diam 022C4 -diamond 022C4 -diamondsuit 02666 -diams 02666 -die 000A8 -digamma 003DD -disin 022F2 -div 000F7 -divide 000F7 -divideontimes 022C7 -divonx 022C7 -djcy 00452 -dlcorn 0231E -dlcrop 0230D -dollar 00024 -dopf 1D555 -dot 002D9 -doteq 02250 -doteqdot 02251 -dotminus 02238 -dotplus 02214 -dotsquare 022A1 -doublebarwedge 02306 -downarrow 02193 -downdownarrows 021CA -downharpoonleft 021C3 -downharpoonright 021C2 -drbkarow 02910 -drcorn 0231F -drcrop 0230C -dscr 1D4B9 -dscy 00455 -dsol 029F6 -dstrok 00111 -dtdot 022F1 -dtri 025BF -dtrif 025BE -duarr 021F5 -duhar 0296F -dwangle 029A6 -dzcy 0045F -dzigrarr 027FF -eDDot 02A77 -eDot 02251 -eacute 000E9 -easter 02A6E -ecaron 0011B -ecir 02256 -ecirc 000EA -ecolon 02255 -ecy 0044D -edot 00117 -ee 02147 -efDot 02252 -efr 1D522 -eg 02A9A -egrave 000E8 -egs 02A96 -egsdot 02A98 -el 02A99 -elinters 023E7 -ell 02113 -els 02A95 -elsdot 02A97 -emacr 00113 -empty 02205 -emptyset 02205 -emptyv 02205 -emsp 02003 -emsp13 02004 -emsp14 02005 -eng 0014B -ensp 02002 -eogon 00119 -eopf 1D556 -epar 022D5 -eparsl 029E3 -eplus 02A71 -epsi 003B5 -epsilon 003B5 -epsiv 003F5 -eqcirc 02256 -eqcolon 02255 -eqsim 02242 -eqslantgtr 02A96 -eqslantless 02A95 -equals 0003D -equest 0225F -equiv 02261 -equivDD 02A78 -eqvparsl 029E5 -erDot 02253 -erarr 02971 -escr 0212F -esdot 02250 -esim 02242 -eta 003B7 -eth 000F0 -euml 000EB -euro 020AC -excl 00021 -exist 02203 -expectation 02130 -exponentiale 02147 -fallingdotseq 02252 -fcy 00444 -female 02640 -ffilig 0FB03 -fflig 0FB00 -ffllig 0FB04 -ffr 1D523 -filig 0FB01 +curarr 021B7 +curarrm 0293C +curlyeqprec 022DE +curlyeqsucc 022DF +curlyvee 022CE +curlywedge 022CF +curren 000A4 +curvearrowleft 021B6 +curvearrowright 021B7 +cuvee 022CE +cuwed 022CF +cwconint 02232 +cwint 02231 +cylcty 0232D +dArr 021D3 +dHar 02965 +dagger 02020 +daleth 02138 +darr 02193 +dash 02010 +dashv 022A3 +dbkarow 0290F +dblac 002DD +dcaron 0010F +dcy 00434 +dd 02146 +ddagger 02021 +ddarr 021CA +ddotseq 02A77 +deg 000B0 +delta 003B4 +demptyv 029B1 +dfisht 0297F +dfr 1D521 +dharl 021C3 +dharr 021C2 +diam 022C4 +diamond 022C4 +diamondsuit 02666 +diams 02666 +die 000A8 +digamma 003DD +disin 022F2 +div 000F7 +divide 000F7 +divideontimes 022C7 +divonx 022C7 +djcy 00452 +dlcorn 0231E +dlcrop 0230D +dollar 00024 +dopf 1D555 +dot 002D9 +doteq 02250 +doteqdot 02251 +dotminus 02238 +dotplus 02214 +dotsquare 022A1 +doublebarwedge 02306 +downarrow 02193 +downdownarrows 021CA +downharpoonleft 021C3 +downharpoonright 021C2 +drbkarow 02910 +drcorn 0231F +drcrop 0230C +dscr 1D4B9 +dscy 00455 +dsol 029F6 +dstrok 00111 +dtdot 022F1 +dtri 025BF +dtrif 025BE +duarr 021F5 +duhar 0296F +dwangle 029A6 +dzcy 0045F +dzigrarr 027FF +eDDot 02A77 +eDot 02251 +eacute 000E9 +easter 02A6E +ecaron 0011B +ecir 02256 +ecirc 000EA +ecolon 02255 +ecy 0044D +edot 00117 +ee 02147 +efDot 02252 +efr 1D522 +eg 02A9A +egrave 000E8 +egs 02A96 +egsdot 02A98 +el 02A99 +elinters 023E7 +ell 02113 +els 02A95 +elsdot 02A97 +emacr 00113 +empty 02205 +emptyset 02205 +emptyv 02205 +emsp 02003 +emsp13 02004 +emsp14 02005 +eng 0014B +ensp 02002 +eogon 00119 +eopf 1D556 +epar 022D5 +eparsl 029E3 +eplus 02A71 +epsi 003B5 +epsilon 003B5 +epsiv 003F5 +eqcirc 02256 +eqcolon 02255 +eqsim 02242 +eqslantgtr 02A96 +eqslantless 02A95 +equals 0003D +equest 0225F +equiv 02261 +equivDD 02A78 +eqvparsl 029E5 +erDot 02253 +erarr 02971 +escr 0212F +esdot 02250 +esim 02242 +eta 003B7 +eth 000F0 +euml 000EB +euro 020AC +excl 00021 +exist 02203 +expectation 02130 +exponentiale 02147 +fallingdotseq 02252 +fcy 00444 +female 02640 +ffilig 0FB03 +fflig 0FB00 +ffllig 0FB04 +ffr 1D523 +filig 0FB01 fjlig 00066 0006A -flat 0266D -fllig 0FB02 -fltns 025B1 -fnof 00192 -fopf 1D557 -forall 02200 -fork 022D4 -forkv 02AD9 -fpartint 02A0D -frac12 000BD -frac13 02153 -frac14 000BC -frac15 02155 -frac16 02159 -frac18 0215B -frac23 02154 -frac25 02156 -frac34 000BE -frac35 02157 -frac38 0215C -frac45 02158 -frac56 0215A -frac58 0215D -frac78 0215E -frasl 02044 -frown 02322 -fscr 1D4BB -gE 02267 -gEl 02A8C -gacute 001F5 -gamma 003B3 -gammad 003DD -gap 02A86 -gbreve 0011F -gcirc 0011D -gcy 00433 -gdot 00121 -ge 02265 -gel 022DB -geq 02265 -geqq 02267 -geqslant 02A7E -ges 02A7E -gescc 02AA9 -gesdot 02A80 -gesdoto 02A82 -gesdotol 02A84 +flat 0266D +fllig 0FB02 +fltns 025B1 +fnof 00192 +fopf 1D557 +forall 02200 +fork 022D4 +forkv 02AD9 +fpartint 02A0D +frac12 000BD +frac13 02153 +frac14 000BC +frac15 02155 +frac16 02159 +frac18 0215B +frac23 02154 +frac25 02156 +frac34 000BE +frac35 02157 +frac38 0215C +frac45 02158 +frac56 0215A +frac58 0215D +frac78 0215E +frasl 02044 +frown 02322 +fscr 1D4BB +gE 02267 +gEl 02A8C +gacute 001F5 +gamma 003B3 +gammad 003DD +gap 02A86 +gbreve 0011F +gcirc 0011D +gcy 00433 +gdot 00121 +ge 02265 +gel 022DB +geq 02265 +geqq 02267 +geqslant 02A7E +ges 02A7E +gescc 02AA9 +gesdot 02A80 +gesdoto 02A82 +gesdotol 02A84 gesl 022DB 0FE00 -gesles 02A94 -gfr 1D524 -gg 0226B -ggg 022D9 -gimel 02137 -gjcy 00453 -gl 02277 -glE 02A92 -gla 02AA5 -glj 02AA4 -gnE 02269 -gnap 02A8A -gnapprox 02A8A -gne 02A88 -gneq 02A88 -gneqq 02269 -gnsim 022E7 -gopf 1D558 -grave 00060 -gscr 0210A -gsim 02273 -gsime 02A8E -gsiml 02A90 -gt 0003E -gtcc 02AA7 -gtcir 02A7A -gtdot 022D7 -gtlPar 02995 -gtquest 02A7C -gtrapprox 02A86 -gtrarr 02978 -gtrdot 022D7 -gtreqless 022DB -gtreqqless 02A8C -gtrless 02277 -gtrsim 02273 +gesles 02A94 +gfr 1D524 +gg 0226B +ggg 022D9 +gimel 02137 +gjcy 00453 +gl 02277 +glE 02A92 +gla 02AA5 +glj 02AA4 +gnE 02269 +gnap 02A8A +gnapprox 02A8A +gne 02A88 +gneq 02A88 +gneqq 02269 +gnsim 022E7 +gopf 1D558 +grave 00060 +gscr 0210A +gsim 02273 +gsime 02A8E +gsiml 02A90 +gt 0003E +gtcc 02AA7 +gtcir 02A7A +gtdot 022D7 +gtlPar 02995 +gtquest 02A7C +gtrapprox 02A86 +gtrarr 02978 +gtrdot 022D7 +gtreqless 022DB +gtreqqless 02A8C +gtrless 02277 +gtrsim 02273 gvertneqq 02269 0FE00 gvnE 02269 0FE00 -hArr 021D4 -hairsp 0200A -half 000BD -hamilt 0210B -hardcy 0044A -harr 02194 -harrcir 02948 -harrw 021AD -hbar 0210F -hcirc 00125 -hearts 02665 -heartsuit 02665 -hellip 02026 -hercon 022B9 -hfr 1D525 -hksearow 02925 -hkswarow 02926 -hoarr 021FF -homtht 0223B -hookleftarrow 021A9 -hookrightarrow 021AA -hopf 1D559 -horbar 02015 -hscr 1D4BD -hslash 0210F -hstrok 00127 -hybull 02043 -hyphen 02010 -iacute 000ED -ic 02063 -icirc 000EE -icy 00438 -iecy 00435 -iexcl 000A1 -iff 021D4 -ifr 1D526 -igrave 000EC -ii 02148 -iiiint 02A0C -iiint 0222D -iinfin 029DC -iiota 02129 -ijlig 00133 -imacr 0012B -image 02111 -imagline 02110 -imagpart 02111 -imath 00131 -imof 022B7 -imped 001B5 -in 02208 -incare 02105 -infin 0221E -infintie 029DD -inodot 00131 -int 0222B -intcal 022BA -integers 02124 -intercal 022BA -intlarhk 02A17 -intprod 02A3C -iocy 00451 -iogon 0012F -iopf 1D55A -iota 003B9 -iprod 02A3C -iquest 000BF -iscr 1D4BE -isin 02208 -isinE 022F9 -isindot 022F5 -isins 022F4 -isinsv 022F3 -isinv 02208 -it 02062 -itilde 00129 -iukcy 00456 -iuml 000EF -jcirc 00135 -jcy 00439 -jfr 1D527 -jmath 00237 -jopf 1D55B -jscr 1D4BF -jsercy 00458 -jukcy 00454 -kappa 003BA -kappav 003F0 -kcedil 00137 -kcy 0043A -kfr 1D528 -kgreen 00138 -khcy 00445 -kjcy 0045C -kopf 1D55C -kscr 1D4C0 -lAarr 021DA -lArr 021D0 -lAtail 0291B -lBarr 0290E -lE 02266 -lEg 02A8B -lHar 02962 -lacute 0013A -laemptyv 029B4 -lagran 02112 -lambda 003BB -lang 027E8 -langd 02991 -langle 027E8 -lap 02A85 -laquo 000AB -larr 02190 -larrb 021E4 -larrbfs 0291F -larrfs 0291D -larrhk 021A9 -larrlp 021AB -larrpl 02939 -larrsim 02973 -larrtl 021A2 -lat 02AAB -latail 02919 -late 02AAD +hArr 021D4 +hairsp 0200A +half 000BD +hamilt 0210B +hardcy 0044A +harr 02194 +harrcir 02948 +harrw 021AD +hbar 0210F +hcirc 00125 +hearts 02665 +heartsuit 02665 +hellip 02026 +hercon 022B9 +hfr 1D525 +hksearow 02925 +hkswarow 02926 +hoarr 021FF +homtht 0223B +hookleftarrow 021A9 +hookrightarrow 021AA +hopf 1D559 +horbar 02015 +hscr 1D4BD +hslash 0210F +hstrok 00127 +hybull 02043 +hyphen 02010 +iacute 000ED +ic 02063 +icirc 000EE +icy 00438 +iecy 00435 +iexcl 000A1 +iff 021D4 +ifr 1D526 +igrave 000EC +ii 02148 +iiiint 02A0C +iiint 0222D +iinfin 029DC +iiota 02129 +ijlig 00133 +imacr 0012B +image 02111 +imagline 02110 +imagpart 02111 +imath 00131 +imof 022B7 +imped 001B5 +in 02208 +incare 02105 +infin 0221E +infintie 029DD +inodot 00131 +int 0222B +intcal 022BA +integers 02124 +intercal 022BA +intlarhk 02A17 +intprod 02A3C +iocy 00451 +iogon 0012F +iopf 1D55A +iota 003B9 +iprod 02A3C +iquest 000BF +iscr 1D4BE +isin 02208 +isinE 022F9 +isindot 022F5 +isins 022F4 +isinsv 022F3 +isinv 02208 +it 02062 +itilde 00129 +iukcy 00456 +iuml 000EF +jcirc 00135 +jcy 00439 +jfr 1D527 +jmath 00237 +jopf 1D55B +jscr 1D4BF +jsercy 00458 +jukcy 00454 +kappa 003BA +kappav 003F0 +kcedil 00137 +kcy 0043A +kfr 1D528 +kgreen 00138 +khcy 00445 +kjcy 0045C +kopf 1D55C +kscr 1D4C0 +lAarr 021DA +lArr 021D0 +lAtail 0291B +lBarr 0290E +lE 02266 +lEg 02A8B +lHar 02962 +lacute 0013A +laemptyv 029B4 +lagran 02112 +lambda 003BB +lang 027E8 +langd 02991 +langle 027E8 +lap 02A85 +laquo 000AB +larr 02190 +larrb 021E4 +larrbfs 0291F +larrfs 0291D +larrhk 021A9 +larrlp 021AB +larrpl 02939 +larrsim 02973 +larrtl 021A2 +lat 02AAB +latail 02919 +late 02AAD lates 02AAD 0FE00 -lbarr 0290C -lbbrk 02772 -lbrace 0007B -lbrack 0005B -lbrke 0298B -lbrksld 0298F -lbrkslu 0298D -lcaron 0013E -lcedil 0013C -lceil 02308 -lcub 0007B -lcy 0043B -ldca 02936 -ldquo 0201C -ldquor 0201E -ldrdhar 02967 -ldrushar 0294B -ldsh 021B2 -le 02264 -leftarrow 02190 -leftarrowtail 021A2 -leftharpoondown 021BD -leftharpoonup 021BC -leftleftarrows 021C7 -leftrightarrow 02194 -leftrightarrows 021C6 -leftrightharpoons 021CB -leftrightsquigarrow 021AD -leftthreetimes 022CB -leg 022DA -leq 02264 -leqq 02266 -leqslant 02A7D -les 02A7D -lescc 02AA8 -lesdot 02A7F -lesdoto 02A81 -lesdotor 02A83 +lbarr 0290C +lbbrk 02772 +lbrace 0007B +lbrack 0005B +lbrke 0298B +lbrksld 0298F +lbrkslu 0298D +lcaron 0013E +lcedil 0013C +lceil 02308 +lcub 0007B +lcy 0043B +ldca 02936 +ldquo 0201C +ldquor 0201E +ldrdhar 02967 +ldrushar 0294B +ldsh 021B2 +le 02264 +leftarrow 02190 +leftarrowtail 021A2 +leftharpoondown 021BD +leftharpoonup 021BC +leftleftarrows 021C7 +leftrightarrow 02194 +leftrightarrows 021C6 +leftrightharpoons 021CB +leftrightsquigarrow 021AD +leftthreetimes 022CB +leg 022DA +leq 02264 +leqq 02266 +leqslant 02A7D +les 02A7D +lescc 02AA8 +lesdot 02A7F +lesdoto 02A81 +lesdotor 02A83 lesg 022DA 0FE00 -lesges 02A93 -lessapprox 02A85 -lessdot 022D6 -lesseqgtr 022DA -lesseqqgtr 02A8B -lessgtr 02276 -lesssim 02272 -lfisht 0297C -lfloor 0230A -lfr 1D529 -lg 02276 -lgE 02A91 -lhard 021BD -lharu 021BC -lharul 0296A -lhblk 02584 -ljcy 00459 -ll 0226A -llarr 021C7 -llcorner 0231E -llhard 0296B -lltri 025FA -lmidot 00140 -lmoust 023B0 -lmoustache 023B0 -lnE 02268 -lnap 02A89 -lnapprox 02A89 -lne 02A87 -lneq 02A87 -lneqq 02268 -lnsim 022E6 -loang 027EC -loarr 021FD -lobrk 027E6 -longleftarrow 027F5 -longleftrightarrow 027F7 -longmapsto 027FC -longrightarrow 027F6 -looparrowleft 021AB -looparrowright 021AC -lopar 02985 -lopf 1D55D -loplus 02A2D -lotimes 02A34 -lowast 02217 -lowbar 0005F -loz 025CA -lozenge 025CA -lozf 029EB -lpar 00028 -lparlt 02993 -lrarr 021C6 -lrcorner 0231F -lrhar 021CB -lrhard 0296D -lrm 0200E -lrtri 022BF -lsaquo 02039 -lscr 1D4C1 -lsh 021B0 -lsim 02272 -lsime 02A8D -lsimg 02A8F -lsqb 0005B -lsquo 02018 -lsquor 0201A -lstrok 00142 -lt 0003C -ltcc 02AA6 -ltcir 02A79 -ltdot 022D6 -lthree 022CB -ltimes 022C9 -ltlarr 02976 -ltquest 02A7B -ltrPar 02996 -ltri 025C3 -ltrie 022B4 -ltrif 025C2 -lurdshar 0294A -luruhar 02966 +lesges 02A93 +lessapprox 02A85 +lessdot 022D6 +lesseqgtr 022DA +lesseqqgtr 02A8B +lessgtr 02276 +lesssim 02272 +lfisht 0297C +lfloor 0230A +lfr 1D529 +lg 02276 +lgE 02A91 +lhard 021BD +lharu 021BC +lharul 0296A +lhblk 02584 +ljcy 00459 +ll 0226A +llarr 021C7 +llcorner 0231E +llhard 0296B +lltri 025FA +lmidot 00140 +lmoust 023B0 +lmoustache 023B0 +lnE 02268 +lnap 02A89 +lnapprox 02A89 +lne 02A87 +lneq 02A87 +lneqq 02268 +lnsim 022E6 +loang 027EC +loarr 021FD +lobrk 027E6 +longleftarrow 027F5 +longleftrightarrow 027F7 +longmapsto 027FC +longrightarrow 027F6 +looparrowleft 021AB +looparrowright 021AC +lopar 02985 +lopf 1D55D +loplus 02A2D +lotimes 02A34 +lowast 02217 +lowbar 0005F +loz 025CA +lozenge 025CA +lozf 029EB +lpar 00028 +lparlt 02993 +lrarr 021C6 +lrcorner 0231F +lrhar 021CB +lrhard 0296D +lrm 0200E +lrtri 022BF +lsaquo 02039 +lscr 1D4C1 +lsh 021B0 +lsim 02272 +lsime 02A8D +lsimg 02A8F +lsqb 0005B +lsquo 02018 +lsquor 0201A +lstrok 00142 +lt 0003C +ltcc 02AA6 +ltcir 02A79 +ltdot 022D6 +lthree 022CB +ltimes 022C9 +ltlarr 02976 +ltquest 02A7B +ltrPar 02996 +ltri 025C3 +ltrie 022B4 +ltrif 025C2 +lurdshar 0294A +luruhar 02966 lvertneqq 02268 0FE00 lvnE 02268 0FE00 -mDDot 0223A -macr 000AF -male 02642 -malt 02720 -maltese 02720 -map 021A6 -mapsto 021A6 -mapstodown 021A7 -mapstoleft 021A4 -mapstoup 021A5 -marker 025AE -mcomma 02A29 -mcy 0043C -mdash 02014 -measuredangle 02221 -mfr 1D52A -mho 02127 -micro 000B5 -mid 02223 -midast 0002A -midcir 02AF0 -middot 000B7 -minus 02212 -minusb 0229F -minusd 02238 -minusdu 02A2A -mlcp 02ADB -mldr 02026 -mnplus 02213 -models 022A7 -mopf 1D55E -mp 02213 -mscr 1D4C2 -mstpos 0223E -mu 003BC -multimap 022B8 -mumap 022B8 +mDDot 0223A +macr 000AF +male 02642 +malt 02720 +maltese 02720 +map 021A6 +mapsto 021A6 +mapstodown 021A7 +mapstoleft 021A4 +mapstoup 021A5 +marker 025AE +mcomma 02A29 +mcy 0043C +mdash 02014 +measuredangle 02221 +mfr 1D52A +mho 02127 +micro 000B5 +mid 02223 +midast 0002A +midcir 02AF0 +middot 000B7 +minus 02212 +minusb 0229F +minusd 02238 +minusdu 02A2A +mlcp 02ADB +mldr 02026 +mnplus 02213 +models 022A7 +mopf 1D55E +mp 02213 +mscr 1D4C2 +mstpos 0223E +mu 003BC +multimap 022B8 +mumap 022B8 nGg 022D9 00338 nGt 0226B 020D2 nGtv 0226B 00338 -nLeftarrow 021CD -nLeftrightarrow 021CE +nLeftarrow 021CD +nLeftrightarrow 021CE nLl 022D8 00338 nLt 0226A 020D2 nLtv 0226A 00338 -nRightarrow 021CF -nVDash 022AF -nVdash 022AE -nabla 02207 -nacute 00144 +nRightarrow 021CF +nVDash 022AF +nVdash 022AE +nabla 02207 +nacute 00144 nang 02220 020D2 -nap 02249 +nap 02249 napE 02A70 00338 napid 0224B 00338 -napos 00149 -napprox 02249 -natur 0266E -natural 0266E -naturals 02115 -nbsp 000A0 +napos 00149 +napprox 02249 +natur 0266E +natural 0266E +naturals 02115 +nbsp 000A0 nbump 0224E 00338 nbumpe 0224F 00338 -ncap 02A43 -ncaron 00148 -ncedil 00146 -ncong 02247 +ncap 02A43 +ncaron 00148 +ncedil 00146 +ncong 02247 ncongdot 02A6D 00338 -ncup 02A42 -ncy 0043D -ndash 02013 -ne 02260 -neArr 021D7 -nearhk 02924 -nearr 02197 -nearrow 02197 +ncup 02A42 +ncy 0043D +ndash 02013 +ne 02260 +neArr 021D7 +nearhk 02924 +nearr 02197 +nearrow 02197 nedot 02250 00338 -nequiv 02262 -nesear 02928 +nequiv 02262 +nesear 02928 nesim 02242 00338 -nexist 02204 -nexists 02204 -nfr 1D52B +nexist 02204 +nexists 02204 +nfr 1D52B ngE 02267 00338 -nge 02271 -ngeq 02271 +nge 02271 +ngeq 02271 ngeqq 02267 00338 ngeqslant 02A7E 00338 nges 02A7E 00338 -ngsim 02275 -ngt 0226F -ngtr 0226F -nhArr 021CE -nharr 021AE -nhpar 02AF2 -ni 0220B -nis 022FC -nisd 022FA -niv 0220B -njcy 0045A -nlArr 021CD +ngsim 02275 +ngt 0226F +ngtr 0226F +nhArr 021CE +nharr 021AE +nhpar 02AF2 +ni 0220B +nis 022FC +nisd 022FA +niv 0220B +njcy 0045A +nlArr 021CD nlE 02266 00338 -nlarr 0219A -nldr 02025 -nle 02270 -nleftarrow 0219A -nleftrightarrow 021AE -nleq 02270 +nlarr 0219A +nldr 02025 +nle 02270 +nleftarrow 0219A +nleftrightarrow 021AE +nleq 02270 nleqq 02266 00338 nleqslant 02A7D 00338 nles 02A7D 00338 -nless 0226E -nlsim 02274 -nlt 0226E -nltri 022EA -nltrie 022EC -nmid 02224 -nopf 1D55F -not 000AC -notin 02209 +nless 0226E +nlsim 02274 +nlt 0226E +nltri 022EA +nltrie 022EC +nmid 02224 +nopf 1D55F +not 000AC +notin 02209 notinE 022F9 00338 notindot 022F5 00338 -notinva 02209 -notinvb 022F7 -notinvc 022F6 -notni 0220C -notniva 0220C -notnivb 022FE -notnivc 022FD -npar 02226 -nparallel 02226 +notinva 02209 +notinvb 022F7 +notinvc 022F6 +notni 0220C +notniva 0220C +notnivb 022FE +notnivc 022FD +npar 02226 +nparallel 02226 nparsl 02AFD 020E5 npart 02202 00338 -npolint 02A14 -npr 02280 -nprcue 022E0 +npolint 02A14 +npr 02280 +nprcue 022E0 npre 02AAF 00338 -nprec 02280 +nprec 02280 npreceq 02AAF 00338 -nrArr 021CF -nrarr 0219B +nrArr 021CF +nrarr 0219B nrarrc 02933 00338 nrarrw 0219D 00338 -nrightarrow 0219B -nrtri 022EB -nrtrie 022ED -nsc 02281 -nsccue 022E1 +nrightarrow 0219B +nrtri 022EB +nrtrie 022ED +nsc 02281 +nsccue 022E1 nsce 02AB0 00338 -nscr 1D4C3 -nshortmid 02224 -nshortparallel 02226 -nsim 02241 -nsime 02244 -nsimeq 02244 -nsmid 02224 -nspar 02226 -nsqsube 022E2 -nsqsupe 022E3 -nsub 02284 +nscr 1D4C3 +nshortmid 02224 +nshortparallel 02226 +nsim 02241 +nsime 02244 +nsimeq 02244 +nsmid 02224 +nspar 02226 +nsqsube 022E2 +nsqsupe 022E3 +nsub 02284 nsubE 02AC5 00338 -nsube 02288 +nsube 02288 nsubset 02282 020D2 -nsubseteq 02288 +nsubseteq 02288 nsubseteqq 02AC5 00338 -nsucc 02281 +nsucc 02281 nsucceq 02AB0 00338 -nsup 02285 +nsup 02285 nsupE 02AC6 00338 -nsupe 02289 +nsupe 02289 nsupset 02283 020D2 -nsupseteq 02289 +nsupseteq 02289 nsupseteqq 02AC6 00338 -ntgl 02279 -ntilde 000F1 -ntlg 02278 -ntriangleleft 022EA -ntrianglelefteq 022EC -ntriangleright 022EB -ntrianglerighteq 022ED -nu 003BD -num 00023 -numero 02116 -numsp 02007 -nvDash 022AD -nvHarr 02904 +ntgl 02279 +ntilde 000F1 +ntlg 02278 +ntriangleleft 022EA +ntrianglelefteq 022EC +ntriangleright 022EB +ntrianglerighteq 022ED +nu 003BD +num 00023 +numero 02116 +numsp 02007 +nvDash 022AD +nvHarr 02904 nvap 0224D 020D2 -nvdash 022AC +nvdash 022AC nvge 02265 020D2 nvgt 0003E 020D2 -nvinfin 029DE -nvlArr 02902 +nvinfin 029DE +nvlArr 02902 nvle 02264 020D2 nvlt 0003C 020D2 nvltrie 022B4 020D2 -nvrArr 02903 +nvrArr 02903 nvrtrie 022B5 020D2 nvsim 0223C 020D2 -nwArr 021D6 -nwarhk 02923 -nwarr 02196 -nwarrow 02196 -nwnear 02927 -oS 024C8 -oacute 000F3 -oast 0229B -ocir 0229A -ocirc 000F4 -ocy 0043E -odash 0229D -odblac 00151 -odiv 02A38 -odot 02299 -odsold 029BC -oelig 00153 -ofcir 029BF -ofr 1D52C -ogon 002DB -ograve 000F2 -ogt 029C1 -ohbar 029B5 -ohm 003A9 -oint 0222E -olarr 021BA -olcir 029BE -olcross 029BB -oline 0203E -olt 029C0 -omacr 0014D -omega 003C9 -omicron 003BF -omid 029B6 -ominus 02296 -oopf 1D560 -opar 029B7 -operp 029B9 -oplus 02295 -or 02228 -orarr 021BB -ord 02A5D -order 02134 -orderof 02134 -ordf 000AA -ordm 000BA -origof 022B6 -oror 02A56 -orslope 02A57 -orv 02A5B -oscr 02134 -oslash 000F8 -osol 02298 -otilde 000F5 -otimes 02297 -otimesas 02A36 -ouml 000F6 -ovbar 0233D -par 02225 -para 000B6 -parallel 02225 -parsim 02AF3 -parsl 02AFD -part 02202 -pcy 0043F -percnt 00025 -period 0002E -permil 02030 -perp 022A5 -pertenk 02031 -pfr 1D52D -phi 003C6 -phiv 003D5 -phmmat 02133 -phone 0260E -pi 003C0 -pitchfork 022D4 -piv 003D6 -planck 0210F -planckh 0210E -plankv 0210F -plus 0002B -plusacir 02A23 -plusb 0229E -pluscir 02A22 -plusdo 02214 -plusdu 02A25 -pluse 02A72 -plusmn 000B1 -plussim 02A26 -plustwo 02A27 -pm 000B1 -pointint 02A15 -popf 1D561 -pound 000A3 -pr 0227A -prE 02AB3 -prap 02AB7 -prcue 0227C -pre 02AAF -prec 0227A -precapprox 02AB7 -preccurlyeq 0227C -preceq 02AAF -precnapprox 02AB9 -precneqq 02AB5 -precnsim 022E8 -precsim 0227E -prime 02032 -primes 02119 -prnE 02AB5 -prnap 02AB9 -prnsim 022E8 -prod 0220F -profalar 0232E -profline 02312 -profsurf 02313 -prop 0221D -propto 0221D -prsim 0227E -prurel 022B0 -pscr 1D4C5 -psi 003C8 -puncsp 02008 -qfr 1D52E -qint 02A0C -qopf 1D562 -qprime 02057 -qscr 1D4C6 -quaternions 0210D -quatint 02A16 -quest 0003F -questeq 0225F -quot 00022 -rAarr 021DB -rArr 021D2 -rAtail 0291C -rBarr 0290F -rHar 02964 +nwArr 021D6 +nwarhk 02923 +nwarr 02196 +nwarrow 02196 +nwnear 02927 +oS 024C8 +oacute 000F3 +oast 0229B +ocir 0229A +ocirc 000F4 +ocy 0043E +odash 0229D +odblac 00151 +odiv 02A38 +odot 02299 +odsold 029BC +oelig 00153 +ofcir 029BF +ofr 1D52C +ogon 002DB +ograve 000F2 +ogt 029C1 +ohbar 029B5 +ohm 003A9 +oint 0222E +olarr 021BA +olcir 029BE +olcross 029BB +oline 0203E +olt 029C0 +omacr 0014D +omega 003C9 +omicron 003BF +omid 029B6 +ominus 02296 +oopf 1D560 +opar 029B7 +operp 029B9 +oplus 02295 +or 02228 +orarr 021BB +ord 02A5D +order 02134 +orderof 02134 +ordf 000AA +ordm 000BA +origof 022B6 +oror 02A56 +orslope 02A57 +orv 02A5B +oscr 02134 +oslash 000F8 +osol 02298 +otilde 000F5 +otimes 02297 +otimesas 02A36 +ouml 000F6 +ovbar 0233D +par 02225 +para 000B6 +parallel 02225 +parsim 02AF3 +parsl 02AFD +part 02202 +pcy 0043F +percnt 00025 +period 0002E +permil 02030 +perp 022A5 +pertenk 02031 +pfr 1D52D +phi 003C6 +phiv 003D5 +phmmat 02133 +phone 0260E +pi 003C0 +pitchfork 022D4 +piv 003D6 +planck 0210F +planckh 0210E +plankv 0210F +plus 0002B +plusacir 02A23 +plusb 0229E +pluscir 02A22 +plusdo 02214 +plusdu 02A25 +pluse 02A72 +plusmn 000B1 +plussim 02A26 +plustwo 02A27 +pm 000B1 +pointint 02A15 +popf 1D561 +pound 000A3 +pr 0227A +prE 02AB3 +prap 02AB7 +prcue 0227C +pre 02AAF +prec 0227A +precapprox 02AB7 +preccurlyeq 0227C +preceq 02AAF +precnapprox 02AB9 +precneqq 02AB5 +precnsim 022E8 +precsim 0227E +prime 02032 +primes 02119 +prnE 02AB5 +prnap 02AB9 +prnsim 022E8 +prod 0220F +profalar 0232E +profline 02312 +profsurf 02313 +prop 0221D +propto 0221D +prsim 0227E +prurel 022B0 +pscr 1D4C5 +psi 003C8 +puncsp 02008 +qfr 1D52E +qint 02A0C +qopf 1D562 +qprime 02057 +qscr 1D4C6 +quaternions 0210D +quatint 02A16 +quest 0003F +questeq 0225F +quot 00022 +rAarr 021DB +rArr 021D2 +rAtail 0291C +rBarr 0290F +rHar 02964 race 0223D 00331 -racute 00155 -radic 0221A -raemptyv 029B3 -rang 027E9 -rangd 02992 -range 029A5 -rangle 027E9 -raquo 000BB -rarr 02192 -rarrap 02975 -rarrb 021E5 -rarrbfs 02920 -rarrc 02933 -rarrfs 0291E -rarrhk 021AA -rarrlp 021AC -rarrpl 02945 -rarrsim 02974 -rarrtl 021A3 -rarrw 0219D -ratail 0291A -ratio 02236 -rationals 0211A -rbarr 0290D -rbbrk 02773 -rbrace 0007D -rbrack 0005D -rbrke 0298C -rbrksld 0298E -rbrkslu 02990 -rcaron 00159 -rcedil 00157 -rceil 02309 -rcub 0007D -rcy 00440 -rdca 02937 -rdldhar 02969 -rdquo 0201D -rdquor 0201D -rdsh 021B3 -real 0211C -realine 0211B -realpart 0211C -reals 0211D -rect 025AD -reg 000AE -rfisht 0297D -rfloor 0230B -rfr 1D52F -rhard 021C1 -rharu 021C0 -rharul 0296C -rho 003C1 -rhov 003F1 -rightarrow 02192 -rightarrowtail 021A3 -rightharpoondown 021C1 -rightharpoonup 021C0 -rightleftarrows 021C4 -rightleftharpoons 021CC -rightrightarrows 021C9 -rightsquigarrow 0219D -rightthreetimes 022CC -ring 002DA -risingdotseq 02253 -rlarr 021C4 -rlhar 021CC -rlm 0200F -rmoust 023B1 -rmoustache 023B1 -rnmid 02AEE -roang 027ED -roarr 021FE -robrk 027E7 -ropar 02986 -ropf 1D563 -roplus 02A2E -rotimes 02A35 -rpar 00029 -rpargt 02994 -rppolint 02A12 -rrarr 021C9 -rsaquo 0203A -rscr 1D4C7 -rsh 021B1 -rsqb 0005D -rsquo 02019 -rsquor 02019 -rthree 022CC -rtimes 022CA -rtri 025B9 -rtrie 022B5 -rtrif 025B8 -rtriltri 029CE -ruluhar 02968 -rx 0211E -sacute 0015B -sbquo 0201A -sc 0227B -scE 02AB4 -scap 02AB8 -scaron 00161 -sccue 0227D -sce 02AB0 -scedil 0015F -scirc 0015D -scnE 02AB6 -scnap 02ABA -scnsim 022E9 -scpolint 02A13 -scsim 0227F -scy 00441 -sdot 022C5 -sdotb 022A1 -sdote 02A66 -seArr 021D8 -searhk 02925 -searr 02198 -searrow 02198 -sect 000A7 -semi 0003B -seswar 02929 -setminus 02216 -setmn 02216 -sext 02736 -sfr 1D530 -sfrown 02322 -sharp 0266F -shchcy 00449 -shcy 00448 -shortmid 02223 -shortparallel 02225 -shy 000AD -sigma 003C3 -sigmaf 003C2 -sigmav 003C2 -sim 0223C -simdot 02A6A -sime 02243 -simeq 02243 -simg 02A9E -simgE 02AA0 -siml 02A9D -simlE 02A9F -simne 02246 -simplus 02A24 -simrarr 02972 -slarr 02190 -smallsetminus 02216 -smashp 02A33 -smeparsl 029E4 -smid 02223 -smile 02323 -smt 02AAA -smte 02AAC +racute 00155 +radic 0221A +raemptyv 029B3 +rang 027E9 +rangd 02992 +range 029A5 +rangle 027E9 +raquo 000BB +rarr 02192 +rarrap 02975 +rarrb 021E5 +rarrbfs 02920 +rarrc 02933 +rarrfs 0291E +rarrhk 021AA +rarrlp 021AC +rarrpl 02945 +rarrsim 02974 +rarrtl 021A3 +rarrw 0219D +ratail 0291A +ratio 02236 +rationals 0211A +rbarr 0290D +rbbrk 02773 +rbrace 0007D +rbrack 0005D +rbrke 0298C +rbrksld 0298E +rbrkslu 02990 +rcaron 00159 +rcedil 00157 +rceil 02309 +rcub 0007D +rcy 00440 +rdca 02937 +rdldhar 02969 +rdquo 0201D +rdquor 0201D +rdsh 021B3 +real 0211C +realine 0211B +realpart 0211C +reals 0211D +rect 025AD +reg 000AE +rfisht 0297D +rfloor 0230B +rfr 1D52F +rhard 021C1 +rharu 021C0 +rharul 0296C +rho 003C1 +rhov 003F1 +rightarrow 02192 +rightarrowtail 021A3 +rightharpoondown 021C1 +rightharpoonup 021C0 +rightleftarrows 021C4 +rightleftharpoons 021CC +rightrightarrows 021C9 +rightsquigarrow 0219D +rightthreetimes 022CC +ring 002DA +risingdotseq 02253 +rlarr 021C4 +rlhar 021CC +rlm 0200F +rmoust 023B1 +rmoustache 023B1 +rnmid 02AEE +roang 027ED +roarr 021FE +robrk 027E7 +ropar 02986 +ropf 1D563 +roplus 02A2E +rotimes 02A35 +rpar 00029 +rpargt 02994 +rppolint 02A12 +rrarr 021C9 +rsaquo 0203A +rscr 1D4C7 +rsh 021B1 +rsqb 0005D +rsquo 02019 +rsquor 02019 +rthree 022CC +rtimes 022CA +rtri 025B9 +rtrie 022B5 +rtrif 025B8 +rtriltri 029CE +ruluhar 02968 +rx 0211E +sacute 0015B +sbquo 0201A +sc 0227B +scE 02AB4 +scap 02AB8 +scaron 00161 +sccue 0227D +sce 02AB0 +scedil 0015F +scirc 0015D +scnE 02AB6 +scnap 02ABA +scnsim 022E9 +scpolint 02A13 +scsim 0227F +scy 00441 +sdot 022C5 +sdotb 022A1 +sdote 02A66 +seArr 021D8 +searhk 02925 +searr 02198 +searrow 02198 +sect 000A7 +semi 0003B +seswar 02929 +setminus 02216 +setmn 02216 +sext 02736 +sfr 1D530 +sfrown 02322 +sharp 0266F +shchcy 00449 +shcy 00448 +shortmid 02223 +shortparallel 02225 +shy 000AD +sigma 003C3 +sigmaf 003C2 +sigmav 003C2 +sim 0223C +simdot 02A6A +sime 02243 +simeq 02243 +simg 02A9E +simgE 02AA0 +siml 02A9D +simlE 02A9F +simne 02246 +simplus 02A24 +simrarr 02972 +slarr 02190 +smallsetminus 02216 +smashp 02A33 +smeparsl 029E4 +smid 02223 +smile 02323 +smt 02AAA +smte 02AAC smtes 02AAC 0FE00 -softcy 0044C -sol 0002F -solb 029C4 -solbar 0233F -sopf 1D564 -spades 02660 -spadesuit 02660 -spar 02225 -sqcap 02293 +softcy 0044C +sol 0002F +solb 029C4 +solbar 0233F +sopf 1D564 +spades 02660 +spadesuit 02660 +spar 02225 +sqcap 02293 sqcaps 02293 0FE00 -sqcup 02294 +sqcup 02294 sqcups 02294 0FE00 -sqsub 0228F -sqsube 02291 -sqsubset 0228F -sqsubseteq 02291 -sqsup 02290 -sqsupe 02292 -sqsupset 02290 -sqsupseteq 02292 -squ 025A1 -square 025A1 -squarf 025AA -squf 025AA -srarr 02192 -sscr 1D4C8 -ssetmn 02216 -ssmile 02323 -sstarf 022C6 -star 02606 -starf 02605 -straightepsilon 003F5 -straightphi 003D5 -strns 000AF -sub 02282 -subE 02AC5 -subdot 02ABD -sube 02286 -subedot 02AC3 -submult 02AC1 -subnE 02ACB -subne 0228A -subplus 02ABF -subrarr 02979 -subset 02282 -subseteq 02286 -subseteqq 02AC5 -subsetneq 0228A -subsetneqq 02ACB -subsim 02AC7 -subsub 02AD5 -subsup 02AD3 -succ 0227B -succapprox 02AB8 -succcurlyeq 0227D -succeq 02AB0 -succnapprox 02ABA -succneqq 02AB6 -succnsim 022E9 -succsim 0227F -sum 02211 -sung 0266A -sup 02283 -sup1 000B9 -sup2 000B2 -sup3 000B3 -supE 02AC6 -supdot 02ABE -supdsub 02AD8 -supe 02287 -supedot 02AC4 -suphsol 027C9 -suphsub 02AD7 -suplarr 0297B -supmult 02AC2 -supnE 02ACC -supne 0228B -supplus 02AC0 -supset 02283 -supseteq 02287 -supseteqq 02AC6 -supsetneq 0228B -supsetneqq 02ACC -supsim 02AC8 -supsub 02AD4 -supsup 02AD6 -swArr 021D9 -swarhk 02926 -swarr 02199 -swarrow 02199 -swnwar 0292A -szlig 000DF -target 02316 -tau 003C4 -tbrk 023B4 -tcaron 00165 -tcedil 00163 -tcy 00442 -tdot 020DB -telrec 02315 -tfr 1D531 -there4 02234 -therefore 02234 -theta 003B8 -thetasym 003D1 -thetav 003D1 -thickapprox 02248 -thicksim 0223C -thinsp 02009 -thkap 02248 -thksim 0223C -thorn 000FE -tilde 002DC -times 000D7 -timesb 022A0 -timesbar 02A31 -timesd 02A30 -tint 0222D -toea 02928 -top 022A4 -topbot 02336 -topcir 02AF1 -topf 1D565 -topfork 02ADA -tosa 02929 -tprime 02034 -trade 02122 -triangle 025B5 -triangledown 025BF -triangleleft 025C3 -trianglelefteq 022B4 -triangleq 0225C -triangleright 025B9 -trianglerighteq 022B5 -tridot 025EC -trie 0225C -triminus 02A3A -triplus 02A39 -trisb 029CD -tritime 02A3B -trpezium 023E2 -tscr 1D4C9 -tscy 00446 -tshcy 0045B -tstrok 00167 -twixt 0226C -twoheadleftarrow 0219E -twoheadrightarrow 021A0 -uArr 021D1 -uHar 02963 -uacute 000FA -uarr 02191 -ubrcy 0045E -ubreve 0016D -ucirc 000FB -ucy 00443 -udarr 021C5 -udblac 00171 -udhar 0296E -ufisht 0297E -ufr 1D532 -ugrave 000F9 -uharl 021BF -uharr 021BE -uhblk 02580 -ulcorn 0231C -ulcorner 0231C -ulcrop 0230F -ultri 025F8 -umacr 0016B -uml 000A8 -uogon 00173 -uopf 1D566 -uparrow 02191 -updownarrow 02195 -upharpoonleft 021BF -upharpoonright 021BE -uplus 0228E -upsi 003C5 -upsih 003D2 -upsilon 003C5 -upuparrows 021C8 -urcorn 0231D -urcorner 0231D -urcrop 0230E -uring 0016F -urtri 025F9 -uscr 1D4CA -utdot 022F0 -utilde 00169 -utri 025B5 -utrif 025B4 -uuarr 021C8 -uuml 000FC -uwangle 029A7 -vArr 021D5 -vBar 02AE8 -vBarv 02AE9 -vDash 022A8 -vangrt 0299C -varepsilon 003F5 -varkappa 003F0 -varnothing 02205 -varphi 003D5 -varpi 003D6 -varpropto 0221D -varr 02195 -varrho 003F1 -varsigma 003C2 +sqsub 0228F +sqsube 02291 +sqsubset 0228F +sqsubseteq 02291 +sqsup 02290 +sqsupe 02292 +sqsupset 02290 +sqsupseteq 02292 +squ 025A1 +square 025A1 +squarf 025AA +squf 025AA +srarr 02192 +sscr 1D4C8 +ssetmn 02216 +ssmile 02323 +sstarf 022C6 +star 02606 +starf 02605 +straightepsilon 003F5 +straightphi 003D5 +strns 000AF +sub 02282 +subE 02AC5 +subdot 02ABD +sube 02286 +subedot 02AC3 +submult 02AC1 +subnE 02ACB +subne 0228A +subplus 02ABF +subrarr 02979 +subset 02282 +subseteq 02286 +subseteqq 02AC5 +subsetneq 0228A +subsetneqq 02ACB +subsim 02AC7 +subsub 02AD5 +subsup 02AD3 +succ 0227B +succapprox 02AB8 +succcurlyeq 0227D +succeq 02AB0 +succnapprox 02ABA +succneqq 02AB6 +succnsim 022E9 +succsim 0227F +sum 02211 +sung 0266A +sup 02283 +sup1 000B9 +sup2 000B2 +sup3 000B3 +supE 02AC6 +supdot 02ABE +supdsub 02AD8 +supe 02287 +supedot 02AC4 +suphsol 027C9 +suphsub 02AD7 +suplarr 0297B +supmult 02AC2 +supnE 02ACC +supne 0228B +supplus 02AC0 +supset 02283 +supseteq 02287 +supseteqq 02AC6 +supsetneq 0228B +supsetneqq 02ACC +supsim 02AC8 +supsub 02AD4 +supsup 02AD6 +swArr 021D9 +swarhk 02926 +swarr 02199 +swarrow 02199 +swnwar 0292A +szlig 000DF +target 02316 +tau 003C4 +tbrk 023B4 +tcaron 00165 +tcedil 00163 +tcy 00442 +tdot 020DB +telrec 02315 +tfr 1D531 +there4 02234 +therefore 02234 +theta 003B8 +thetasym 003D1 +thetav 003D1 +thickapprox 02248 +thicksim 0223C +thinsp 02009 +thkap 02248 +thksim 0223C +thorn 000FE +tilde 002DC +times 000D7 +timesb 022A0 +timesbar 02A31 +timesd 02A30 +tint 0222D +toea 02928 +top 022A4 +topbot 02336 +topcir 02AF1 +topf 1D565 +topfork 02ADA +tosa 02929 +tprime 02034 +trade 02122 +triangle 025B5 +triangledown 025BF +triangleleft 025C3 +trianglelefteq 022B4 +triangleq 0225C +triangleright 025B9 +trianglerighteq 022B5 +tridot 025EC +trie 0225C +triminus 02A3A +triplus 02A39 +trisb 029CD +tritime 02A3B +trpezium 023E2 +tscr 1D4C9 +tscy 00446 +tshcy 0045B +tstrok 00167 +twixt 0226C +twoheadleftarrow 0219E +twoheadrightarrow 021A0 +uArr 021D1 +uHar 02963 +uacute 000FA +uarr 02191 +ubrcy 0045E +ubreve 0016D +ucirc 000FB +ucy 00443 +udarr 021C5 +udblac 00171 +udhar 0296E +ufisht 0297E +ufr 1D532 +ugrave 000F9 +uharl 021BF +uharr 021BE +uhblk 02580 +ulcorn 0231C +ulcorner 0231C +ulcrop 0230F +ultri 025F8 +umacr 0016B +uml 000A8 +uogon 00173 +uopf 1D566 +uparrow 02191 +updownarrow 02195 +upharpoonleft 021BF +upharpoonright 021BE +uplus 0228E +upsi 003C5 +upsih 003D2 +upsilon 003C5 +upuparrows 021C8 +urcorn 0231D +urcorner 0231D +urcrop 0230E +uring 0016F +urtri 025F9 +uscr 1D4CA +utdot 022F0 +utilde 00169 +utri 025B5 +utrif 025B4 +uuarr 021C8 +uuml 000FC +uwangle 029A7 +vArr 021D5 +vBar 02AE8 +vBarv 02AE9 +vDash 022A8 +vangrt 0299C +varepsilon 003F5 +varkappa 003F0 +varnothing 02205 +varphi 003D5 +varpi 003D6 +varpropto 0221D +varr 02195 +varrho 003F1 +varsigma 003C2 varsubsetneq 0228A 0FE00 varsubsetneqq 02ACB 0FE00 varsupsetneq 0228B 0FE00 varsupsetneqq 02ACC 0FE00 -vartheta 003D1 -vartriangleleft 022B2 -vartriangleright 022B3 -vcy 00432 -vdash 022A2 -vee 02228 -veebar 022BB -veeeq 0225A -vellip 022EE -verbar 0007C -vert 0007C -vfr 1D533 -vltri 022B2 +vartheta 003D1 +vartriangleleft 022B2 +vartriangleright 022B3 +vcy 00432 +vdash 022A2 +vee 02228 +veebar 022BB +veeeq 0225A +vellip 022EE +verbar 0007C +vert 0007C +vfr 1D533 +vltri 022B2 vnsub 02282 020D2 vnsup 02283 020D2 -vopf 1D567 -vprop 0221D -vrtri 022B3 -vscr 1D4CB +vopf 1D567 +vprop 0221D +vrtri 022B3 +vscr 1D4CB vsubnE 02ACB 0FE00 vsubne 0228A 0FE00 vsupnE 02ACC 0FE00 vsupne 0228B 0FE00 -vzigzag 0299A -wcirc 00175 -wedbar 02A5F -wedge 02227 -wedgeq 02259 -weierp 02118 -wfr 1D534 -wopf 1D568 -wp 02118 -wr 02240 -wreath 02240 -wscr 1D4CC -xcap 022C2 -xcirc 025EF -xcup 022C3 -xdtri 025BD -xfr 1D535 -xhArr 027FA -xharr 027F7 -xi 003BE -xlArr 027F8 -xlarr 027F5 -xmap 027FC -xnis 022FB -xodot 02A00 -xopf 1D569 -xoplus 02A01 -xotime 02A02 -xrArr 027F9 -xrarr 027F6 -xscr 1D4CD -xsqcup 02A06 -xuplus 02A04 -xutri 025B3 -xvee 022C1 -xwedge 022C0 -yacute 000FD -yacy 0044F -ycirc 00177 -ycy 0044B -yen 000A5 -yfr 1D536 -yicy 00457 -yopf 1D56A -yscr 1D4CE -yucy 0044E -yuml 000FF -zacute 0017A -zcaron 0017E -zcy 00437 -zdot 0017C -zeetrf 02128 -zeta 003B6 -zfr 1D537 -zhcy 00436 -zigrarr 021DD -zopf 1D56B -zscr 1D4CF -zwj 0200D -zwnj 0200C
\ No newline at end of file +vzigzag 0299A +wcirc 00175 +wedbar 02A5F +wedge 02227 +wedgeq 02259 +weierp 02118 +wfr 1D534 +wopf 1D568 +wp 02118 +wr 02240 +wreath 02240 +wscr 1D4CC +xcap 022C2 +xcirc 025EF +xcup 022C3 +xdtri 025BD +xfr 1D535 +xhArr 027FA +xharr 027F7 +xi 003BE +xlArr 027F8 +xlarr 027F5 +xmap 027FC +xnis 022FB +xodot 02A00 +xopf 1D569 +xoplus 02A01 +xotime 02A02 +xrArr 027F9 +xrarr 027F6 +xscr 1D4CD +xsqcup 02A06 +xuplus 02A04 +xutri 025B3 +xvee 022C1 +xwedge 022C0 +yacute 000FD +yacy 0044F +ycirc 00177 +ycy 0044B +yen 000A5 +yfr 1D536 +yicy 00457 +yopf 1D56A +yscr 1D4CE +yucy 0044E +yuml 000FF +zacute 0017A +zcaron 0017E +zcy 00437 +zdot 0017C +zeetrf 02128 +zeta 003B6 +zfr 1D537 +zhcy 00436 +zigrarr 021DD +zopf 1D56B +zscr 1D4CF +zwj 0200D +zwnj 0200C
\ No newline at end of file diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 23853b5750..530f93c184 100644 --- a/ext/standard/html_tables/html_table_gen.php +++ b/ext/standard/html_tables/html_table_gen.php @@ -190,10 +190,10 @@ foreach ($encodings as $e) { if (preg_match("/^0x([0-9A-Z]{2})\t0x([0-9A-Z]{2,})/i", $l, $matches)) $map[] = array($matches[1], $matches[2]); } - + $mappy = array(); foreach ($map as $v) { $mappy[hexdec($v[0])] = hexdec($v[1]); } - + $mstable = array("ident" => $e['ident']); /* calculate two-stage tables */ for ($i = 0; $i < 4; $i++) { @@ -202,7 +202,7 @@ foreach ($encodings as $e) { $mstable[$i][$j] = isset($mappy[$cp]) ? $mappy[$cp] : NULL; } } - + echo "/* {{{ Stage 2 tables for {$e['name']} */\n\n"; @@ -212,9 +212,9 @@ foreach ($encodings as $e) { $s2tables_idents[$i] = $encodings[$t[0]/5]["ident"]; continue; } - + $s2tables_idents[$i] = $e["ident"]; - + echo "static const enc_to_uni_stage2 enc_to_uni_s2_{$e['ident']}_". sprintf("%02X", $i << 6)." = { {\n"; for ($j = 0; $j < 64; $j++) { @@ -227,10 +227,10 @@ foreach ($encodings as $e) { echo "0xFFFF,"; /* special value; indicates no mapping */ } echo "\n} };\n\n"; - + $prevStage2[] = $mstable[$i]; } - + echo "/* end of stage 2 tables for {$e['name']} }}} */\n\n"; @@ -333,23 +333,23 @@ foreach ($encodings as $e) { if (preg_match("/^0x([0-9A-Z]{2})\t0x([0-9A-Z]{2,})\s+#\s*(.*)$/i", $l, $matches)) $map[] = array($matches[1], $matches[2], rtrim($matches[3])); } - + $mappy = array(); foreach ($map as $v) { if (hexdec($v[0]) >= $e['range'][0] && hexdec($v[0]) <= $e['range'][1]) $mappy[hexdec($v[1])] = array(hexdec($v[0]), strtolower($v[2])); } ksort($mappy); - + echo "static const uni_to_enc unimap_{$e['ident']}[] = {\n"; - + foreach ($mappy as $k => $v) { echo "\t{ ", sprintf("0x%04X", $k), ", ", sprintf("0x%02X", $v[0]), " },\t/* ", $v[1], " */\n"; } echo "};\n"; - + echo "/* {{{ end of mappings *from* Unicode for {$e['name']} */\n\n"; } @@ -476,7 +476,7 @@ foreach ($multicp_rows as $k => $v) { $v['default'] = "gt"; echo "\t{ {", sprintf("\"%-21s", $v["default"].'",'), "\t", sprintf("%02d", (count($v) - 1)), ",\t\t", - sprintf("% 2d", strlen($v["default"])), '} },', "\n"; + sprintf("% 2d", strlen($v["default"])), '} },', "\n"; } else { echo "\t{ {", sprintf("%-22s", 'NULL,'), "\t", sprintf("%02d", count($v)), ",\t\t0} },\n"; @@ -484,7 +484,7 @@ foreach ($multicp_rows as $k => $v) { unset($v["default"]); foreach ($v as $l => $w) { echo "\t{ {", sprintf("\"%-21s", $w.'",'), "\t", sprintf("0x%05s", $l), ",\t", - sprintf("% 2d", strlen($w)), '} },', "\n"; + sprintf("% 2d", strlen($w)), '} },', "\n"; } echo "};\n"; } @@ -561,7 +561,7 @@ for ($i = 0; $i < 0x1E; $i++) { else echo "{1, { {(void *)", sprintf("multi_cp_{$ident}_%05X", ($i << 12) | ($k << 6) | $y ), ", 0} } },"; - + } echo "\n};\n\n"; } @@ -685,7 +685,7 @@ echo // die("violated assumption for traverse_for_entities"); // } // } -// +// // $k++; //} //echo "\n};\n\n"; diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 75d21c0761..b80f982fe7 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -738,7 +738,7 @@ finish: while (!php_stream_eof(stream)) { size_t http_header_line_length; - + if (php_stream_get_line(stream, http_header_line, HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) && *http_header_line != '\n' && *http_header_line != '\r') { char *e = http_header_line + http_header_line_length - 1; char *http_header_value; @@ -975,7 +975,7 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, const char *pa php_stream *stream; zval headers; ZVAL_UNDEF(&headers); - + stream = php_stream_url_wrap_http_ex( wrapper, path, mode, options, opened_path, context, PHP_URL_REDIRECT_MAX, HTTP_WRAPPER_HEADER_INIT, &headers STREAMS_CC); diff --git a/ext/standard/image.c b/ext/standard/image.c index f0188c1a90..c634727ea3 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -1346,7 +1346,7 @@ PHPAPI int php_getimagetype(php_stream * stream, char *filetype) /* WBMP may be smaller than 12 bytes, so delay error */ twelve_bytes_read = (php_stream_read(stream, filetype+4, 8) == 8); - + /* BYTES READ: 12 */ if (twelve_bytes_read && !memcmp(filetype, php_sig_jp2, 12)) { return IMAGE_FILETYPE_JP2; diff --git a/ext/standard/info.c b/ext/standard/info.c index 0299d85262..1b7b050bb2 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -327,8 +327,8 @@ char* php_get_windows_name() /* could be Windows 8/Windows Server 2012, could be Windows 8.1/Windows Server 2012 R2 */ /* XXX and one more X - the above comment is true if no manifest is used for two cases: - if the PHP build doesn't use the correct manifest - - if PHP DLL loaded under some binary that doesn't use the correct manifest - + - if PHP DLL loaded under some binary that doesn't use the correct manifest + So keep the handling here as is for now, even if we know 6.2 is win8 and nothing else, and think about an improvement. */ OSVERSIONINFOEX osvi81; DWORDLONG dwlConditionMask = 0; diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 39eab7b530..446534b336 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -468,7 +468,7 @@ static int php_mail_detect_multiple_crlf(char *hdr) { */ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char *extra_cmd) { -#ifdef PHP_WIN32 +#ifdef PHP_WIN32 int tsm_err; char *tsm_errmsg = NULL; #endif @@ -505,14 +505,14 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char time_t curtime; zend_string *date_str; size_t len; - - + + time(&curtime); date_str = php_format_date("d-M-Y H:i:s e", 13, curtime, 1); len = spprintf(&tmp, 0, "[%s] %s%s", date_str->val, logline, PHP_EOL); - + php_mail_log_to_file(mail_log, tmp, len); - + zend_string_free(date_str); efree(tmp); } diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index 180d053c11..461373d76b 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -207,7 +207,7 @@ PHP_FUNCTION(mt_srand) default: BG(mt_rand_mode) = MT_RAND_MT19937; } - + php_mt_srand(seed); } /* }}} */ @@ -244,7 +244,7 @@ static uint32_t rand_range32(uint32_t umax) { #if ZEND_ULONG_MAX > UINT32_MAX static uint64_t rand_range64(uint64_t umax) { uint64_t result, limit; - + result = php_mt_rand(); result = (result << 32) | php_mt_rand(); diff --git a/ext/standard/pack.c b/ext/standard/pack.c index ae10b8a6e7..7d154841ab 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -600,7 +600,7 @@ PHP_FUNCTION(pack) } break; } - + case 'g': { /* pack little endian float */ while (arg-- > 0) { @@ -608,7 +608,7 @@ PHP_FUNCTION(pack) php_pack_copy_float(1, &ZSTR_VAL(output)[outputpos], v); outputpos += sizeof(v); } - + break; } case 'G': { @@ -629,7 +629,7 @@ PHP_FUNCTION(pack) } break; } - + case 'e': { /* pack little endian double */ while (arg-- > 0) { @@ -639,7 +639,7 @@ PHP_FUNCTION(pack) } break; } - + case 'E': { /* pack big endian double */ while (arg-- > 0) { @@ -1119,7 +1119,7 @@ PHP_FUNCTION(unpack) } #endif - case 'f': /* float */ + case 'f': /* float */ case 'g': /* little endian float*/ case 'G': /* big endian float*/ { @@ -1132,15 +1132,15 @@ PHP_FUNCTION(unpack) } else { memcpy(&v, &input[inputpos], sizeof(float)); } - + add_assoc_double(return_value, n, (double)v); break; } - + case 'd': /* double */ case 'e': /* little endian float */ - case 'E': /* big endian float */ + case 'E': /* big endian float */ { double v; if (type == 'e') { diff --git a/ext/standard/password.c b/ext/standard/password.c index e60464a4e9..c92925b903 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -476,7 +476,7 @@ PHP_FUNCTION(password_hash) { zval *option_buffer; zend_string *salt, *out, *encoded; - size_t time_cost = PHP_PASSWORD_ARGON2_TIME_COST; + size_t time_cost = PHP_PASSWORD_ARGON2_TIME_COST; size_t memory_cost = PHP_PASSWORD_ARGON2_MEMORY_COST; size_t threads = PHP_PASSWORD_ARGON2_THREADS; argon2_type type = Argon2_i; diff --git a/ext/standard/php_math.h b/ext/standard/php_math.h index 3ab92320b1..c9e21cb866 100644 --- a/ext/standard/php_math.h +++ b/ext/standard/php_math.h @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -68,7 +68,7 @@ PHP_FUNCTION(rad2deg); PHP_FUNCTION(intdiv); /* - WARNING: these functions are expermental: they could change their names or + WARNING: these functions are expermental: they could change their names or disappear in the next version of PHP! */ PHP_FUNCTION(hypot); diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 68fcd3149c..3333971878 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -140,8 +140,8 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, uint8_t *stateptr, const PHPAPI void php_implode(const zend_string *delim, zval *arr, zval *return_value); PHPAPI void php_explode(const zend_string *delim, zend_string *str, zval *return_value, zend_long limit); -PHPAPI size_t php_strspn(char *s1, char *s2, char *s1_end, char *s2_end); -PHPAPI size_t php_strcspn(char *s1, char *s2, char *s1_end, char *s2_end); +PHPAPI size_t php_strspn(char *s1, char *s2, char *s1_end, char *s2_end); +PHPAPI size_t php_strcspn(char *s1, char *s2, char *s1_end, char *s2_end); PHPAPI int string_natural_compare_function_ex(zval *result, zval *op1, zval *op2, zend_bool case_insensitive); PHPAPI int string_natural_compare_function(zval *result, zval *op1, zval *op2); diff --git a/ext/standard/php_versioning.h b/ext/standard/php_versioning.h index 0b876c9611..175c3b30c5 100644 --- a/ext/standard/php_versioning.h +++ b/ext/standard/php_versioning.h @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ diff --git a/ext/standard/string.c b/ext/standard/string.c index dd7267b934..1c28c6a49c 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5816,7 +5816,7 @@ static zend_string *php_utf8_decode(const char *s, size_t len) /* }}} */ -/* {{{ proto string utf8_encode(string data) +/* {{{ proto string utf8_encode(string data) Encodes an ISO-8859-1 string to UTF-8 */ PHP_FUNCTION(utf8_encode) { @@ -5831,7 +5831,7 @@ PHP_FUNCTION(utf8_encode) } /* }}} */ -/* {{{ proto string utf8_decode(string data) +/* {{{ proto string utf8_decode(string data) Converts a UTF-8 encoded string to ISO-8859-1 */ PHP_FUNCTION(utf8_decode) { diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c index b1a5489cb9..912ebf4cba 100644 --- a/ext/standard/syslog.c +++ b/ext/standard/syslog.c @@ -44,7 +44,7 @@ PHP_MINIT_FUNCTION(syslog) REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */ REGISTER_LONG_CONSTANT("LOG_CRIT", LOG_CRIT, CONST_CS | CONST_PERSISTENT); /* critical conditions */ - REGISTER_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LOG_WARNING", LOG_WARNING, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LOG_NOTICE", LOG_NOTICE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LOG_INFO", LOG_INFO, CONST_CS | CONST_PERSISTENT); diff --git a/ext/standard/tests/array/data.inc b/ext/standard/tests/array/data.inc index 2991274be8..bbc8d43c23 100644 --- a/ext/standard/tests/array/data.inc +++ b/ext/standard/tests/array/data.inc @@ -1,6 +1,6 @@ <?php $tmp = pow(2,24); -$data = array( +$data = array( 'PHP', 17=>'PHP: Hypertext Preprocessor', 5=>'Test', diff --git a/ext/standard/tests/class_object/AutoTest.inc b/ext/standard/tests/class_object/AutoTest.inc index 0627096fff..a0c8244265 100644 --- a/ext/standard/tests/class_object/AutoTest.inc +++ b/ext/standard/tests/class_object/AutoTest.inc @@ -2,12 +2,12 @@ class autoTest { public static $bob = "bob"; - + public function __get($name) { echo "attempt to access $name\n"; return "foo"; } - + } ?>
\ No newline at end of file diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc index aff9d107d9..afee2d20ce 100644 --- a/ext/standard/tests/file/file.inc +++ b/ext/standard/tests/file/file.inc @@ -1,29 +1,29 @@ <?php -/* Header file for common file test functions +/* Header file for common file test functions Following functions are provided : - create_files() : create files with specified contents + create_files() : create files with specified contents delete_files() : delete files create_links() : crate links of different types - delete_links() : delete links - fill_files() : fill file with specified contents - change_file_perms() : Change permission of files + delete_links() : delete links + fill_files() : fill file with specified contents + change_file_perms() : Change permission of files fill_buffer() : fills buffer with specified contents - compare_self_stat() : compares the first 13 elements of the + compare_self_stat() : compares the first 13 elements of the stat with the corresponding named key values of the same stat. compare_stats() : Compares two stat values -*/ +*/ define('file_not_found', 2, 1); -/* +/* Function: bool create_file(string $filename, string $mode = "w"); - Description: creates a new file using fopen() call - $filename = Name of the file + Description: creates a new file using fopen() call + $filename = Name of the file $mode = Mode as specified in fopen call, read documentation of fopen() call for more info - Returns: + Returns: true on success, false otherwise */ function create_file($filename, $mode = "w") { @@ -83,23 +83,23 @@ function fill_buffer(&$buffer, $fill_type, $fill_size) { Function : bool fill_file(resource $file_handle, string $fill_type, string $file_size); Description: Fills the file with data as specified with requested size. $file_handle = file handle, opened with write options, - $fill_type: + $fill_type: "text" = fills with string of size $file_size "numeric" = fills with numeric value of size $file_size "empty" = no fill operation performed, returns true "text_with_new_line" = similar to "text" fill type but writes with new line - "alphanumeric" = fills with alphnumeric values + "alphanumeric" = fills with alphnumeric values Returns: true on success, false on failure & invalid fill type */ function fill_file($file_handle, $fill_type, $file_size) { - + if ( $fill_type == "empty" ) { // no fill required, return true return true; } if ( $fill_type == "text" ) { $data = "text "; - $size_divider = strlen($data); + $size_divider = strlen($data); $add_value = strlen($data); } else if ( $fill_type == "text_with_new_line" ) { $data = "line\nline of text\n"; @@ -113,7 +113,7 @@ function fill_file($file_handle, $fill_type, $file_size) { $data = 2; $size_divider = 1; $add_value = 0; - } else { + } else { // invalid fill type; return false; } @@ -124,7 +124,7 @@ function fill_file($file_handle, $fill_type, $file_size) { if ( $size > $chunk_size ) { $loop_count = 1; do { - $loop_count ++; + $loop_count ++; if ( $size <= $chunk_size ) { $chunk_size = $size; } @@ -142,14 +142,14 @@ function fill_file($file_handle, $fill_type, $file_size) { return false; } } - + // successful, return true return true; } /* - Function: int change_file_perms(string $file_path, int $count = 1, int $perms = 0755, - string $name_prefix = "file", + Function: int change_file_perms(string $file_path, int $count = 1, int $perms = 0755, + string $name_prefix = "file", string $name_suffix = 1, $file_extension = ".tmp"); Description: changes file permission for given file(s). $file_path = dir path where file exists @@ -157,21 +157,21 @@ function fill_file($file_handle, $fill_type, $file_size) { $perms = new permission of the file, similar to $mode args of chmod() call $name_prefix = common name prefix, default is "file" $name_suffix = suffix to end the common name given in name_prefix to create - a unique name. default is 1. + a unique name. default is 1. $file_extension = default is .tmp Returns: Integer, Count of total files permission changed. */ function change_file_perms($file_path, - $count = 1, - $perms = 0755, - $name_prefix = "file", - $name_suffix = 1, - $file_extension = ".tmp" ) + $count = 1, + $perms = 0755, + $name_prefix = "file", + $name_suffix = 1, + $file_extension = ".tmp" ) { $changed = 0; - if( $count <= 0 ) + if( $count <= 0 ) return $changed; if ( $name_suffix <= 0) @@ -182,34 +182,34 @@ function change_file_perms($file_path, if( chmod($filename, $perms) ) $changed++; $name_suffix++; - } + } return $changed; } -/* +/* Function: array create_files( string $file_path, int $count = 1, - string $content_type = "numeric", - int $permission = 0755, + string $content_type = "numeric", + int $permission = 0755, int $size = 1, - string $mode = "w", - string $name_prefix = "file", + string $mode = "w", + string $name_prefix = "file", int $name_suffix = 1, string $flag = "kilobytes" string $file_extension = ".tmp" ); - Description: Creates given number of files with specified mode and + Description: Creates given number of files with specified mode and permissions. File is filled with content of size specified. $file_path = dir where files will be created - $name_prefix = prefix to be used for names, name is suffix with a + $name_prefix = prefix to be used for names, name is suffix with a unqiue numeric value to make the file name unique, default = file $name_suffix = suffix to be used for the name, default = 1 $count = total no. of files to be created, default = 1 - $mode = file open mode as specified in fopen() call. Do not use + $mode = file open mode as specified in fopen() call. Do not use modes used for only reading the file. Default = "w" - $permission = An octal number, This should be similar to $mode - specified in chmod() call. - $content_type = Specify type of the content to fill in the file. + $permission = An octal number, This should be similar to $mode + specified in chmod() call. + $content_type = Specify type of the content to fill in the file. "numeric" = fill file with numeric vlaues "text" = fill file with regular text "empty" = empty file @@ -218,16 +218,16 @@ function change_file_perms($file_path, If imporper $content type is specified, file is created as empty $size = size of the fill in terms of kilobyte, i.e size of the file. if $flag is specified as "byte", then then given size is taken in bytes - $flag = specifiy if size has to be treated as no of total bytes or + $flag = specifiy if size has to be treated as no of total bytes or multiple of KB. "kilobytes" = take size in terms of multiple of KB - "byte" = take size in terms of bytes + "byte" = take size in terms of bytes $file_extension = default is .tmp Returns: An array with following key value pair: created => total file created - filled => total files filled + filled => total files filled perms_changed => total files permission changed */ function create_files( $file_path, @@ -253,7 +253,7 @@ function create_files( $file_path, if ( $size == 0 ) return $return_value; - // prepare the size based on flag + // prepare the size based on flag $file_size = $size; if ( $flag == "kilobytes" ) { $file_size = $file_size * 1024; @@ -288,11 +288,11 @@ function create_files( $file_path, fclose($file_handle); return $return_value; } // end of if - - // call fill_file() to fill the file + + // call fill_file() to fill the file if( fill_file($file_handle, $content_type, $file_size) ) $return_value['filled']++; - + fclose($file_handle); $tmp_name_suffix++; @@ -300,9 +300,9 @@ function create_files( $file_path, } // change all file's permissions - $return_value['perms_changed'] = change_file_perms($file_path, $count, $permission, $name_prefix, + $return_value['perms_changed'] = change_file_perms($file_path, $count, $permission, $name_prefix, $name_suffix, $file_extension); - + return $return_value; } @@ -336,8 +336,8 @@ function create_files( $file_path, alphanumeric = fill with alphanumeric text If imporper $content type is specified, file is created as empty $size = size of the fill in terms of kilobyte, i.e size of the file. - $link_type = type of the link to be created - "soft" = soft link + $link_type = type of the link to be created + "soft" = soft link "hard" = hard link $filename = file used to create a link on @@ -392,12 +392,12 @@ function create_links($file_path, } break; } - + if ( $link_file_content == "empty" ) { $return_value['filled'] = 1; return $return_value; } - + // fill the file with specific type of data and size $tmp_name_suffix = $link_name_suffix; $linkname = $file_path."/".$link_name_prefix.$tmp_name_suffix.$link_file_extension; @@ -405,8 +405,8 @@ function create_links($file_path, if($file_handle == false) { return $return_value; } // end of if - - // call fill_file() to fill the file + + // call fill_file() to fill the file if( fill_file($file_handle, $link_file_content, $link_size) ) $return_value['filled']++; @@ -415,11 +415,11 @@ function create_links($file_path, // change the permission of the link file, only if hard link. // this is not applicable to soft links - if( $link_type == "hard" ) { - $return_value['perms_changed'] = change_file_perms($file_path, - $link_count, - $link_perms, - $link_name_prefix, + if( $link_type == "hard" ) { + $return_value['perms_changed'] = change_file_perms($file_path, + $link_count, + $link_perms, + $link_name_prefix, $link_name_suffix, $link_file_extension ); } @@ -427,10 +427,10 @@ function create_links($file_path, return $return_value; } -/* +/* Function: bool delete_file(string $filename); - Description: delete a given file if exists - Returns: true on success + Description: delete a given file if exists + Returns: true on success false on failure file_not_found if file doesn't exist */ @@ -446,7 +446,7 @@ function delete_file($filename) { } /* - Function: array delete_files(string $file_path, int $count = 1, string $name_prefix = "file", + Function: array delete_files(string $file_path, int $count = 1, string $name_prefix = "file", int name_suffix = 1, $file_extension = ".tmp" ); Description: Deletes given number of files if exists. $file_path = location of the files @@ -460,15 +460,15 @@ function delete_file($filename) { failed = Count of failed to delete */ function delete_files($file_path, - $count = 1, - $name_prefix = "file", - $name_suffix = 1, - $file_extension = ".tmp") + $count = 1, + $name_prefix = "file", + $name_suffix = 1, + $file_extension = ".tmp") { $return_value = array ('deleted' => 0, 'notfound' => 0, 'failed' => 0); if ( $name_suffix < 1 ) - $name_suffix = 1; + $name_suffix = 1; for($loop_counter = 1; $loop_counter <= $count; $loop_counter++) { $filename = $file_path."/".$name_prefix.$name_suffix.$file_extension; $name_suffix++; @@ -480,20 +480,20 @@ function delete_files($file_path, } else { $return_value['failed']++; } - + } // end of for return $return_value; } /* - Function: array delete_links( $file_path, - $link_file_count, - $link_name_prefix, - $link_name_suffix, + Function: array delete_links( $file_path, + $link_file_count, + $link_name_prefix, + $link_name_suffix, $link_file_extension ); Description: Deletes given number of links if exists. Uses delete_files() function - $file_path = location of link files - $link_file_count = Number of link files + $file_path = location of link files + $link_file_count = Number of link files $link_name_prefix = prefix for the linkname, rest of the name is incremental(increment by 1 only) numeric starting from $link_name_suffix up to count $link_name_suffix = first numeric suffix in the name @@ -504,16 +504,16 @@ function delete_files($file_path, failed = Count of failed to delete */ function delete_links($file_path, - $link_file_count = 1, - $link_name_prefix = "link", - $link_name_suffix = 1, - $link_file_extension = ".tmp") + $link_file_count = 1, + $link_name_prefix = "link", + $link_name_suffix = 1, + $link_file_extension = ".tmp") { - // call the delete files to delete links - $return_value = delete_files( $file_path, - $link_file_count, - $link_name_prefix, - $link_name_suffix, + // call the delete files to delete links + $return_value = delete_files( $file_path, + $link_file_count, + $link_name_prefix, + $link_name_suffix, $link_file_extension ); return $return_value; } @@ -524,7 +524,7 @@ function delete_links($file_path, Prototype: function compare_self_stat( array $stat ); Description: - Compares the each of the first 13 values of the stat array with the + Compares the each of the first 13 values of the stat array with the corresponding next 13 values of the same stat for equality $stat = stat array @@ -536,7 +536,7 @@ function compare_self_stat( array $stat ) $return_value = true; // named keys present in a stat - $string_keys = array("dev", "ino", "mode", "nlink", "uid", "gid", + $string_keys = array("dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "ctime", "blksize", "blocks"); @@ -557,7 +557,7 @@ function compare_self_stat( array $stat ) } } // end of foreach - // if the $return_value is false, i.e all the element do not match then + // if the $return_value is false, i.e all the element do not match then // dump the stat array so that its easy to figure out the error if ($return_value == false ) { echo "\n Dumping stat array ...\n"; @@ -569,7 +569,7 @@ function compare_self_stat( array $stat ) /* Prototype: - function compare_stats( array $stat1, array $stat2, array $fields, + function compare_stats( array $stat1, array $stat2, array $fields, [string $op = "==", [ bool $flag = false] ]); Description: Compares two stat values, stat value should be obtained by stat/lstat @@ -580,12 +580,12 @@ Description: "==" compare for equality ">" if each element of stat1 is > than stat2 "<" if each element of stat1 is < than stat2 - $fields = contains the key of the elements that needs to be compared. + $fields = contains the key of the elements that needs to be compared. type of the comparison is based on $op argument value - $flag = specify true to dump the stat1 and stat2 + $flag = specify true to dump the stat1 and stat2 */ -$all_stat_keys = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, +$all_stat_keys = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "ctime", "blksize", "blocks"); @@ -599,8 +599,8 @@ function compare_stats($stat1, $stat2, $fields, $op = "==", $flag = false ) { $result = true; - // compare values of given key from each stat array - for($index = 0; $index < count($fields); $index++) + // compare values of given key from each stat array + for($index = 0; $index < count($fields); $index++) { switch( $op ) { @@ -635,7 +635,7 @@ function compare_stats($stat1, $stat2, $fields, $op = "==", $flag = false ) { break; } } - // if the result is false(i.e values are not as expected), + // if the result is false(i.e values are not as expected), // dump the stat array so that easy to figure out the error if ( $result == false ) { echo "\n Dumping stat array 1...\n"; diff --git a/ext/standard/tests/file/windows_links/common.inc b/ext/standard/tests/file/windows_links/common.inc index 2d4b47cd51..505368b8b0 100644 --- a/ext/standard/tests/file/windows_links/common.inc +++ b/ext/standard/tests/file/windows_links/common.inc @@ -9,7 +9,7 @@ function get_junction(){ // junction.exe isn't included with Windows // its a sysinternals tool for working with filesystem links // see: http://technet.microsoft.com/en-us/sysinternals/bb896768 - + // install somewhere that is on %path% or added to %path% return "junction.exe"; } diff --git a/ext/standard/tests/file/windows_mb_path/util.inc b/ext/standard/tests/file/windows_mb_path/util.inc index 57fd8f9427..98cec87dc6 100644 --- a/ext/standard/tests/file/windows_mb_path/util.inc +++ b/ext/standard/tests/file/windows_mb_path/util.inc @@ -109,21 +109,21 @@ function remove_data($id, $dir = NULL) $objects = scandir($dir); foreach ($objects as $object) { if ($object != "." && $object != "..") { - if (filetype($dir . DIRECTORY_SEPARATOR . $object) == "dir") - remove_data($id, $dir . DIRECTORY_SEPARATOR . $object); - else + if (filetype($dir . DIRECTORY_SEPARATOR . $object) == "dir") + remove_data($id, $dir . DIRECTORY_SEPARATOR . $object); + else unlink($dir . DIRECTORY_SEPARATOR . $object); } } reset($objects); rmdir($dir); - } + } } function create_data($id, $item = "", $cp = 65001, $utf8 = true) { if ($utf8) { - /* Keep this file ASCII, so zend.multibyte related stuff can be tasted as well. */ + /* Keep this file ASCII, so zend.multibyte related stuff can be tasted as well. */ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util_utf8.inc"; return create_data_from_utf8($id, $item, $cp); } else { diff --git a/ext/standard/tests/mail/mail_include.inc b/ext/standard/tests/mail/mail_include.inc index 0785552e54..2197a1f8c1 100644 --- a/ext/standard/tests/mail/mail_include.inc +++ b/ext/standard/tests/mail/mail_include.inc @@ -3,46 +3,46 @@ $server = '{localhost}'; $default_mailbox = $server . "INBOX"; $domain = "example.com"; -$admin_user = "webmaster"; // a user with admin access +$admin_user = "webmaster"; // a user with admin access $username = "$admin_user@$domain"; $password = 'p4ssw0rd'; $users = array("webmaster", "info", "admin", "foo"); // tests require 4 valid userids $mailbox_prefix = "phpttest"; // name used for test mailbox /** - * Create a test mailbox and populate with msgs + * Create a test mailbox and populate with msgs * * @para, string mailbox_suffix Suffix used to uniquely identify mailboxes - * @param int message_count number of test msgs to be written to new mailbox - * + * @param int message_count number of test msgs to be written to new mailbox + * * @return IMAP stream to new mailbox on success; FALSE on failure */ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){ global $server, $default_mailbox, $username, $password; - + // open a stream to default mailbox $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; - } - + } + echo "Create a temporary mailbox and add " . $message_count . " msgs\n"; $new_mailbox = create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type); if ($new_mailbox === false) { echo "Cant create a temporary mailbox: " . imap_last_error(). "\n"; return false; } - + echo ".. mailbox '$new_mailbox' created\n"; - + // reopen stream to new mailbox if (imap_reopen($imap_stream, $new_mailbox) === false) { echo "cant re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n"; return false; } - + return $imap_stream; } @@ -55,9 +55,9 @@ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = nul function create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type= "simple"){ global $default_mailbox, $mailbox_prefix; $mailbox = $default_mailbox . "." . $mailbox_prefix . $mailbox_suffix; - + $mailboxes = imap_getmailboxes($imap_stream, $mailbox, '*'); - + // check mailbox does not already exist if ($mailboxes) { foreach($mailboxes as $value) { @@ -65,17 +65,17 @@ function create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type exit ("TEST FAILED : Mailbox '$mailbox' already exists\n"); } } - } + } if (imap_createmailbox($imap_stream, $mailbox) === false) { return false; } - + // Add number of test msgs requested if ($message_count > 0) { populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type); - } - + } + return $mailbox; } @@ -100,42 +100,42 @@ function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type = "s $envelope["from"]= "foo@anywhere.com"; $envelope["to"] = "$users[0]@$domain"; $envelope["subject"] = "Test msg $i"; - + $part1["type"] = TYPEMULTIPART; $part1["subtype"] = "mixed"; - + $part2["type"] = TYPETEXT; $part2["subtype"] = "plain"; $part2["description"] = "imap_mail_compose() function"; $part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx"; - + $part3["type"] = TYPETEXT; $part3["subtype"] = "plain"; $part3["description"] = "Example"; $part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"; - + $part4["type"] = TYPETEXT; $part4["subtype"] = "plain"; $part4["description"] = "Return Values"; $part4["contents.data"] = "message 3:zzzzzzzzzzzzzzzzzzzzzzzzzz"; - + $body[1] = $part1; $body[2] = $part2; $body[3] = $part3; $body[4] = $part4; - + $msg = imap_mail_compose($envelope, $body); } - + imap_append($imap_stream, $mailbox, $msg); } } /** - * Get the mailbox name from a mailbox decription, i.e strip off server details. + * Get the mailbox name from a mailbox decription, i.e strip off server details. * - * @param string mailbox complete mailbox name - * @return mailbox name + * @param string mailbox complete mailbox name + * @return mailbox name */ function get_mailbox_name($mailbox){ diff --git a/ext/standard/tests/mail/mail_skipif.inc b/ext/standard/tests/mail/mail_skipif.inc index 006594021d..8da04b072a 100644 --- a/ext/standard/tests/mail/mail_skipif.inc +++ b/ext/standard/tests/mail/mail_skipif.inc @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN' && extension_loaded('sockets')) { // imap uses tcp port 143 socket_connect($socket, "localhost", 143) or die ("skip can't socket to mail server"); } - + // Change these to make tests run successfully $mailbox = '{localhost}'; $username = 'webmaster@example.com'; diff --git a/ext/standard/type.c b/ext/standard/type.c index 070ca8ef93..19cc5d84d4 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -105,7 +105,7 @@ PHP_FUNCTION(intval) RETVAL_LONG(zval_get_long(num)); return; } - + if (base == 0 || base == 2) { char *strval = Z_STRVAL_P(num); @@ -122,7 +122,7 @@ PHP_FUNCTION(intval) if (strval[0] == '-' || strval[0] == '+') { offset = 1; } - + if (strval[offset] == '0' && (strval[offset + 1] == 'b' || strval[offset + 1] == 'B')) { char *tmpval; strlen -= 2; /* Removing "0b" */ @@ -132,7 +132,7 @@ PHP_FUNCTION(intval) if (offset) { tmpval[0] = strval[0]; } - + /* Copy the data from after "0b" to the end of the buffer */ memcpy(tmpval + offset, strval + offset + 2, strlen - offset); tmpval[strlen] = 0; @@ -392,8 +392,8 @@ PHP_FUNCTION(is_iterable) ZEND_PARSE_PARAMETERS_START(1, 1) Z_PARAM_ZVAL(var) - ZEND_PARSE_PARAMETERS_END(); - + ZEND_PARSE_PARAMETERS_END(); + RETURN_BOOL(zend_is_iterable(var)); } /* }}} */ diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 3d23925657..295b7b67c5 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -422,7 +422,7 @@ string_key: { zend_property_info *existing_propinfo; zend_string *new_key, *unmangled; - const char *unmangled_class = NULL; + const char *unmangled_class = NULL; const char *unmangled_prop; size_t unmangled_prop_len; @@ -434,7 +434,7 @@ string_key: unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0); if (Z_TYPE_P(rval) == IS_OBJECT && (unmangled_class == NULL || !strcmp(unmangled_class, "*") || !strcasecmp(unmangled_class, ZSTR_VAL(Z_OBJCE_P(rval)->name))) - && ((existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled)) != NULL) + && ((existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled)) != NULL) && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) { if (existing_propinfo->flags & ZEND_ACC_PROTECTED) { new_key = zend_mangle_property_name( diff --git a/ext/tidy/examples/cleanhtml.php b/ext/tidy/examples/cleanhtml.php index b47384b810..6dc37a0ad7 100644 --- a/ext/tidy/examples/cleanhtml.php +++ b/ext/tidy/examples/cleanhtml.php @@ -13,24 +13,24 @@ * Usage: php cleanhtml.php [filename] * */ - + if(!isset($_SERVER['argv'][1])) { $data = file_get_contents("php://stdin"); tidy_parse_string($data); } else { tidy_parse_file($_SERVER['argv'][1]); } - + tidy_clean_repair(); - + if(tidy_warning_count() || tidy_error_count()) { - + echo "\n\nThe following errors or warnings occurred:\n"; echo tidy_get_error_buffer(); echo "\n"; } - + echo tidy_get_output(); - + ?> diff --git a/ext/tidy/examples/cleanhtml5.php b/ext/tidy/examples/cleanhtml5.php index c5a1fcd338..5cad89a99c 100644 --- a/ext/tidy/examples/cleanhtml5.php +++ b/ext/tidy/examples/cleanhtml5.php @@ -13,23 +13,23 @@ * Usage: php cleanhtml5.php [filename] * */ - + if(!isset($_SERVER['argv'][1])) { $data = file_get_contents("php://stdin"); $tidy = tidy_parse_string($data); } else { $tidy = tidy_parse_file($_SERVER['argv'][1]); } - + $tidy->cleanRepair(); - + if(!empty($tidy->errorBuffer)) { - + echo "\n\nThe following errors or warnings occurred:\n"; echo "{$tidy->errorBuffer}\n"; - + } - + echo $tidy; - + ?> diff --git a/ext/tidy/examples/dumpit5.php b/ext/tidy/examples/dumpit5.php index d7aee2d652..1cae9b7d9a 100644 --- a/ext/tidy/examples/dumpit5.php +++ b/ext/tidy/examples/dumpit5.php @@ -11,21 +11,21 @@ * * Usage; php dumpit5.php <filename> */ - + $tidy = tidy_parse_file($_SERVER['argv'][1]); - + /* Optionally you can do this here if you want to fix up the document */ - + /* $tidy->clean_repair() */ - + $tree = $tidy->root(); dump_tree($tree); echo "\n"; - + function node_type($type) { - + switch($type) { - + case TIDY_NODETYPE_ROOT: return "Root Node"; case TIDY_NODETYPE_DOCTYPE: return "DocType Node"; case TIDY_NODETYPE_COMMENT: return "Comment Node"; @@ -43,23 +43,23 @@ default: return "Unknown Node"; } } - + function do_leaf($string, $indent) { for($i = 0; $i < $indent; $i++) { echo " "; } echo $string; } - + function dump_tree(tidyNode $node, $indent = 0) { - + /* Put something there if the node name is empty */ $nodename = trim(strtoupper($node->name)); $nodename = (empty($nodename)) ? "[EMPTY]" : $nodename; - + /* Generate the Node, and a pretty name for it */ do_leaf(" + $nodename (".node_type($node->type).")\n", $indent); - + /* Check to see if this node is a text node. Text nodes are generated by start/end tags and contain the text in between. i.e. <B>foo</B> will create a text node with $node->value @@ -68,25 +68,25 @@ do_leaf(" |\n", $indent); do_leaf(" +---- Value: '{$node->value}'\n", $indent); } - + if(count($node->attribute)) { do_leaf(" |\n", $indent); do_leaf(" +---- Attributes\n", $indent); - + foreach($node->attribute as $name=>$value) { @do_leaf(" +-- $name\n", $indent); do_leaf(" | +-- Value: $value\n", $indent); } } - + /* Recurse along the children to generate the remaining nodes */ if($node->hasChildren()) { foreach($node->child as $child) { dump_tree($child, $indent + 3); } } - + } - + ?>
\ No newline at end of file diff --git a/ext/tidy/examples/urlgrab5.php b/ext/tidy/examples/urlgrab5.php index 875baf0cf9..afa90b5f3a 100644 --- a/ext/tidy/examples/urlgrab5.php +++ b/ext/tidy/examples/urlgrab5.php @@ -15,13 +15,13 @@ function dump_nodes(tidyNode $node, &$urls = NULL) { $urls = (is_array($urls)) ? $urls : array(); - + if(isset($node->id)) { if($node->id == TIDY_TAG_A) { $urls[] = $node->attribute['href']; } } - + if($node->hasChildren()) { foreach($node->child as $c) { @@ -29,7 +29,7 @@ } } - + return $urls; } diff --git a/ext/tidy/package.xml b/ext/tidy/package.xml index a5b461ce45..a3f2413b24 100644 --- a/ext/tidy/package.xml +++ b/ext/tidy/package.xml @@ -29,7 +29,7 @@ but also traverse the document tree using the Zend Engine 2 OO semantics. <date>2003-11-13</date> <notes> Major API changes for PHP 5.0, including the re-introduction of resources, output buffering support, - dual-nature syntax (tidy_clean_repair($tidy_res) or $tidy->clean_repair()) and more. + dual-nature syntax (tidy_clean_repair($tidy_res) or $tidy->clean_repair()) and more. </notes> <configureoptions> <configureoption name="with-tidy" default="autodetect" prompt="Tidy library installation dir?"/> @@ -38,14 +38,14 @@ but also traverse the document tree using the Zend Engine 2 OO semantics. <file role="src" name="config.m4"/> <file role="src" name="tidy.c"/> <file role="src" name="php_tidy.h"/> - + <file role="doc" name="CREDITS"/> <file role="doc" name="TODO"/> <file role="doc" name="examples/cleanhtml.php"/> <file role="doc" name="examples/dumpit.php"/> <file role="doc" name="examples/urlgrab.php"/> <file role="doc" name="libtidy.txt"/> - + <file role="test" name="tests/001.phpt"/> <file role="test" name="tests/002.phpt"/> <file role="test" name="tests/003.phpt"/> diff --git a/ext/tokenizer/package.xml b/ext/tokenizer/package.xml index c6ad4ff2a7..57abbd5b55 100644 --- a/ext/tokenizer/package.xml +++ b/ext/tokenizer/package.xml @@ -12,10 +12,10 @@ </maintainer> </maintainers> <description> -The tokenizer functions provide an interface to the PHP tokenizer -embedded in the Zend Engine. Using these functions you may write -your own PHP source analyzing or modification tools without having -to deal with the language specification at the lexical level. +The tokenizer functions provide an interface to the PHP tokenizer +embedded in the Zend Engine. Using these functions you may write +your own PHP source analyzing or modification tools without having +to deal with the language specification at the lexical level. </description> <license>PHP</license> <release> diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 715f65a915..0bdaceb0c8 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -15,7 +15,7 @@ PHP_ARG_WITH(libexpat-dir, libexpat install dir, if test "$PHP_XML" != "no"; then - dnl + dnl dnl Default to libxml2 if --with-libexpat-dir is not used. dnl if test "$PHP_LIBEXPAT_DIR" = "no"; then @@ -31,7 +31,7 @@ if test "$PHP_XML" != "no"; then AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>]) ]) fi - + dnl dnl Check for expat only if --with-libexpat-dir is used. dnl diff --git a/ext/xml/package.xml b/ext/xml/package.xml index ae5e6450d8..cf9d382ce6 100644 --- a/ext/xml/package.xml +++ b/ext/xml/package.xml @@ -24,8 +24,8 @@ </maintainer> </maintainers> <description> -This extension lets you create XML parsers and then define -handlers for different XML events. Each XML parser also has +This extension lets you create XML parsers and then define +handlers for different XML events. Each XML parser also has a few parameters you can adjust. </description> <license>PHP</license> diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 498f471361..637932f5d9 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -34,7 +34,7 @@ extern zend_module_entry xml_module_entry; #define xml_module_ptr NULL #endif -#ifdef HAVE_XML +#ifdef HAVE_XML #include "expat_compat.h" @@ -60,7 +60,7 @@ typedef struct { zval unparsedEntityDeclHandler; zval notationDeclHandler; zval externalEntityRefHandler; - zval unknownEncodingHandler; + zval unknownEncodingHandler; zval startNamespaceDeclHandler; zval endNamespaceDeclHandler; @@ -88,7 +88,7 @@ typedef struct { int lastwasopen; int skipwhite; int isparsing; - + XML_Char *baseURI; } xml_parser; @@ -108,9 +108,9 @@ enum php_xml_option { }; /* for xml_parse_into_struct */ - + #define XML_MAXLEVEL 255 /* XXX this should be dynamic */ - + PHP_FUNCTION(xml_parser_create); PHP_FUNCTION(xml_parser_create_ns); PHP_FUNCTION(xml_set_object); diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 9b8281e1b3..da635fd706 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -280,7 +280,7 @@ xml_encoding xml_encodings[] = { static XML_Memory_Handling_Suite php_xml_mem_hdlrs; /* True globals, no need for thread safety */ -static int le_xml_parser; +static int le_xml_parser; /* }}} */ @@ -343,7 +343,7 @@ PHP_MINIT_FUNCTION(xml) REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); /* this object should not be pre-initialised at compile time, - as the order of members may vary */ + as the order of members may vary */ php_xml_mem_hdlrs.malloc_fcn = php_xml_malloc_wrapper; php_xml_mem_hdlrs.realloc_fcn = php_xml_realloc_wrapper; @@ -391,7 +391,7 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi static void xml_parser_dtor(zend_resource *rsrc) { xml_parser *parser = (xml_parser *)rsrc->ptr; - + if (parser->parser) { XML_ParserFree(parser->parser); } @@ -469,7 +469,7 @@ static void xml_set_handler(zval *handler, zval *data) /* {{{ xml_call_handler() */ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval *argv, zval *retval) { - int i; + int i; ZVAL_UNDEF(retval); if (parser && handler && !EG(exception)) { @@ -498,10 +498,10 @@ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *f Z_TYPE_P(obj) == IS_OBJECT && Z_TYPE_P(method) == IS_STRING) { php_error_docref(NULL, E_WARNING, "Unable to call handler %s::%s()", ZSTR_VAL(Z_OBJCE_P(obj)->name), Z_STRVAL_P(method)); - } else + } else php_error_docref(NULL, E_WARNING, "Unable to call handler"); } - } + } for (i = 0; i < argc; i++) { zval_ptr_dtor(&argv[i]); } @@ -683,10 +683,10 @@ static void _xml_add_to_info(xml_parser *parser,char *name) zval values; array_init(&values); element = zend_hash_str_update(Z_ARRVAL(parser->info), name, strlen(name), &values); - } - + } + add_next_index_long(element, parser->curtag); - + parser->curtag++; } /* }}} */ @@ -737,10 +737,10 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch zend_string_release(att); } - + xml_call_handler(parser, &parser->startElementHandler, parser->startElementPtr, 3, args, &retval); zval_ptr_dtor(&retval); - } + } if (!Z_ISUNDEF(parser->data)) { if (parser->level <= XML_MAXLEVEL) { @@ -810,7 +810,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) xml_call_handler(parser, &parser->endElementHandler, parser->endElementPtr, 2, args, &retval); zval_ptr_dtor(&retval); - } + } if (!Z_ISUNDEF(parser->data)) { zval tag; @@ -819,13 +819,13 @@ void _xml_endElementHandler(void *userData, const XML_Char *name) add_assoc_string(parser->ctag, "type", "complete"); } else { array_init(&tag); - + _xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset); add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */ add_assoc_string(&tag, "type", "close"); add_assoc_long(&tag, "level", parser->level); - + zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } @@ -856,7 +856,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); xml_call_handler(parser, &parser->characterDataHandler, parser->characterDataPtr, 2, args, &retval); zval_ptr_dtor(&retval); - } + } if (!Z_ISUNDEF(parser->data)) { size_t i; @@ -881,7 +881,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) if (doprint || (! parser->skipwhite)) { if (parser->lastwasopen) { zval *myval; - + /* check if the current tag already has a value - if yes append to that! */ if ((myval = zend_hash_str_find(Z_ARRVAL_P(parser->ctag), "value", sizeof("value") - 1))) { int newlen = Z_STRLEN_P(myval) + ZSTR_LEN(decoded_value); @@ -892,7 +892,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) } else { add_assoc_str(parser->ctag, "value", decoded_value); } - + } else { zval tag; zval *curtag, *mytype, *myval; @@ -970,8 +970,8 @@ void _xml_defaultHandler(void *userData, const XML_Char *s, int len) /* }}} */ /* {{{ _xml_unparsedEntityDeclHandler() */ -void _xml_unparsedEntityDeclHandler(void *userData, - const XML_Char *entityName, +void _xml_unparsedEntityDeclHandler(void *userData, + const XML_Char *entityName, const XML_Char *base, const XML_Char *systemId, const XML_Char *publicId, @@ -1092,9 +1092,9 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp char *ns_param = NULL; size_t ns_param_len = 0; - + XML_Char *encoding; - + if (zend_parse_parameters(ZEND_NUM_ARGS(), (ns_support ? "|ss": "|s"), &encoding_param, &encoding_param_len, &ns_param, &ns_param_len) == FAILURE) { RETURN_FALSE; } @@ -1139,15 +1139,15 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp } /* }}} */ -/* {{{ proto resource xml_parser_create([string encoding]) +/* {{{ proto resource xml_parser_create([string encoding]) Create an XML parser */ PHP_FUNCTION(xml_parser_create) { - php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); + php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } /* }}} */ -/* {{{ proto resource xml_parser_create_ns([string encoding [, string sep]]) +/* {{{ proto resource xml_parser_create_ns([string encoding [, string sep]]) Create an XML parser */ PHP_FUNCTION(xml_parser_create_ns) { @@ -1155,7 +1155,7 @@ PHP_FUNCTION(xml_parser_create_ns) } /* }}} */ -/* {{{ proto int xml_set_object(resource parser, object &obj) +/* {{{ proto int xml_set_object(resource parser, object &obj) Set up object which should be used for callbacks */ PHP_FUNCTION(xml_set_object) { @@ -1184,7 +1184,7 @@ PHP_FUNCTION(xml_set_object) } /* }}} */ -/* {{{ proto int xml_set_element_handler(resource parser, string shdl, string ehdl) +/* {{{ proto int xml_set_element_handler(resource parser, string shdl, string ehdl) Set up start and end element handlers */ PHP_FUNCTION(xml_set_element_handler) { @@ -1206,7 +1206,7 @@ PHP_FUNCTION(xml_set_element_handler) } /* }}} */ -/* {{{ proto int xml_set_character_data_handler(resource parser, string hdl) +/* {{{ proto int xml_set_character_data_handler(resource parser, string hdl) Set up character data handler */ PHP_FUNCTION(xml_set_character_data_handler) { @@ -1227,7 +1227,7 @@ PHP_FUNCTION(xml_set_character_data_handler) } /* }}} */ -/* {{{ proto int xml_set_processing_instruction_handler(resource parser, string hdl) +/* {{{ proto int xml_set_processing_instruction_handler(resource parser, string hdl) Set up processing instruction (PI) handler */ PHP_FUNCTION(xml_set_processing_instruction_handler) { @@ -1248,7 +1248,7 @@ PHP_FUNCTION(xml_set_processing_instruction_handler) } /* }}} */ -/* {{{ proto int xml_set_default_handler(resource parser, string hdl) +/* {{{ proto int xml_set_default_handler(resource parser, string hdl) Set up default handler */ PHP_FUNCTION(xml_set_default_handler) { @@ -1269,7 +1269,7 @@ PHP_FUNCTION(xml_set_default_handler) } /* }}} */ -/* {{{ proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) +/* {{{ proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) Set up unparsed entity declaration handler */ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) { @@ -1290,7 +1290,7 @@ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) } /* }}} */ -/* {{{ proto int xml_set_notation_decl_handler(resource parser, string hdl) +/* {{{ proto int xml_set_notation_decl_handler(resource parser, string hdl) Set up notation declaration handler */ PHP_FUNCTION(xml_set_notation_decl_handler) { @@ -1311,7 +1311,7 @@ PHP_FUNCTION(xml_set_notation_decl_handler) } /* }}} */ -/* {{{ proto int xml_set_external_entity_ref_handler(resource parser, string hdl) +/* {{{ proto int xml_set_external_entity_ref_handler(resource parser, string hdl) Set up external entity reference handler */ PHP_FUNCTION(xml_set_external_entity_ref_handler) { @@ -1332,7 +1332,7 @@ PHP_FUNCTION(xml_set_external_entity_ref_handler) } /* }}} */ -/* {{{ proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) +/* {{{ proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) Set up character data handler */ PHP_FUNCTION(xml_set_start_namespace_decl_handler) { @@ -1353,7 +1353,7 @@ PHP_FUNCTION(xml_set_start_namespace_decl_handler) } /* }}} */ -/* {{{ proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) +/* {{{ proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) Set up character data handler */ PHP_FUNCTION(xml_set_end_namespace_decl_handler) { @@ -1416,7 +1416,7 @@ PHP_FUNCTION(xml_parse_into_struct) return; } - if (info) { + if (info) { zval_ptr_dtor(info); array_init(info); } @@ -1429,11 +1429,11 @@ PHP_FUNCTION(xml_parse_into_struct) array_init(xdata); ZVAL_COPY_VALUE(&parser->data, xdata); - + if (info) { ZVAL_COPY_VALUE(&parser->info, info); } - + parser->level = 0; parser->ltags = safe_emalloc(XML_MAXLEVEL, sizeof(char *), 0); @@ -1448,7 +1448,7 @@ PHP_FUNCTION(xml_parse_into_struct) } /* }}} */ -/* {{{ proto int xml_get_error_code(resource parser) +/* {{{ proto int xml_get_error_code(resource parser) Get XML parser error code */ PHP_FUNCTION(xml_get_error_code) { @@ -1485,7 +1485,7 @@ PHP_FUNCTION(xml_error_string) } /* }}} */ -/* {{{ proto int xml_get_current_line_number(resource parser) +/* {{{ proto int xml_get_current_line_number(resource parser) Get current line number for an XML parser */ PHP_FUNCTION(xml_get_current_line_number) { @@ -1523,7 +1523,7 @@ PHP_FUNCTION(xml_get_current_column_number) } /* }}} */ -/* {{{ proto int xml_get_current_byte_index(resource parser) +/* {{{ proto int xml_get_current_byte_index(resource parser) Get current byte index for an XML parser */ PHP_FUNCTION(xml_get_current_byte_index) { @@ -1542,7 +1542,7 @@ PHP_FUNCTION(xml_get_current_byte_index) } /* }}} */ -/* {{{ proto int xml_parser_free(resource parser) +/* {{{ proto int xml_parser_free(resource parser) Free an XML parser */ PHP_FUNCTION(xml_parser_free) { @@ -1570,7 +1570,7 @@ PHP_FUNCTION(xml_parser_free) } /* }}} */ -/* {{{ proto int xml_parser_set_option(resource parser, int option, mixed value) +/* {{{ proto int xml_parser_set_option(resource parser, int option, mixed value) Set options in an XML parser */ PHP_FUNCTION(xml_parser_set_option) { @@ -1623,7 +1623,7 @@ PHP_FUNCTION(xml_parser_set_option) } /* }}} */ -/* {{{ proto int xml_parser_get_option(resource parser, int option) +/* {{{ proto int xml_parser_get_option(resource parser, int option) Get options from an XML parser */ PHP_FUNCTION(xml_parser_get_option) { diff --git a/ext/xmlreader/README b/ext/xmlreader/README index f85e4a2121..66f16b6cbc 100644 --- a/ext/xmlreader/README +++ b/ext/xmlreader/README @@ -1,5 +1,5 @@ -XMLReader represents a reader that provides non-cached, -forward-only access to XML data. It is based upon the +XMLReader represents a reader that provides non-cached, +forward-only access to XML data. It is based upon the xmlTextReader api from libxml This extension is designed to only work under PHP 5+. diff --git a/ext/xmlreader/package.xml b/ext/xmlreader/package.xml index 6536b78c1f..8136d78780 100644 --- a/ext/xmlreader/package.xml +++ b/ext/xmlreader/package.xml @@ -4,8 +4,8 @@ <name>xmlreader</name> <summary>Provides fast, non-cached, forward-only access to XML data under PHP 5.</summary> <description> - This extension wraps the libxml xmlReader API. The reader acts as a cursor - going forward on the document stream and stopping at each node in the way. + This extension wraps the libxml xmlReader API. The reader acts as a cursor + going forward on the document stream and stopping at each node in the way. xmlReader is similar to SAX though uses a much simpler API. </description> <license>PHP License</license> @@ -52,7 +52,7 @@ <file role="src" name="config.w32"/> <file role="src" name="php_xmlreader.c"/> <file role="src" name="php_xmlreader.h"/> - + <file role="doc" name="CREDITS"/> <file role="doc" name="TODO"/> <file role="doc" name="README"/> diff --git a/ext/xmlrpc/EXPERIMENTAL b/ext/xmlrpc/EXPERIMENTAL index 6443e99646..51f50405ea 100644 --- a/ext/xmlrpc/EXPERIMENTAL +++ b/ext/xmlrpc/EXPERIMENTAL @@ -1,5 +1,5 @@ this extension is experimental, -its functions may change their names -or move to extension all together -so do not rely to much on them +its functions may change their names +or move to extension all together +so do not rely to much on them you have been warned! diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 6ed7a6312a..b51b0d7afd 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -67,11 +67,11 @@ if test "$PHP_XMLRPC" != "no"; then if test "$PHP_ICONV_DIR" != "no"; then PHP_ICONV=$PHP_ICONV_DIR fi - + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then PHP_ICONV=yes fi - + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) ]) diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 b/ext/xmlrpc/libxmlrpc/xmlrpc.m4 index 87da92db8a..955376072f 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.m4 @@ -1,4 +1,4 @@ -AC_DEFUN([XMLRPC_CHECKS],[ +AC_DEFUN([XMLRPC_CHECKS],[ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_PROG_LN_S]) diff --git a/ext/xmlwriter/package.xml b/ext/xmlwriter/package.xml index 01f7ad4424..829b86d5cb 100644 --- a/ext/xmlwriter/package.xml +++ b/ext/xmlwriter/package.xml @@ -45,7 +45,7 @@ <date>2005-05-24</date> <state>beta</state> <notes> - Add OO interface (php5 only) + Add OO interface (php5 only) Add test cases </notes> </release> diff --git a/ext/xmlwriter/package2.xml b/ext/xmlwriter/package2.xml index ec6ef313b1..a5a4ecb022 100644 --- a/ext/xmlwriter/package2.xml +++ b/ext/xmlwriter/package2.xml @@ -87,7 +87,7 @@ <release>stable</release> <api>stable</api> </stability> - <license uri="http://www.php.net/license">PHP License</license> + <license uri="http://www.php.net/license">PHP License</license> <notes>Promote to stable</notes> </release> </changelog> diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4 index 9b6f8aaa49..b06fdbf802 100644 --- a/ext/xsl/config.m4 +++ b/ext/xsl/config.m4 @@ -11,7 +11,7 @@ if test "$PHP_XSL" != "no"; then if test "$PHP_LIBXML" = "no"; then AC_MSG_ERROR([XSL extension requires LIBXML extension, add --enable-libxml]) fi - + if test "$PHP_DOM" = "no"; then AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom]) fi @@ -37,7 +37,7 @@ if test "$PHP_XSL" != "no"; then XSL_INCS=`$XSLT_CONFIG --cflags` PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD) PHP_EVAL_INCLINE($XSL_INCS) - + AC_MSG_CHECKING([for EXSLT support]) for i in $PHP_XSL /usr/local /usr; do if test -r "$i/include/libexslt/exslt.h"; then @@ -47,7 +47,7 @@ if test "$PHP_XSL" != "no"; then done if test -z "$PHP_XSL_EXSL_DIR"; then AC_MSG_RESULT(not found) - else + else AC_MSG_RESULT(found) PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD) PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include) @@ -56,10 +56,10 @@ if test "$PHP_XSL" != "no"; then else AC_MSG_ERROR([libxslt version 1.1.0 or greater required.]) fi - - + + fi - + AC_DEFINE(HAVE_XSL,1,[ ]) PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared) PHP_SUBST(XSL_SHARED_LIBADD) diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32 index 47c8bbff94..8c88f081ee 100644 --- a/ext/xsl/config.w32 +++ b/ext/xsl/config.w32 @@ -41,7 +41,7 @@ if (PHP_XSL != "no") { ADD_FLAG("LDFLAGS_XSL", "/nodefaultlib:msvcrt"); } } - + } else { WARNING("xsl not enabled; libraries and headers not found"); } diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index e39fac3803..6e3aef4e43 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -20,7 +20,7 @@ if (PHP_ZIP != "no") { ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION"); } else if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" + PHP_ZIP) && CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", configure_module_dirname + "\\lib;" + PHP_ZIP) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) || + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip", PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) ) { EXTENSION('zip', 'php_zip.c zip_stream.c'); diff --git a/ext/zip/examples/oldapi.php b/ext/zip/examples/oldapi.php index 2f17f43ebd..82a6277f3a 100644 --- a/ext/zip/examples/oldapi.php +++ b/ext/zip/examples/oldapi.php @@ -8,8 +8,8 @@ if ($zip) { while ($zip_entry = zip_read($zip)) { var_dump($zip_entry); $txt = zip_entry_read($zip_entry, 10); - echo $i . ": " . $txt . "size: " . zip_entry_filesize($zip_entry) . - "comp_method: " . zip_entry_compressionmethod($zip_entry) . + echo $i . ": " . $txt . "size: " . zip_entry_filesize($zip_entry) . + "comp_method: " . zip_entry_compressionmethod($zip_entry) . "\n"; $i++; } diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index c2533744e1..4139ac239d 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -11,8 +11,8 @@ PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(ZLIB_SHARED_LIBADD) - - if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then + + if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then if test -f $PHP_ZLIB/include/zlib/zlib.h; then ZLIB_DIR=$PHP_ZLIB ZLIB_INCDIR=$ZLIB_DIR/include/zlib @@ -20,7 +20,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then ZLIB_DIR=$PHP_ZLIB ZLIB_INCDIR=$ZLIB_DIR/include fi - else + else for i in /usr/local /usr $PHP_ZLIB_DIR; do if test -f $i/include/zlib/zlib.h; then ZLIB_DIR=$i @@ -31,13 +31,13 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then fi done fi - + if test -z "$ZLIB_DIR"; then AC_MSG_ERROR(Cannot find zlib) fi case $ZLIB_DIR in - /usr) ac_extra= ;; + /usr) ac_extra= ;; *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; esac @@ -49,7 +49,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then fi PHP_CHECK_LIBRARY(z, gzgets, [ - AC_DEFINE(HAVE_ZLIB,1,[ ]) + AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ AC_MSG_ERROR(ZLIB extension requires gzgets in zlib) ],[ diff --git a/ext/zlib/package.xml b/ext/zlib/package.xml index 7eb9fa0936..d1061510c8 100644 --- a/ext/zlib/package.xml +++ b/ext/zlib/package.xml @@ -30,9 +30,9 @@ </maintainer> </maintainers> <description> -This module enables you to transparently read and write -gzip (.gz) compressed files, through versions of most of -the filesystem functions which work with gzip-compressed +This module enables you to transparently read and write +gzip (.gz) compressed files, through versions of most of +the filesystem functions which work with gzip-compressed files (and uncompressed files, too, but not with sockets). </description> <license>PHP</license> diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc index 441199ff08..dce79b0204 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -36,17 +36,17 @@ With this regard their currents turn away, And lose the name of action. -Hath not a Jew eyes? Hath not a Jew hands, organs, dimensions, -senses, affections, passions; fed with the same food, hurt with -the same weapons, subject to the same diseases, heal'd by -the same means, warm'd and cool'd by the same winter and summer -as a Christian is? If you prick us, do we not bleed? If you -tickle us, do we not laugh? If you poison us, do we not die? -And if you wrong us, shall we not revenge? If we are like you -in the rest, we will resemble you in that. If a Jew wrong a -Christian, what is his humility? Revenge. If a Christian wrong -a Jew, what should his sufferance be by Christian example? Why, -revenge. The villainy you teach me, I will execute, and it +Hath not a Jew eyes? Hath not a Jew hands, organs, dimensions, +senses, affections, passions; fed with the same food, hurt with +the same weapons, subject to the same diseases, heal'd by +the same means, warm'd and cool'd by the same winter and summer +as a Christian is? If you prick us, do we not bleed? If you +tickle us, do we not laugh? If you poison us, do we not die? +And if you wrong us, shall we not revenge? If we are like you +in the rest, we will resemble you in that. If a Jew wrong a +Christian, what is his humility? Revenge. If a Christian wrong +a Jew, what should his sufferance be by Christian example? Why, +revenge. The villainy you teach me, I will execute, and it shall go hard but I will better the instruction. Is this a dagger which I see before me, @@ -65,7 +65,7 @@ Or else worth all the rest; I see thee still, And on thy blade and dudgeon gouts of blood, Which was not so before. There's no such thing: -It is the bloody business which informs Thus to mine eyes. +It is the bloody business which informs Thus to mine eyes. Now o'er the one halfworld Nature seems dead, and wicked dreams abuse The curtain'd sleep; witchcraft celebrates Pale Hecate's offerings, and wither'd murder, @@ -73,7 +73,7 @@ Alarum'd by his sentinel, the wolf, Whose howl's his watch, thus with his stealthy pace. With Tarquin's ravishing strides, towards his design Moves like a ghost. Thou sure and firm-set earth, -Hear not my steps, which way they walk, +Hear not my steps, which way they walk, for fear Thy very stones prate of my whereabout, And take the present horror from the time, Which now suits with it. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 67e1116378..fde9f02ffa 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -936,7 +936,7 @@ PHP_FUNCTION(inflate_add) "flush mode must be ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK or ZLIB_FINISH"); RETURN_FALSE; } - + /* Lazy-resetting the zlib stream so ctx->total_in remains available until the next inflate_add() call. */ if (((php_zlib_context *) ctx)->status == Z_STREAM_END) { @@ -1036,7 +1036,7 @@ PHP_FUNCTION(inflate_get_status) php_error_docref(NULL, E_WARNING, "Invalid zlib.inflate resource"); RETURN_FALSE; } - + RETURN_LONG(((php_zlib_context *) ctx)->status); } /* }}} */ diff --git a/ext/zlib/zlib_win32_howto.txt b/ext/zlib/zlib_win32_howto.txt index 59ff3c4f4c..89bdb29f1e 100644 --- a/ext/zlib/zlib_win32_howto.txt +++ b/ext/zlib/zlib_win32_howto.txt @@ -13,4 +13,3 @@ Start Visual Studio, load php_modules.dsw, select the ZLIB projects, and build it. -
\ No newline at end of file diff --git a/main/SAPI.c b/main/SAPI.c index 6f7556fffa..6216fd8176 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -868,7 +868,7 @@ SAPI_API int sapi_send_headers(void) memcpy(default_header.header, "Content-type: ", sizeof("Content-type: ") - 1); memcpy(default_header.header + sizeof("Content-type: ") - 1, SG(sapi_headers).mimetype, len + 1); - + sapi_header_add_op(SAPI_HEADER_ADD, &default_header); } else { efree(default_mimetype); diff --git a/main/network.c b/main/network.c index c5cf5a5f06..13964e34f8 100644 --- a/main/network.c +++ b/main/network.c @@ -1278,11 +1278,11 @@ struct hostent * gethostname_re (const char *host,struct hostent *hostbuf,char * int herr,res; if (*hstbuflen == 0) { - *hstbuflen = 1024; + *hstbuflen = 1024; *tmphstbuf = (char *)malloc (*hstbuflen); } - while (( res = + while (( res = gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&hp,&herr)) && (errno == ERANGE)) { /* Enlarge the buffer. */ @@ -1293,7 +1293,7 @@ struct hostent * gethostname_re (const char *host,struct hostent *hostbuf,char * if (res != SUCCESS) { return NULL; } - + return hp; } #endif @@ -1308,7 +1308,7 @@ struct hostent * gethostname_re (const char *host,struct hostent *hostbuf,char * *tmphstbuf = (char *)malloc (*hstbuflen); } - while ((NULL == ( hp = + while ((NULL == ( hp = gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&herr))) && (errno == ERANGE)) { /* Enlarge the buffer. */ diff --git a/main/php_sprintf.c b/main/php_sprintf.c index 330d4bd7ee..b104fb3486 100644 --- a/main/php_sprintf.c +++ b/main/php_sprintf.c @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ diff --git a/main/strlcat.c b/main/strlcat.c index 88cef70c56..f138c86c73 100644 --- a/main/strlcat.c +++ b/main/strlcat.c @@ -62,7 +62,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.17 2016/10/14 18:19:04 dtucker Exp * Appends src to string dst of size siz (unlike strncat, siz is the * full size of dst, not space left). At most siz-1 characters * will be copied. Always NUL terminates (unless siz <= strlen(dst)). - * Returns strlen(src) + MIN(siz, strlen(initial dst). + * Returns strlen(src) + MIN(siz, strlen(initial dst). * If retval >= siz, truncation occurred. */ PHPAPI size_t php_strlcat(dst, src, siz) @@ -12,9 +12,9 @@ # php-X.Y.Z[sub] # # The distribution ends up in a .tar.gz file that contains the distribution -# in a directory called php-<version>. +# in a directory called php-<version>. # A .tar.bz2 file is also created. -# +# # Written by Stig Bakken <ssb@guardian.no> 1997-05-28. # Adapted to git by Stanislav Malyshev <stas@php.net> @@ -115,7 +115,7 @@ sed -i 's,^int zendparse\(.*\),ZEND_API int zendparse\1,g' $MY_OLDPWD/php-$VER/Z sed -i 's,^int zendparse\(.*\),ZEND_API int zendparse\1,g' $MY_OLDPWD/php-$VER/Zend/zend_language_parser.h sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef YYTOKENTYPE,g' $MY_OLDPWD/php-$VER/Zend/zend_language_parser.h -# download pear +# download pear $ECHO_N "makedist: Attempting to download PEAR's phar archive" if test ! -x wget; then wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/ diff --git a/php.ini-development b/php.ini-development index 8dbdba3274..2c18ba41dc 100644 --- a/php.ini-development +++ b/php.ini-development @@ -865,7 +865,7 @@ default_socket_timeout = 60 ; For example: ; ; extension=mysqli -; +; ; When the extension library to load is not located in the default extension ; directory, You may specify an absolute path to the library file: ; diff --git a/php.ini-production b/php.ini-production index bcb082827c..b8f8449aff 100644 --- a/php.ini-production +++ b/php.ini-production @@ -872,7 +872,7 @@ default_socket_timeout = 60 ; For example: ; ; extension=mysqli -; +; ; When the extension library to load is not located in the default extension ; directory, You may specify an absolute path to the library file: ; diff --git a/run-tests.php b/run-tests.php index f4720f5b76..2801959f10 100755 --- a/run-tests.php +++ b/run-tests.php @@ -102,7 +102,7 @@ if (empty($environment)) { } if (empty($environment['TEMP'])) { $environment['TEMP'] = sys_get_temp_dir(); - + if (empty($environment['TEMP'])) { // for example, OpCache on Windows will fail in this case because child processes (for tests) will not get // a TEMP variable, so GetTempPath() will fallback to c:\windows, while GetTempPath() will return %TEMP% for parent @@ -110,7 +110,7 @@ if (empty($environment['TEMP'])) { // the OpCache because it will be using the wrong path. die("TEMP environment is NOT set"); } else if (count($environment)==1) { - // not having other environment variables, only having TEMP, is probably ok, but strange and may make a + // not having other environment variables, only having TEMP, is probably ok, but strange and may make a // difference in the test pass rate, so warn the user. echo "WARNING: Only 1 environment variable will be available to tests(TEMP environment variable)".PHP_EOL; } diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index 4defa336c6..d624141c9f 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -3,7 +3,7 @@ WHAT IS THIS? This module exploits the layered I/O support in Apache 2.0. HOW DOES IT WORK? - + In Apache 2.0, you have handlers which generate content (like reading a script from disk). The content goes then through a chain of filters. PHP can be such a filter, so that it processes @@ -12,10 +12,10 @@ HOW DOES IT WORK? DOES IT WORK? - Currently the issues with the module are: + Currently the issues with the module are: * Thread safety of external PHP modules - * The lack of re-entrancy of PHP. due to this I have disabled the 'virtual' - function, and tried to stop any method where a php script can run another php + * The lack of re-entrancy of PHP. due to this I have disabled the 'virtual' + function, and tried to stop any method where a php script can run another php script while it is being run. @@ -36,15 +36,15 @@ HOW TO INSTALL $ cd php-4.x $ ./configure --with-apxs2=/path/to/apache-2.0/bin/apxs $ make install - + At the end of conf/httpd.conf, add: AddType application/x-httpd-php .php If you would like to enable source code highlighting functionality add: - + AddType application/x-httpd-php-source .phps - + That's it. Now start bin/httpd. HOW TO CONFIGURE @@ -57,15 +57,15 @@ HOW TO CONFIGURE PHPINIDir "conf" DEBUGGING APACHE AND PHP - + To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. 2. Start httpd using -DONE_PROCESS (e.g. (gdb) r -DONE_PROCESS). - If you want to debug a part of the PHP startup procedure, set a - breakpoint on 'load_module'. Step through it until apr_dso_load() is + If you want to debug a part of the PHP startup procedure, set a + breakpoint on 'load_module'. Step through it until apr_dso_load() is done. Then you can set a breakpoint on any PHP-related symbol. TODO @@ -73,4 +73,4 @@ TODO PHP functions like apache_sub_req (see php_functions.c) Source Code Highlighting Protocol handlers - + diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 2e64b215e5..8879140843 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -23,7 +23,7 @@ if test "$PHP_APXS2" != "no"; then if test "$?" != "0"; then AC_MSG_RESULT() AC_MSG_RESULT() - AC_MSG_RESULT([Sorry, I cannot run apxs. Possible reasons follow:]) + AC_MSG_RESULT([Sorry, I cannot run apxs. Possible reasons follow:]) AC_MSG_RESULT() AC_MSG_RESULT([1. Perl is not installed]) AC_MSG_RESULT([2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs]) @@ -32,7 +32,7 @@ if test "$PHP_APXS2" != "no"; then AC_MSG_RESULT([The output of $APXS follows:]) $APXS -q CFLAGS AC_MSG_ERROR([Aborting]) - fi + fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` APXS_BINDIR=`$APXS -q BINDIR` @@ -84,7 +84,7 @@ if test "$PHP_APXS2" != "no"; then *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *darwin*) dnl When using bundles on Darwin, we must resolve all symbols. However, @@ -111,7 +111,7 @@ if test "$PHP_APXS2" != "no"; then INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) - PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) + PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; esac diff --git a/sapi/cgi/README.FastCGI b/sapi/cgi/README.FastCGI index f0f11e102d..4d34ff3dac 100644 --- a/sapi/cgi/README.FastCGI +++ b/sapi/cgi/README.FastCGI @@ -91,8 +91,8 @@ use the above configuration, but rather the following. Alias /fcgi-bin/ /space/fcgi-bin/ FastCgiServer /path/to/php-cgi -processes 5 -For either of the above configurations, we need to tell Apache to -use the FastCGI binary /fcgi-bin/php to deliver PHP pages. +For either of the above configurations, we need to tell Apache to +use the FastCGI binary /fcgi-bin/php to deliver PHP pages. All that is needed is: AddType application/x-httpd-fastphp .php diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e51277c218..16bb2126d2 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -2183,8 +2183,8 @@ consult the installation file that came with this distribution, or visit \n\ int i; ZeroMemory(&kid_cgi_ps, sizeof(kid_cgi_ps)); - kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN; - + kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN; + InitializeCriticalSection(&cleanup_lock); SetConsoleCtrlHandler(fastcgi_cleanup, TRUE); @@ -2288,10 +2288,10 @@ consult the installation file that came with this distribution, or visit \n\ fprintf(stderr, "unable to spawn: [0x%08lx]: %s\n", err, err_text); } } - + WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE); } - + parent_loop_end: /* restore my env */ SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf); @@ -2775,7 +2775,7 @@ fastcgi_request_done: } /* end of fastcgi loop */ } - + if (request) { fcgi_destroy_request(request); } diff --git a/sapi/cgi/tests/include.inc b/sapi/cgi/tests/include.inc index dc98dc0f23..61b339e49f 100644 --- a/sapi/cgi/tests/include.inc +++ b/sapi/cgi/tests/include.inc @@ -38,7 +38,7 @@ function get_cgi_path() /* {{{ */ } } - if ($php_path && is_dir($php_path) && file_exists($php_path."/cgi/php-cgi") && is_executable($php_path."/cgi/php-cgi")) { + if ($php_path && is_dir($php_path) && file_exists($php_path."/cgi/php-cgi") && is_executable($php_path."/cgi/php-cgi")) { /* gotcha */ return $php_path."/cgi/php-cgi"; } diff --git a/sapi/cli/README b/sapi/cli/README index 8720250f6a..5b303aa82d 100644 --- a/sapi/cli/README +++ b/sapi/cli/README @@ -1,5 +1,5 @@ The CLI (command line interface) SAPI has been introduced -with a goal of making PHP better at supporting the creation of +with a goal of making PHP better at supporting the creation of stand alone applications. It is based on CGI SAPI with all CGI specific things removed. @@ -11,7 +11,7 @@ The main differences between the two: * It does not change the working directory to that of the script. (-C switch kept for compatibility) * Plain text error message -* $argc and $argv registered irrespective of the register_argc_argv +* $argc and $argv registered irrespective of the register_argc_argv php.ini setting. * implicit_flush always on * -r option which allows execution of PHP code directly from diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 5d82093c0a..88a43d30cb 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -8,32 +8,32 @@ [options] [ .B \-f\fP ] .IR file -[[\-\-] +[[\-\-] .IR args.\|.\|. ] .LP .B @program_prefix@php -[options] -.B \-r +[options] +.B \-r .IR code [[\-\-] .IR args.\|.\|. ] .LP .B @program_prefix@php -[options] [\-B +[options] [\-B .IR begin_code ] -.B \-R +.B \-R .IR code -[\-E +[\-E .IR end_code ] [[\-\-] .IR args.\|.\|. ] .LP .B @program_prefix@php -[options] [\-B +[options] [\-B .IR begin_code ] -.B \-F +.B \-F .IR file -[\-E +[\-E .IR end_code ] [[\-\-] .IR args.\|.\|. ] @@ -51,39 +51,39 @@ .IR docroot ] .LP .SH DESCRIPTION -\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for +\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for Web development and can be embedded into HTML. This is the command line interface that enables you to do the following: .P -You can parse and execute files by using parameter \-f followed by the name of the -.IR file +You can parse and execute files by using parameter \-f followed by the name of the +.IR file to be executed. .LP -Using parameter \-r you can directly execute PHP -.IR code +Using parameter \-r you can directly execute PHP +.IR code simply as you would do inside a .B \.php -file when using the -.B eval() +file when using the +.B eval() function. .LP It is also possible to process the standard input line by line using either the parameter \-R or \-F. In this mode each separate input line causes the -.IR code -specified by \-R or the +.IR code +specified by \-R or the .IR file specified by \-F to be executed. You can access the input line by \fB$argn\fP. While processing the input lines -.B $argi +.B $argi contains the number of the actual line being processed. Further more -the parameters \-B and \-E can be used to execute +the parameters \-B and \-E can be used to execute .IR code (see \-r) before and after all input lines have been processed respectively. Notice that the input is read from .B STDIN -and therefore reading from -.B STDIN +and therefore reading from +.B STDIN explicitly changes the next input line or skips input lines. .LP PHP also contains an built-in web server for application development purpose. By using the \-S option where @@ -92,9 +92,9 @@ point to a local address and port PHP will listen to HTTP requests on that addre .B docroot passed by the \-t option. .LP -If none of \-r \-f \-B \-R \-F \-E or \-S is present but a single parameter is given -then this parameter is taken as the filename to parse and execute (same as -with \-f). If no parameter is present then the standard input is read and +If none of \-r \-f \-B \-R \-F \-E or \-S is present but a single parameter is given +then this parameter is taken as the filename to parse and execute (same as +with \-f). If no parameter is present then the standard input is read and executed. .SH OPTIONS .TP 15 @@ -140,8 +140,8 @@ Measure execution time of script repeated count times (CGI only). .TP .PD 1 .B \-c \fIpath\fP|\fIfile\fP -Look for -.B php.ini +Look for +.B php.ini file in the directory .IR path or use the specified @@ -152,8 +152,8 @@ or use the specified .TP .PD 1 .B \-n -No -.B php.ini +No +.B php.ini file will be used .TP .PD 0 @@ -161,8 +161,8 @@ file will be used .TP .PD 1 .B \-d \fIfoo\fP[=\fIbar\fP] -Define INI entry -.IR foo +Define INI entry +.IR foo with value .IR bar .TP @@ -174,7 +174,7 @@ Generate extended information for debugger/profiler .TP .PD 1 .B \-f \fIfile\fP -Parse and execute +Parse and execute .IR file .TP .PD 0 @@ -189,8 +189,8 @@ This help .TP .PD 1 .B \-H -Hide script name (\fIfile\fP) and parameters (\fIargs\.\.\.\fP) from external -tools. For example you may want to use this when a php script is started as +Hide script name (\fIfile\fP) and parameters (\fIargs\.\.\.\fP) from external +tools. For example you may want to use this when a php script is started as a daemon and the command line contains sensitive data such as passwords. .TP .PD 0 @@ -219,7 +219,7 @@ Show compiled in modules .TP .PD 1 .B \-r \fIcode\fP -Run PHP +Run PHP .IR code without using script tags .B '<?..?>' @@ -229,7 +229,7 @@ without using script tags .TP .PD 1 .B \-B \fIbegin_code\fP -Run PHP +Run PHP .IR begin_code before processing input lines .TP @@ -238,7 +238,7 @@ before processing input lines .TP .PD 1 .B \-R \fIcode\fP -Run PHP +Run PHP .IR code for every input line .TP @@ -247,7 +247,7 @@ for every input line .TP .PD 1 .B \-F \fIfile\fP -Parse and execute +Parse and execute .IR file for every input line .TP @@ -256,7 +256,7 @@ for every input line .TP .PD 1 .B \-E \fIend_code\fP -Run PHP +Run PHP .IR end_code after processing all input lines .TP @@ -300,14 +300,14 @@ Output source with stripped comments and whitespace .TP .PD 1 .B \-z \fIfile\fP -Load Zend extension +Load Zend extension .IR file .TP .IR args.\|.\|. -Arguments passed to script. Use +Arguments passed to script. Use .B '\-\-' .IR args -when first argument starts with +when first argument starts with .B '\-' or script is read from stdin .TP @@ -369,7 +369,7 @@ Show configuration file names The configuration file for the CLI version of PHP. .TP .B php.ini -The standard configuration file will only be used when +The standard configuration file will only be used when .B php\-cli.ini cannot be found. .SH EXAMPLES @@ -388,24 +388,24 @@ have such a function. For dba use: .RE .TP \fI@program_prefix@php \-R 'echo strip_tags($argn)."\\n";'\fP -This PHP command strips off the HTML tags line by line and outputs the +This PHP command strips off the HTML tags line by line and outputs the result. To see how it works you can first look at the following PHP command \'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted -configuration information. If you then combine those two +configuration information. If you then combine those two \'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens. .TP \fI@program_prefix@php \-E 'echo "Lines: $argi\\n";'\fP Using this PHP command you can count the lines being input. .TP \fI@program_prefix@php \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP -In this example PHP expects each input line being a file. It counts all lines -of the files specified by each input line and shows the summarized result. +In this example PHP expects each input line being a file. It counts all lines +of the files specified by each input line and shows the summarized result. You may combine this with tools like find and change the php scriptlet. .TP \fI@program_prefix@php \-R 'echo "$argn\\n"; fgets(STDIN);'\fP -Since you have access to STDIN from within \-B \-R \-F and \-E you can skip -certain input lines with your code. But note that in such cases $argi only -counts the lines being processed by php itself. Having read this you will +Since you have access to STDIN from within \-B \-R \-F and \-E you can skip +certain input lines with your code. But note that in such cases $argi only +counts the lines being processed by php itself. Having read this you will guess what the above program does: skipping every second input line. .SH TIPS You can use a shebang line to automatically invoke php @@ -449,7 +449,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @PHP_VERSION@. diff --git a/sapi/embed/EXPERIMENTAL b/sapi/embed/EXPERIMENTAL index 293159a693..3ea19fd320 100644 --- a/sapi/embed/EXPERIMENTAL +++ b/sapi/embed/EXPERIMENTAL @@ -1,5 +1,5 @@ this module is experimental, -its functions may change their names -or move to extension all together -so do not rely to much on them +its functions may change their names +or move to extension all together +so do not rely to much on them you have been warned! diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index b4c08b4fa5..c6a290f9d5 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -18,7 +18,7 @@ install-fpm: $(SAPI_FPM_PATH) $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ fi - + @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index 8a9c60a4f9..4cf4ba4972 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -235,7 +235,7 @@ AC_DEFUN([AC_FPM_TRACE], if test -n "$proc_mem_file" ; then AC_MSG_CHECKING([for proc mem file]) - + AC_TRY_RUN([ #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 @@ -271,26 +271,26 @@ AC_DEFUN([AC_FPM_TRACE], AC_MSG_RESULT([skipped (cross compiling)]) ]) fi - + if test -n "$proc_mem_file"; then AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface]) fi - + fpm_trace_type="" if test "$have_ptrace" = "yes"; then fpm_trace_type=ptrace - + elif test -n "$proc_mem_file"; then fpm_trace_type=pread - + elif test "$have_mach_vm_read" = "yes" ; then fpm_trace_type=mach - + else - AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found]) + AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found]) fi - + ]) AC_DEFUN([AC_FPM_BUILTIN_ATOMIC], @@ -376,7 +376,7 @@ AC_DEFUN([AC_FPM_KQUEUE], AC_MSG_CHECKING([for kqueue]) AC_TRY_COMPILE( - [ + [ #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> @@ -400,7 +400,7 @@ AC_DEFUN([AC_FPM_PORT], AC_MSG_CHECKING([for port framework]) AC_TRY_COMPILE( - [ + [ #include <port.h> ], [ int port; @@ -423,7 +423,7 @@ AC_DEFUN([AC_FPM_DEVPOLL], AC_MSG_CHECKING([for /dev/poll]) AC_TRY_COMPILE( - [ + [ #include <stdio.h> #include <sys/devpoll.h> ], [ @@ -448,7 +448,7 @@ AC_DEFUN([AC_FPM_EPOLL], AC_MSG_CHECKING([for epoll]) AC_TRY_COMPILE( - [ + [ #include <sys/epoll.h> ], [ int epollfd; @@ -484,7 +484,7 @@ AC_DEFUN([AC_FPM_POLL], AC_MSG_CHECKING([for poll]) AC_TRY_COMPILE( - [ + [ #include <poll.h> ], [ struct pollfd fds[2]; @@ -510,7 +510,7 @@ AC_DEFUN([AC_FPM_SELECT], AC_MSG_CHECKING([for select]) AC_TRY_COMPILE( - [ + [ /* According to POSIX.1-2001 */ #include <sys/select.h> @@ -577,7 +577,7 @@ if test "$PHP_FPM" != "no"; then [ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no) PHP_ARG_WITH(fpm-group,, - [ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this + [ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this should usually be set to match the fpm username (default: nobody)], nobody, no) PHP_ARG_WITH(fpm-systemd,, @@ -676,13 +676,13 @@ if test "$PHP_FPM" != "no"; then PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag]) SAPI_FPM_PATH=sapi/fpm/php-fpm - + if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c" fi - + PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" - + PHP_FPM_FILES="fpm/fpm.c \ fpm/fpm_children.c \ fpm/fpm_cleanup.c \ diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index b5d642f8a6..26583881af 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -117,7 +117,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * } else { memcpy(buf, "???", sizeof("???")); } - + fprintf(slowlog, "[0x%" PTR_FMT "lx] ", execute_data); fprintf(slowlog, "%s()", buf); @@ -144,7 +144,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * } type = (zend_uchar *)&l; - if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { + if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { return -1; } @@ -174,7 +174,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * lineno = *lu; } break; - } + } if (0 > fpm_trace_get_long(prev + offsetof(zend_execute_data, prev_execute_data), &l)) { return -1; diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c index 8b73df895d..b2ce46356f 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.c +++ b/sapi/fpm/fpm/fpm_scoreboard.c @@ -247,7 +247,7 @@ void fpm_scoreboard_free(struct fpm_scoreboard_s *scoreboard) /* {{{ */ scoreboard_size = sizeof(struct fpm_scoreboard_s) + (scoreboard->nprocs) * sizeof(struct fpm_scoreboard_proc_s *); scoreboard_nprocs_size = sizeof(struct fpm_scoreboard_proc_s) * scoreboard->nprocs; - + fpm_shm_free(scoreboard, scoreboard_size + scoreboard_nprocs_size); } /* }}} */ diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index 4497e6e61c..86edaa894f 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -7,7 +7,7 @@ php-fpm \- PHP FastCGI Process Manager 'PHP-FPM' [options] .LP .SH DESCRIPTION -\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for +\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_localstatedir@/log/php-fpm.log. .LP Most options are set in the configuration file. The configuration file is @php_fpm_sysconfdir@/php-fpm.conf. By default, php-fpm will respond to CGI requests listening on localhost http port 9000. Therefore php-fpm expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately. @@ -21,8 +21,8 @@ Do not chdir to the script's directory .TP .PD 1 .B \-c \fIpath\fP|\fIfile\fP -Look for -.B php.ini +Look for +.B php.ini file in the directory .IR path or use the specified @@ -33,8 +33,8 @@ or use the specified .TP .PD 1 .B \-n -No -.B php.ini +No +.B php.ini file will be used .TP .PD 0 @@ -42,8 +42,8 @@ file will be used .TP .PD 1 .B \-d \fIfoo\fP[=\fIbar\fP] -Define INI entry -.IR foo +Define INI entry +.IR foo with value .IR bar .TP @@ -208,7 +208,7 @@ A List of active developers can be found here: .B http://www.php.net/credits.php .PD 1 .P -And last but not least PHP was developed with the help of a huge amount of +And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@. diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in index 77914a6f2b..a4afd5916a 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -6,9 +6,9 @@ The PHP License, version 3.01 This is sample real-time status page for FPM. You can change it to better fit your needs. --> - <head> + <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <style type="text/css"> + <style type="text/css"> body {background-color: #ffffff; color: #000000;} body, td, th, h1, h2 {font-family: sans-serif;} pre {margin: 0px; font-family: monospace;} @@ -33,40 +33,40 @@ } img {float: right; border: 0px;} hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;} - </style> + </style> <title>PHP-FPM status page</title> - <meta name="ROBOTS" content="NOINDEX,NOFOLLOW,NOARCHIVE" /></head> + <meta name="ROBOTS" content="NOINDEX,NOFOLLOW,NOARCHIVE" /></head> <body> <div class="center"> <table border="0" cellpadding="3" width="95%"> <tr class="h"> - <td> + <td> <a href="http://www.php.net/"><img border="0" src="https://static.php.net/www.php.net/images/php.gif" alt="PHP Logo" /></a><h1 class="p">PHP-FPM real-time status page</h1> </td> </tr> </table> <br /> <table border="0" cellpadding="3" width="95%"> - <tr><td class="e">Status URL</td><td class="v"><input type="text" id="url" size="45" /></td></tr> - <tr><td class="e">Ajax status</td><td class="v" id="status"></td></tr> - <tr><td class="e">Refresh Rate</td><td class="v"><input type="text" id="rate" value="1" /></td></tr> + <tr><td class="e">Status URL</td><td class="v"><input type="text" id="url" size="45" /></td></tr> + <tr><td class="e">Ajax status</td><td class="v" id="status"></td></tr> + <tr><td class="e">Refresh Rate</td><td class="v"><input type="text" id="rate" value="1" /></td></tr> <tr> <td class="e">Actions</td> <td class="v"> <button onclick="javascript:refresh();">Manual Refresh</button> <button id="play" onclick="javascript:playpause();">Play</button> </td> - </tr> + </tr> </table> - <h1>Pool Status</h1> + <h1>Pool Status</h1> <table border="0" cellpadding="3" width="95%" id="short"> <tr style="display: none;"><td> </td></tr> </table> - <h1>Active Processes status</h1> + <h1>Active Processes status</h1> <table border="0" cellpadding="3" width="95%" id="active"> <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th></tr> </table> - <h1>Idle Processes status</h1> + <h1>Idle Processes status</h1> <table border="0" cellpadding="3" width="95%" id="idle"> <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th><th>Last Request %CPU</th><th>Last Request Memory</th></tr> </table> diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc index 71bdad17b9..07603a808e 100644 --- a/sapi/fpm/tests/fcgi.inc +++ b/sapi/fpm/tests/fcgi.inc @@ -603,7 +603,7 @@ class Client } if ($resp['type'] == self::END_REQUEST) { $this->_requests[$resp['requestId']]['state'] = self::REQ_STATE_OK; - if ($resp['requestId'] == $requestId) { + if ($resp['requestId'] == $requestId) { break; } } diff --git a/sapi/litespeed/README.md b/sapi/litespeed/README.md index 99967ce3d6..e744030de7 100644 --- a/sapi/litespeed/README.md +++ b/sapi/litespeed/README.md @@ -3,27 +3,27 @@ Introduction LiteSpeed SAPI module is a dedicated interface for PHP integration with LiteSpeed Web Server. LiteSpeed SAPI has similar architecture to the -FastCGI SAPI with there major enhancements: better performance, dynamic +FastCGI SAPI with there major enhancements: better performance, dynamic spawning and PHP configuration modification through web server -configuration and .htaccess files. +configuration and .htaccess files. Our simple benchmark test ("hello world") shows that PHP with LiteSpeed SAPI has 30% better performance over PHP with FastCGI SAPI, -which is nearly twice the performance that Apache mod_php can deliver. - +which is nearly twice the performance that Apache mod_php can deliver. + A major drawback of FastCGI PHP comparing to Apache mod_php is lacking -the flexibilities in PHP configurations. PHP configurations cannot be +the flexibilities in PHP configurations. PHP configurations cannot be changed at runtime via configuration files like .htaccess files or web -server's virtual host configuration. In shared hosting environment, -each hosting account will has its own "open_basedir" overridden in +server's virtual host configuration. In shared hosting environment, +each hosting account will has its own "open_basedir" overridden in server configuration to enhance server security when mod_php is used. -usually, FastCGI PHP is not an option in shared hosting environment +usually, FastCGI PHP is not an option in shared hosting environment due to lacking of this flexibility. LiteSpeed SAPI is carefully designed -to address this issue. PHP configurations can be modified the same way -as that in mod_php with the same configuration directives. +to address this issue. PHP configurations can be modified the same way +as that in mod_php with the same configuration directives. -PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for -PHP scripting with LiteSpeed web server. +PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for +PHP scripting with LiteSpeed web server. Building PHP with LiteSpeed SAPI @@ -31,9 +31,9 @@ Building PHP with LiteSpeed SAPI You need to add "--with-litespeed" to the configure command to build PHP with LiteSpeed SAPI, all other SAPI related configure options -should be removed. +should be removed. -For example: +For example: ./configure --with-litespeed make @@ -42,17 +42,17 @@ directory after the compilation succeeds. Copy it to 'lsws/fcgi-bin/lsphp' or wherever you prefer, if LiteSpeed web server has been configured to run PHP with LiteSpeed SAPI already, you just need to overwrite the old executable with this one and you are all -set. +set. Start PHP from command line =========================== Usually, lsphp is managed by LiteSpeed web server in a single server -installation. lsphp can be used in clustered environment with one -LiteSpeed web server at the front, load balancing lsphp processes +installation. lsphp can be used in clustered environment with one +LiteSpeed web server at the front, load balancing lsphp processes running on multiple backend servers. In such environment, lsphp can be -start manually from command with option "-b <socket_address>", socket -address can be IPv4, IPv6 or Unix Domain Socket address. +start manually from command with option "-b <socket_address>", socket +address can be IPv4, IPv6 or Unix Domain Socket address. for example: ./lsphp -b [::]:3000 @@ -76,56 +76,56 @@ Using LiteSpeed PHP with LiteSpeed Web Server ============================================= Detailed information about how to configure LiteSpeed web server with -PHP support is available from our website, at: +PHP support is available from our website, at: https://www.litespeedtech.com/docs/webserver Usually, PHP support has been configured out of box, you don't need to change it unless you want to change PHP interface from FastCGI to -LiteSpeed SAPI or vice versa. +LiteSpeed SAPI or vice versa. Brief instructions are as follow: 1) Login to web administration interface, go to 'Server'->'Ext App' tab, add an external application of type "LSAPI app", "Command" should be - set to a shell command that executes the PHP binary you just built. - "Instances" should be set to "1". Add "LSAPI_CHILDREN" environment - variable to match the value of "Max Connections". More tunable - environment variable described below can be added. + set to a shell command that executes the PHP binary you just built. + "Instances" should be set to "1". Add "LSAPI_CHILDREN" environment + variable to match the value of "Max Connections". More tunable + environment variable described below can be added. 2) Go to 'Server'->'Script Handler' tab, add a script handler configuration: set 'suffix' to 'php', 'Handler Type' to 'LiteSpeed API', 'Handler Name' should be the name of external application - just defined. + just defined. -3) Click 'Apply Changes' link on the top left of the page, then click - 'graceful restart'. Now PHP is running with LiteSpeed SAPI. +3) Click 'Apply Changes' link on the top left of the page, then click + 'graceful restart'. Now PHP is running with LiteSpeed SAPI. Tunings ------- There are a few environment variables that can be tweaked to control the -behavior of LSAPI application. +behavior of LSAPI application. * LSAPI_CHILDREN or PHP_LSAPI_CHILDREN (default: 0) -There are two ways to let PHP handle multiple requests concurrently, -Server Managed Mode and Self Managed Mode. In Server Managed Mode, +There are two ways to let PHP handle multiple requests concurrently, +Server Managed Mode and Self Managed Mode. In Server Managed Mode, LiteSpeed web server dynamically spawn/stop PHP processes, in this mode -"Instances" should match "Max Connections" configuration for PHP -external application. To start PHP in Self Managed Mode, "Instances" +"Instances" should match "Max Connections" configuration for PHP +external application. To start PHP in Self Managed Mode, "Instances" should be set to "1", while "LSAPI_CHILDREN" environment variable should -be set to match the value of "Max Connections" and >1. Web Server will -start one PHP process, this process will start/stop children PHP processes -dynamically based on on demand. If "LSAPI_CHILDREN" <=1, PHP will be +be set to match the value of "Max Connections" and >1. Web Server will +start one PHP process, this process will start/stop children PHP processes +dynamically based on on demand. If "LSAPI_CHILDREN" <=1, PHP will be started in server managed mode. -Self Managed Mode is preferred because all PHP processes can share one +Self Managed Mode is preferred because all PHP processes can share one shared memory block for the opcode cache. Usually, there is no need to set value of LSAPI_CHILDREN over 100 in -most server environment. +most server environment. * LSAPI_AVOID_FORK (default: 0) @@ -151,22 +151,22 @@ LSAPI_CHIDLREN, When LSAPI_AVOID_FORK is set to 1, the default value is 0. * LSAPI_MAX_REQS or PHP_LSAPI_MAX_REQUESTS (default value: 10000) This controls how many requests each child process will handle before -it exits automatically. Several PHP functions have been identified -having memory leaks. This parameter can help reducing memory usage -of leaky PHP functions. +it exits automatically. Several PHP functions have been identified +having memory leaks. This parameter can help reducing memory usage +of leaky PHP functions. * LSAPI_MAX_IDLE (default value: 300 seconds) -In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child -process will wait for a new request before it exits. This option help +In Self Managed Mode, LSAPI_MAX_IDLE controls how long a idle child +process will wait for a new request before it exits. This option help releasing system resources taken by idle processes. * LSAPI_MAX_IDLE_CHILDREN (default value: 1/3 of LSAPI_CHILDREN or LSAPI_CHILDREN) -In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle +In Self Managed Mode, LSAI_MAX_IDLE_CHILDREN controls how many idle children processes are allowed. Excessive idle children processes will be killed by the parent process immediately. When LSAPI_AVOID_FORK is set to 0, the default value is 1/3 of @@ -176,10 +176,10 @@ is LSAPI_CHILDREN. * LSAPI_MAX_PROCESS_TIME (default value: 300 seconds) -In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum +In Self Managed Mode, LSAPI_MAX_PROCESS_TIME controls the maximum processing time allowed when processing a request. If a child process -can not finish processing of a request in the given time period, it -will be killed by the parent process. This option can help getting rid +can not finish processing of a request in the given time period, it +will be killed by the parent process. This option can help getting rid of dead or runaway child process. @@ -187,26 +187,26 @@ of dead or runaway child process. In Self Managed Mode, LSAPI_PGRP_MAX_IDLE controls how long the parent process will wait before exiting when there is no child process. -This option help releasing system resources taken by an idle parent +This option help releasing system resources taken by an idle parent process. * LSAPI_PPID_NO_CHECK By default a LSAPI application check the existence of its parent process -and exits automatically if the parent process died. This is to reduce -orphan process when web server is restarted. However, it is desirable -to disable this feature, such as when a LSAPI process was started -manually from command line. LSAPI_PPID_NO_CHECK should be set when +and exits automatically if the parent process died. This is to reduce +orphan process when web server is restarted. However, it is desirable +to disable this feature, such as when a LSAPI process was started +manually from command line. LSAPI_PPID_NO_CHECK should be set when you want to disable the checking of existence of parent process. -When PHP started by "-b" option, it is disabled automatically. +When PHP started by "-b" option, it is disabled automatically. Compatibility with Apache mod_php ================================= -LSAPI PHP supports PHP configuration overridden via web server configuration -as well as .htaccess. +LSAPI PHP supports PHP configuration overridden via web server configuration +as well as .htaccess. Since 4.0 release "apache_response_headers" function is supported. diff --git a/sapi/litespeed/config.m4 b/sapi/litespeed/config.m4 index 268b9aecde..36e614c853 100644 --- a/sapi/litespeed/config.m4 +++ b/sapi/litespeed/config.m4 @@ -10,7 +10,7 @@ PHP_ARG_WITH(litespeed,, if test "$PHP_LITESPEED" != "no"; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed) SAPI_LITESPEED_PATH=sapi/litespeed/php - PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)') + PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)') case $host_alias in *darwin*) BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 0c5f5cc9ac..1cfd45ebbf 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -500,7 +500,7 @@ static void init_request_info( void ) { char * pContentType = LSAPI_GetHeader( H_CONTENT_TYPE ); char * pAuth; - + SG(request_info).content_type = pContentType ? pContentType : ""; SG(request_info).request_method = LSAPI_GetRequestMethod(); SG(request_info).query_string = LSAPI_GetQueryString(); @@ -510,7 +510,7 @@ static void init_request_info( void ) /* It is not reset by zend engine, set it to 200. */ SG(sapi_headers).http_response_code = 200; - + pAuth = LSAPI_GetHeader( H_AUTHORIZATION ); php_handle_auth_data(pAuth); } @@ -546,7 +546,7 @@ static int lsapi_module_main(int show_source) if (php_request_startup() == FAILURE ) { return -1; } - + if (show_source) { zend_syntax_highlighter_ini syntax_highlighter_ini; @@ -768,7 +768,7 @@ static int lsapi_activate_user_ini_mk_user_config(_lsapi_activate_user_ini_ctx * /* Find cached config entry: If not found, create one */ ctx->entry = zend_hash_str_find_ptr(&user_config_cache, ctx->path, ctx->path_len); - if (!ctx->entry) + if (!ctx->entry) { ctx->entry = pemalloc(sizeof(user_config_cache_entry), 1); ctx->entry->expires = 0; @@ -815,7 +815,7 @@ static int lsapi_activate_user_ini_walk_down_the_path(_lsapi_activate_user_ini_c strncmp(ctx->path, ctx->doc_root, docroot_len) != 0; if (is_outside_of_docroot) { - php_parse_user_ini_file(ctx->path, PG(user_ini_filename), + php_parse_user_ini_file(ctx->path, PG(user_ini_filename), &ctx->entry->user_config); } else { walk_down_the_path(ctx->doc_root, ctx->path, @@ -838,7 +838,7 @@ static int lsapi_activate_user_ini_finally(_lsapi_activate_user_ini_ctx *ctx, int rc = SUCCESS; fn_activate_user_ini_chain_t *fn_next = next; - php_ini_activate_config(&ctx->entry->user_config, PHP_INI_PERDIR, + php_ini_activate_config(&ctx->entry->user_config, PHP_INI_PERDIR, PHP_INI_STAGE_HTACCESS); if (*fn_next) { @@ -869,7 +869,7 @@ static int lsapi_activate_user_ini( void ) &lsapi_activate_user_ini_finally, NULL }; - + return fn_chain[0](&ctx, (fn_activate_user_ini_chain_t*)(fn_chain + 1)); } @@ -1025,7 +1025,7 @@ static int cli_main( int argc, char * argv[] ) zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */ CG(in_compilation) = 0; /* not initialized but needed for several options */ SG(options) |= SAPI_OPTION_NO_CHDIR; - + for( ini = ini_defaults; *ini; ini+=2 ) { psKey = zend_string_init(*ini, strlen( *ini ), 1); zend_alter_ini_entry_chars(psKey, @@ -1254,11 +1254,11 @@ int main( int argc, char * argv[] ) #endif #if PHP_MAJOR_VERSION >= 7 -#if defined(ZEND_SIGNALS) || PHP_MINOR_VERSION > 0 +#if defined(ZEND_SIGNALS) || PHP_MINOR_VERSION > 0 zend_signal_startup(); #endif #endif - + if (argc > 1 ) { if ( parse_opt( argc, argv, &climode, &php_ini_path, &php_bind ) == -1 ) { @@ -1289,7 +1289,7 @@ int main( int argc, char * argv[] ) * options: the latter override the former. */ init_sapi_from_env(&lsapi_sapi_module); - + if ( ignore_php_ini ) lsapi_sapi_module.php_ini_ignore = 1; @@ -1329,7 +1329,7 @@ int main( int argc, char * argv[] ) #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) int is_criu = LSCRIU_Init(); // Must be called before the regular init as it unsets the parameters. #endif - + LSAPI_Init_Env_Parameters( NULL ); lsapi_mode = 1; @@ -1343,7 +1343,7 @@ int main( int argc, char * argv[] ) int iRequestsProcessed = 0; int result; - + while( ( result = LSAPI_Prefork_Accept_r( &g_req )) >= 0 ) { #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) if (is_criu && !result) { diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index f377472fe5..685892e708 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -153,7 +153,7 @@ static int s_max_busy_workers = -1; static char *s_stderr_log_path = NULL; static int s_ignore_pid = -1; -LSAPI_Request g_req = +LSAPI_Request g_req = { .m_fdListen = -1, .m_fd = -1 }; static char s_secret[24]; @@ -216,7 +216,7 @@ static int HTTP_HEADER_LEN[H_TRANSFER_ENCODING+1] = }; -static const char *s_log_level_names[8] = +static const char *s_log_level_names[8] = { "", "DEBUG","INFO", "NOTICE", "WARN", "ERROR", "CRIT", "FATAL" }; @@ -229,7 +229,7 @@ void LSAPI_Log(int flag, const char * fmt, ...) if (flag & LSAPI_LOG_TIMESTAMP_BITS) { struct timeval tv; - struct tm tm; + struct tm tm; gettimeofday(&tv, NULL); localtime_r(&tv.tv_sec, &tm); if (flag & LSAPI_LOG_TIMESTAMP_FULL) @@ -244,20 +244,20 @@ void LSAPI_Log(int flag, const char * fmt, ...) tm.tm_hour, tm.tm_min, tm.tm_sec); } } - + int level = flag & LSAPI_LOG_LEVEL_BITS; if (level && level <= LSAPI_LOG_FLAG_FATAL) { p += snprintf(p, 100, "[%s] ", s_log_level_names[level]); } - + if (flag & LSAPI_LOG_PID) { p += snprintf(p, 100, "[%d] ", s_pid); } - + if (p > buf) - fprintf(stderr, "%.*s", (int)(p - buf), buf); + fprintf(stderr, "%.*s", (int)(p - buf), buf); va_list ap; va_start(ap, fmt); vfprintf(stderr, fmt, ap); @@ -276,7 +276,7 @@ void LSAPI_Log(int flag, const char * fmt, ...) #endif -static int lsapi_parent_dead() +static int lsapi_parent_dead() { // Return non-zero if the parent is dead. 0 if still alive. if (!s_ppid) { @@ -409,7 +409,7 @@ static void lsapi_close_connection(LSAPI_Request *pReq) __sync_fetch_and_sub(s_busy_workers, 1); if (s_worker_status) s_worker_status->m_connected = 0; -} +} static inline ssize_t lsapi_read( int fd, void * pBuf, size_t len ) @@ -708,8 +708,8 @@ static int validateHeaders( LSAPI_Request * pReq ) { if ( pReq->m_pHeaderIndex->m_headerOff[i] ) { - if (pReq->m_pHeaderIndex->m_headerOff[i] > totalLen - || pReq->m_pHeaderIndex->m_headerLen[i] + if (pReq->m_pHeaderIndex->m_headerOff[i] > totalLen + || pReq->m_pHeaderIndex->m_headerLen[i] + pReq->m_pHeaderIndex->m_headerOff[i] > totalLen) return -1; } @@ -721,8 +721,8 @@ static int validateHeaders( LSAPI_Request * pReq ) pEnd = pCur + pReq->m_pHeader->m_cntUnknownHeaders; while( pCur < pEnd ) { - if (pCur->nameOff > totalLen - || pCur->nameOff + pCur->nameLen > totalLen + if (pCur->nameOff > totalLen + || pCur->nameOff + pCur->nameLen > totalLen || pCur->valueOff > totalLen || pCur->valueOff + pCur->valueLen > totalLen) return -1; @@ -868,7 +868,7 @@ int LSAPI_is_suEXEC_Daemon(void) static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char *pErr2 ) { char achError[4096]; - int n = snprintf(achError, sizeof(achError), "[%d] %s:%s: %s\n", getpid(), + int n = snprintf(achError, sizeof(achError), "[%d] %s:%s: %s\n", getpid(), pErr1, (pErr2)?pErr2:"", strerror(errno)); if (n > (int)sizeof(achError)) n = sizeof(achError); @@ -1194,13 +1194,13 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen ) if ( parseEnv( pReq->m_pEnvList, pReq->m_pHeader->m_cntEnv, &pBegin, pEnd ) == -1 ) return -1; - if (pReq->m_pHeader->m_scriptFileOff < 0 - || pReq->m_pHeader->m_scriptFileOff >= totalLen + if (pReq->m_pHeader->m_scriptFileOff < 0 + || pReq->m_pHeader->m_scriptFileOff >= totalLen || pReq->m_pHeader->m_scriptNameOff < 0 || pReq->m_pHeader->m_scriptNameOff >= totalLen || pReq->m_pHeader->m_queryStringOff < 0 || pReq->m_pHeader->m_queryStringOff >= totalLen - || pReq->m_pHeader->m_requestMethodOff < 0 + || pReq->m_pHeader->m_requestMethodOff < 0 || pReq->m_pHeader->m_requestMethodOff >= totalLen) { fprintf(stderr, "%d: bad request header - ERROR#1\n", getpid()); @@ -1231,13 +1231,13 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen ) { fixHeaderIndexEndian( pReq ); } - + if (validateHeaders(pReq) == -1) { fprintf(stderr, "%d: bad request header - ERROR#2\n", getpid()); return -1; } - + pReq->m_reqBodyLen = pReq->m_pHeader->m_reqBodyLen; if ( pReq->m_reqBodyLen == -2 ) { @@ -1258,7 +1258,7 @@ static struct lsapi_packet_header s_ack = {'L', 'S', LSAPI_REQ_RECEIVED, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }; static struct lsapi_packet_header s_conn_close_pkt = {'L', 'S', LSAPI_CONN_CLOSE, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }; - + static inline int send_notification_pkt( int fd, struct lsapi_packet_header *pkt ) { @@ -1575,7 +1575,7 @@ int LSAPI_Accept_r( LSAPI_Request * pReq ) static struct lsapi_packet_header finish = {'L', 'S', LSAPI_RESP_END, LSAPI_ENDIAN, {LSAPI_PACKET_HEADER_LEN} }; - + int LSAPI_Finish_r( LSAPI_Request * pReq ) { /* finish req body */ @@ -1639,10 +1639,10 @@ char * LSAPI_GetHeader_r( LSAPI_Request * pReq, int headerIndex ) off = pReq->m_pHeaderIndex->m_headerOff[ headerIndex ]; if ( !off ) return NULL; - if ( *(pReq->m_pHttpHeader + off + if ( *(pReq->m_pHttpHeader + off + pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) ) { - *( pReq->m_pHttpHeader + off + *( pReq->m_pHttpHeader + off + pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) = 0; } return pReq->m_pHttpHeader + off; @@ -2092,7 +2092,7 @@ static char * GetHeaderVar( LSAPI_Request * pReq, const char * name ) { if ( strcmp( name, CGI_HEADERS[i] ) == 0 ) { - pValue = pReq->m_pHttpHeader + pValue = pReq->m_pHttpHeader + pReq->m_pHeaderIndex->m_headerOff[i]; if ( *(pValue + pReq->m_pHeaderIndex->m_headerLen[i]) != '\0') { @@ -2128,7 +2128,7 @@ static char * GetHeaderVar( LSAPI_Request * pReq, const char * name ) if (( pKey == pKeyEnd )&& (!*p )) { pValue = pReq->m_pHttpHeader + pCur->valueOff; - + if ( *(pValue + pCur->valueLen) != '\0') { *(pValue + pCur->valueLen) = '\0'; @@ -2792,7 +2792,7 @@ static void lsapi_sigchild( int signal ) { int status, pid; lsapi_child_status * child_status; - if (g_prefork_server == NULL) + if (g_prefork_server == NULL) return; while( 1 ) { @@ -2842,9 +2842,9 @@ static void lsapi_sigchild( int signal ) static int lsapi_init_children_status(void) { int size = 4096; - int max_children = g_prefork_server->m_iMaxChildren + int max_children = g_prefork_server->m_iMaxChildren + g_prefork_server->m_iExtraChildren; - + char * pBuf; size = max_children * sizeof( lsapi_child_status ) * 2 + 3 * sizeof(int); size = (size + 4095) / 4096 * 4096; @@ -2878,11 +2878,11 @@ static void dump_debug_info( lsapi_child_status * pStatus, long tmCur ) fprintf( stderr, "[%s] Possible runaway process, PPID: %d, PID: %d, " "reqCount: %d, process time: %ld, checkpoint time: %ld, start " - "time: %ld\n", ctime(&tmCur), getpid(), pStatus->m_pid, - pStatus->m_iReqCounter, tmCur - pStatus->m_tmReqBegin, + "time: %ld\n", ctime(&tmCur), getpid(), pStatus->m_pid, + pStatus->m_iReqCounter, tmCur - pStatus->m_tmReqBegin, tmCur - pStatus->m_tmLastCheckPoint, tmCur - pStatus->m_tmStart ); snprintf( achCmd, 1024, "gdb --batch -ex \"attach %d\" -ex \"set height 0\" " - "-ex \"bt\" >&2;PATH=$PATH:/usr/sbin lsof -p %d >&2", + "-ex \"bt\" >&2;PATH=$PATH:/usr/sbin lsof -p %d >&2", pStatus->m_pid, pStatus->m_pid ); if ( system( achCmd ) == -1 ) perror( "system()" ); @@ -2907,8 +2907,8 @@ static void lsapi_check_child_status( long tmCur ) if ( !pStatus->m_inProcess ) { - if (g_prefork_server->m_iCurChildren - dying - > g_prefork_server->m_iMaxChildren + if (g_prefork_server->m_iCurChildren - dying + > g_prefork_server->m_iMaxChildren || idle > g_prefork_server->m_iMaxIdleChildren) { ++pStatus->m_iKillSent; @@ -2916,7 +2916,7 @@ static void lsapi_check_child_status( long tmCur ) } else { - if (s_max_idle_secs> 0 + if (s_max_idle_secs> 0 && tmCur - pStatus->m_tmWaitBegin > s_max_idle_secs + 5) { ++pStatus->m_iKillSent; @@ -2949,7 +2949,7 @@ static void lsapi_check_child_status( long tmCur ) } if ( tobekilled ) { - if (( kill( pStatus->m_pid, tobekilled ) == -1 ) && + if (( kill( pStatus->m_pid, tobekilled ) == -1 ) && ( errno == ESRCH )) { pStatus->m_pid = 0; @@ -2967,7 +2967,7 @@ static void lsapi_check_child_status( long tmCur ) if ( abs( g_prefork_server->m_iCurChildren - count ) > 1 ) { fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Children: %d," - " count: %d, idle: %d, dying: %d\n", getpid(), + " count: %d, idle: %d, dying: %d\n", getpid(), g_prefork_server->m_iCurChildren, count, idle, dying ); } } @@ -2993,7 +2993,7 @@ static void lsapi_check_child_status( long tmCur ) //} -static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, +static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, LSAPI_Request * pReq ) { struct sigaction act, old_term, old_quit, old_int, @@ -3062,13 +3062,13 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, FD_ZERO( &readfds ); FD_SET( pServer->m_fd, &readfds ); - timeout.tv_sec = 1; + timeout.tv_sec = 1; timeout.tv_usec = 0; ret = (*g_fnSelect)(pServer->m_fd+1, &readfds, NULL, NULL, &timeout); if (ret == 1 ) { - if (pServer->m_iCurChildren >= pServer->m_iMaxChildren - && s_accepting_workers + if (pServer->m_iCurChildren >= pServer->m_iMaxChildren + && s_accepting_workers && (ret = __sync_add_and_fetch(s_accepting_workers, 0)) > 0) { usleep( 200 ); @@ -3087,13 +3087,13 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, continue; } - if (pServer->m_iCurChildren >= + if (pServer->m_iCurChildren >= pServer->m_iMaxChildren + pServer->m_iExtraChildren) { fprintf( stderr, "Reached max children process limit: %d, extra: %d," " current: %d, busy: %d, please increase LSAPI_CHILDREN.\n", - pServer->m_iMaxChildren, pServer->m_iExtraChildren, - pServer->m_iCurChildren, + pServer->m_iMaxChildren, pServer->m_iExtraChildren, + pServer->m_iCurChildren, s_busy_workers ? *s_busy_workers : -1 ); usleep( 100000 ); continue; @@ -3192,7 +3192,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer, void lsapi_error( const char * pMessage, int err_no ) { - fprintf( stderr, "%d: %s, errno: %d (%s)\n", getpid(), pMessage, err_no, + fprintf( stderr, "%d: %s, errno: %d (%s)\n", getpid(), pMessage, err_no, strerror( err_no ) ); } @@ -3222,7 +3222,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) lsapi_close_connection(pReq); } } - + if ( (unsigned int)s_req_processed > s_max_reqs ) return -1; @@ -3249,7 +3249,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) { if ( !g_running ) return -1; - if (s_req_processed && s_worker_status + if (s_req_processed && s_worker_status && s_worker_status->m_iKillSent) return -1; FD_ZERO( &readfds ); @@ -3267,7 +3267,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) if (s_accepting_workers) __sync_fetch_and_sub(s_accepting_workers, 1); } - + if ( ret == 0 ) { if ( s_worker_status ) @@ -3291,7 +3291,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) } else if ( ret >= 1 ) { - if (s_req_processed && s_worker_status + if (s_req_processed && s_worker_status && s_worker_status->m_iKillSent) return -1; if ( fd == pReq->m_fdListen ) @@ -3305,7 +3305,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) __sync_fetch_and_add(s_busy_workers, 1); fd = pReq->m_fd; - + lsapi_set_nblock( fd, 0 ); //init_conn_key( pReq->m_fd ); if ( !s_keepListener ) @@ -3337,7 +3337,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq ) s_worker_status->m_iKillSent = 0; s_worker_status->m_inProcess = 1; ++s_worker_status->m_iReqCounter; - s_worker_status->m_tmReqBegin = + s_worker_status->m_tmReqBegin = s_worker_status->m_tmLastCheckPoint = time(NULL); } ++s_req_processed; @@ -3411,7 +3411,7 @@ void LSAPI_No_Check_ppid(void) } -int LSAPI_Get_ppid() +int LSAPI_Get_ppid() { return(s_ppid); } @@ -3521,7 +3521,7 @@ static int lsapi_check_path(const char *p, char *final, int max_len) return -1; } p = final; - if (realpath(p, resolved_path) == NULL + if (realpath(p, resolved_path) == NULL && errno != ENOENT && errno != EACCES) return -1; if (strncmp(resolved_path, "/etc/", 5) == 0) @@ -3576,13 +3576,13 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp ) const char *p; int n; int avoidFork = 0; - + p = getenv("LSAPI_STDERR_LOG"); if (p) { lsapi_reopen_stderr(p); } - + p = getenv( "PHP_LSAPI_MAX_REQUESTS" ); if ( !p ) p = getenv( "LSAPI_MAX_REQS" ); @@ -3675,7 +3675,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp ) { LSAPI_No_Check_ppid(); } - + p = getenv("LSAPI_MAX_BUSY_WORKER"); if (p) { @@ -3684,7 +3684,7 @@ int LSAPI_Init_Env_Parameters( fn_select_t fp ) if (n >= 0) LSAPI_No_Check_ppid(); } - + p = getenv( "LSAPI_DUMP_DEBUG_INFO" ); if ( p ) @@ -3950,7 +3950,7 @@ static void lsapi_MD5Transform(uint32 buf[4], uint32 const in[16]) } -int LSAPI_Set_Restored_Parent_Pid(int pid) +int LSAPI_Set_Restored_Parent_Pid(int pid) { int old_ppid = s_ppid; s_restored_ppid = pid; diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c index f767738f1b..6ceed3fb8b 100644 --- a/sapi/litespeed/lscriu.c +++ b/sapi/litespeed/lscriu.c @@ -21,18 +21,18 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are -met: +met: * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. + with the distribution. * Neither the name of the Lite Speed Technologies Inc nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior - written permission. + written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -44,7 +44,7 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define HAVE_MSGHDR_MSG_CONTROL @@ -107,7 +107,7 @@ static int s_fd_native = -1; static char *s_criu_image_path = NULL; static int s_pid = 0; -typedef enum +typedef enum { CRIU_GCOUNTER_SHM, CRIU_GCOUNTER_SIG, @@ -127,15 +127,15 @@ int LSAPI_Get_ppid(); #define lscriu_dbg(...) \ do { if (s_criu_debug) fprintf(stderr, __VA_ARGS__); } while(0) #else -#define lscriu_dbg(...) +#define lscriu_dbg(...) #endif - + #define lscriu_err(...) fprintf(stderr, __VA_ARGS__) - + #define SUN_PATH_MAX (sizeof(((struct sockaddr_un *)NULL)->sun_path)) -typedef struct +typedef struct { pid_t m_iPidToDump; char m_chImageDirectory[1024]; @@ -143,7 +143,7 @@ typedef struct char m_chServiceAddress[SUN_PATH_MAX]; } criu_native_dump_t; -typedef struct +typedef struct { int m_iDumpResult; char m_chDumpResponseMessage[1024]; @@ -259,7 +259,7 @@ static int LSCRIU_load_liblscapi(void) void *lib_handle = NULL; void *pthread_lib_handle = NULL; char ch; - + if (s_native) return 0; // Numerical signals indicates Apache @@ -299,10 +299,10 @@ static void LSCRIU_Wink_Server_is_Ready(void) // Not used for native return; } - if (getenv("LSAPI_UNIQE")) + if (getenv("LSAPI_UNIQE")) snprintf(sem_name, sizeof sem_name - 1, "lsphp[hash=%s].is_ready", getenv("LSAPI_UNIQE")); - else + else snprintf(sem_name, sizeof sem_name - 1, "lsphp[euid=0x%x].is_ready", geteuid()); @@ -314,28 +314,28 @@ static void LSCRIU_Wink_Server_is_Ready(void) if (psem_close(is_ready_sem) < 0) lsapi_error(sem_name, errno); } - else if (errno != ENOENT) + else if (errno != ENOENT) lsapi_error(sem_name, errno); } -static char *LSCRIU_Error_File_Name(char *pchFile, int max_len) +static char *LSCRIU_Error_File_Name(char *pchFile, int max_len) { const char *pchDefaultSocketPath = "/tmp/"; const char *pchDefaultLogFileName = "lsws_error.log"; - snprintf(pchFile, max_len, "%s%s", pchDefaultSocketPath, + snprintf(pchFile, max_len, "%s%s", pchDefaultSocketPath, pchDefaultLogFileName); return pchFile; } -#ifdef LSAPILIB_DEBUG_CRIU +#ifdef LSAPILIB_DEBUG_CRIU static void LSCRIU_Debugging(void) { char *pchCRIUDebug; pchCRIUDebug = getenv("LSAPI_CRIU_DEBUG"); - if (!pchCRIUDebug) + if (!pchCRIUDebug) pchCRIUDebug = getenv("LSCAPI_CRIU_DEBUG"); - //fprintf(stderr,"(%d) LSCRIU: CRIU debug environment variable: %s\n", + //fprintf(stderr,"(%d) LSCRIU: CRIU debug environment variable: %s\n", // s_pid, pchCRIUDebug); // I've made it easy to turn on debugging. CloudLinux Apache sets // LSCAPI_CRIU_DEBUG to nothing to indicate it's on. Sigh. @@ -347,7 +347,7 @@ static void LSCRIU_Debugging(void) { (((*pchCRIUDebug == 'O') || (*pchCRIUDebug == 'o')) && ((*(pchCRIUDebug + 1)) && - ((*(pchCRIUDebug + 1) == 'F') || (*(pchCRIUDebug + 1) == 'f')))))) + ((*(pchCRIUDebug + 1) == 'F') || (*(pchCRIUDebug + 1) == 'f')))))) { lscriu_dbg("LSCRIU (%d): CRIU Debugging disabled by environment\n", s_pid); s_criu_debug = 0; @@ -355,7 +355,7 @@ static void LSCRIU_Debugging(void) { else { s_criu_debug = 1; lscriu_dbg("LSCRIU (%d): CRIU Debugging enabled by environment\n", s_pid); - fprintf(stderr,"LSCRIU (%d): CRIU debug environment variable: %s\n", + fprintf(stderr,"LSCRIU (%d): CRIU debug environment variable: %s\n", s_pid, pchCRIUDebug); } } @@ -366,7 +366,7 @@ static void LSCRIU_Restored_Error(int iFatal, char *format, ...) { int iOldUMask; int iFd = -1; char chFile[1024]; - + if (!iFatal) { // LSCRIU_Debugging(); if (!s_criu_debug) { @@ -379,7 +379,7 @@ static void LSCRIU_Restored_Error(int iFatal, char *format, ...) { return; } iOldUMask = umask(0); - iFd = open( chFile, O_WRONLY | O_APPEND | O_CREAT, + iFd = open( chFile, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); umask(iOldUMask); if (iFd >= 0) { @@ -393,9 +393,9 @@ static void LSCRIU_Restored_Error(int iFatal, char *format, ...) { char buf[0x1000]; vsnprintf(buf, sizeof(buf), format, ap); va_end(ap); - + int n = snprintf(chFullMessage, sizeof(chFullMessage), - "%04d-%02d-%02d %02d:%02d:%02d.%03d: LSCRIU (%d): %s %s\n", + "%04d-%02d-%02d %02d:%02d:%02d.%03d: LSCRIU (%d): %s %s\n", sTm.tm_year + 1900, sTm.tm_mon + 1, sTm.tm_mday, @@ -404,7 +404,7 @@ static void LSCRIU_Restored_Error(int iFatal, char *format, ...) { sTm.tm_sec, sTimeb.millitm, s_pid, - iFatal ? "FATAL! " : "(debug) ", + iFatal ? "FATAL! " : "(debug) ", buf); if (n > (int)sizeof(chFullMessage)) n = sizeof(chFullMessage); @@ -438,7 +438,7 @@ static int LSCRIU_Native_Dump(pid_t iPid, if (write(iFdNative, &criu_native_dump, sizeof(criu_native_dump)) == -1) { - lscriu_err("LSCRIU (%d): Error sending dump request to the listener: %s\n", + lscriu_err("LSCRIU (%d): Error sending dump request to the listener: %s\n", s_pid, strerror(errno)); return(-1); } @@ -461,7 +461,7 @@ static int LSCRIU_Native_Dump(pid_t iPid, static void LSCRIU_CloudLinux_Checkpoint(void) { int iRet; - + if ((!s_native) && (!s_lscapi_dump_me)) { lscriu_dbg("LSCRIU (%d): Not native and unable to dump - abandon one-time " "dump\n", s_pid); @@ -471,7 +471,7 @@ static void LSCRIU_CloudLinux_Checkpoint(void) iRet = s_lscapi_dump_me(); if (iRet < 0) { char *pchError; - lscriu_err("LSCRIU: CloudLinux dump of PID: %d, error: %s\n", + lscriu_err("LSCRIU: CloudLinux dump of PID: %d, error: %s\n", s_pid, strerror(errno)); } if (iRet == 0) { @@ -482,11 +482,11 @@ static void LSCRIU_CloudLinux_Checkpoint(void) s_restored = 1; LSAPI_reset_server_state(); /* - Here we have restored the php process, so we should to tell (via + Here we have restored the php process, so we should to tell (via semaphore) mod_lsapi that we are started and ready to receive data. */ LSCRIU_Wink_Server_is_Ready(); - lscriu_err("LSCRIU: Successful CloudLinux restore of PID: %d, parent: %d.\n", + lscriu_err("LSCRIU: Successful CloudLinux restore of PID: %d, parent: %d.\n", getpid(), getppid()); } LSCRIU_Set_Initial_Start_Reqs(0); @@ -603,22 +603,22 @@ static int LSCRIU_Init_Env_Parameters(void) int n; p = getenv("LSAPI_INITIAL_START"); - if (!p) + if (!p) p = getenv("LSAPI_BACKEND_INITIAL_START"); if (p) { n = atoi(p); if (n > 0) { - lscriu_dbg("LSCRIU (%d): Set start requests based on environment (%d)\n", + lscriu_dbg("LSCRIU (%d): Set start requests based on environment (%d)\n", getpid(), n); LSCRIU_Set_Initial_Start_Reqs(n); } else { - lscriu_dbg("LSCRIU (%d): LSAPI_INITIAL_START set to 0 disabled\n", + lscriu_dbg("LSCRIU (%d): LSAPI_INITIAL_START set to 0 disabled\n", getpid()); return 0; } } else { - lscriu_dbg("LSCRIU (%d): LSAPI_INITIAL_START NOT set - disabled\n", + lscriu_dbg("LSCRIU (%d): LSAPI_INITIAL_START NOT set - disabled\n", getpid()); return 0; } @@ -627,11 +627,11 @@ static int LSCRIU_Init_Env_Parameters(void) GlobalCounterType_t gc_type = CRIU_GCOUNTER_SHM; char *env; if ((env = getenv("LSAPI_CRIU_USE_SHM"))) { - // CloudLinux doc: Off (shared memory) or Signals. + // CloudLinux doc: Off (shared memory) or Signals. // Litespeed doc: On (shared memory) or Signals - // So just check the first character for an 'S' and if not, then + // So just check the first character for an 'S' and if not, then // use shared memory. Pipe support is lost (sigh). - if ((*env == 'S') || (*env == 's')) + if ((*env == 'S') || (*env == 's')) gc_type = CRIU_GCOUNTER_SIG; // Just assume the rest is signals // else use the default of shared memory } @@ -644,7 +644,7 @@ static int LSCRIU_Init_Env_Parameters(void) (((*env == 'O') || (*env == 'o')) && ((*(env + 1) == 'N') || (*(env + 1) == 'n')))) gc_type = CRIU_GCOUNTER_SIG; - else if (*env == 2) + else if (*env == 2) gc_type = CRIU_GCOUNTER_PIPE; // The only case for pipe //else use the default of shared memory } @@ -657,7 +657,7 @@ static int LSCRIU_Init_Env_Parameters(void) lscriu_dbg("LSCRIU (%d): Use shared memory\n", getpid()); LSCRIU_Set_Global_Counter_Type(gc_type); } - else + else lscriu_dbg("LSCRIU (%d): NOT Listening\n", getpid()); char *criu_mode = NULL; @@ -691,7 +691,7 @@ void LSCRIU_inc_req_procssed() ++s_requests_count; } - lscriu_dbg("LSCRIU (%d): s_requests_count %d counter %d\n", getpid(), + lscriu_dbg("LSCRIU (%d): s_requests_count %d counter %d\n", getpid(), s_requests_count, s_initial_start_reqs); if (s_initial_start_reqs > 0 && s_requests_count <= s_initial_start_reqs) { diff --git a/sapi/litespeed/lscriu.h b/sapi/litespeed/lscriu.h index 9f40df37d5..cc0186ef79 100644 --- a/sapi/litespeed/lscriu.h +++ b/sapi/litespeed/lscriu.h @@ -21,18 +21,18 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are -met: +met: * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. + with the distribution. * Neither the name of the Lite Speed Technologies Inc nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior - written permission. + written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -44,7 +44,7 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _LSCRIU_H_ diff --git a/sapi/phpdbg/.phpdbginit b/sapi/phpdbg/.phpdbginit index 1ad35218ed..7ee34fccaa 100644 --- a/sapi/phpdbg/.phpdbginit +++ b/sapi/phpdbg/.phpdbginit @@ -25,7 +25,7 @@ */ /* -function my_debugging_function() +function my_debugging_function() { var_dump(func_get_args()); } @@ -49,31 +49,31 @@ if (function_exists('readline_completion_function')) { /* Setting argv made trivial ... - + argv 1 2 3 4 ^ set argv for next execution - + argv ^ unset argv for next execution - + */ function argv() { $argv = func_get_args(); - + if (!$argv) { $_SERVER['argv'] = array(); $_SERVER['argc'] = 0; return; } - + $_SERVER['argv'] = array_merge ( array("phpdbg"), $argv - ); + ); $_SERVER['argc'] = count($_SERVER['argv']); - + return $_SERVER['argv']; } :> diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 5af6ba619b..2a5ea29a0b 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1324,7 +1324,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{ { zend_mm_heap *heap = zend_mm_get_heap(); if (UNEXPECTED(heap == p)) { - /* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0) + /* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0) * let's prevent it from segfault for now */ } else { diff --git a/sapi/phpdbg/phpdbg.init.d b/sapi/phpdbg/phpdbg.init.d index 99a1ab328b..1f0b1fdbf9 100755 --- a/sapi/phpdbg/phpdbg.init.d +++ b/sapi/phpdbg/phpdbg.init.d @@ -44,7 +44,7 @@ insanity() return 1 fi fi - + return 0 } diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 1bf7227b1f..150647aa7e 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -193,14 +193,14 @@ PHPDBG_API int phpdbg_mixed_read(int sock, char *ptr, int len, int tmo) { static int phpdbg_output_pager(int sock, const char *ptr, int len) { int count = 0, bytes = 0; const char *p = ptr, *endp = ptr + len; - + while ((p = memchr(p, '\n', endp - p))) { count++; p++; - + if (count % PHPDBG_G(lines) == 0) { bytes += write(sock, ptr + bytes, (p - ptr) - bytes); - + if (memchr(p, '\n', endp - p)) { char buf[PHPDBG_MAX_CMD]; zend_quiet_write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---")); @@ -224,7 +224,7 @@ PHPDBG_API int phpdbg_mixed_write(int sock, const char *ptr, int len) { if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) { return phpdbg_send_bytes(sock, ptr, len); } - + if ((PHPDBG_G(flags) & PHPDBG_HAS_PAGINATION) && !(PHPDBG_G(flags) & PHPDBG_WRITE_XML) && PHPDBG_G(io)[PHPDBG_STDOUT].fd == sock diff --git a/sapi/phpdbg/phpdbg_parser.c b/sapi/phpdbg/phpdbg_parser.c index da08df2199..16ca21d5d1 100644 --- a/sapi/phpdbg/phpdbg_parser.c +++ b/sapi/phpdbg/phpdbg_parser.c @@ -1,19 +1,19 @@ /* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ diff --git a/sapi/phpdbg/phpdbg_parser.h b/sapi/phpdbg/phpdbg_parser.h index d13cfbc0a5..2a27a4e7df 100644 --- a/sapi/phpdbg/phpdbg_parser.h +++ b/sapi/phpdbg/phpdbg_parser.h @@ -1,19 +1,19 @@ /* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c index ed5633b845..bc1ac22f26 100644 --- a/sapi/phpdbg/phpdbg_print.c +++ b/sapi/phpdbg/phpdbg_print.c @@ -370,7 +370,7 @@ void phpdbg_print_opcodes_class(const char *class) { } } } ZEND_HASH_FOREACH_END(); - + return; } diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index fc25e30af1..70c02221aa 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -618,7 +618,7 @@ int phpdbg_compile(void) /* {{{ */ data->len += start_line_len; for (i = 1; i <= data->lines; i++) { data->line[i] += start_line_len; - } + } zend_hash_update_ptr(&PHPDBG_G(file_sources), PHPDBG_G(ops)->filename, data); } diff --git a/sapi/phpdbg/phpdbg_set.c b/sapi/phpdbg/phpdbg_set.c index 7cb8d0639f..dc69221a50 100644 --- a/sapi/phpdbg/phpdbg_set.c +++ b/sapi/phpdbg/phpdbg_set.c @@ -74,7 +74,7 @@ PHPDBG_SET(pagination) /* {{{ */ default: phpdbg_error("setpagination", "type=\"wrongargs\"", "set pagination used incorrectly: set pagination <on|off>"); } - + return SUCCESS; } /* }}} */ @@ -90,7 +90,7 @@ PHPDBG_SET(lines) /* {{{ */ default: phpdbg_error("setlines", "type=\"wrongargs\"", "set lines used incorrectly: set lines <number>"); } - + return SUCCESS; } /* }}} */ diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 0c0df7f97a..8fa47ca1df 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/phpdbg_watch.c @@ -428,7 +428,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) { phpdbg_store_watchpoint_btree(&coll->ref); phpdbg_activate_watchpoint(&coll->ref); phpdbg_watch_backup_data(&coll->ref); - + zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0); zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll); } diff --git a/sapi/phpdbg/web-bootstrap.php b/sapi/phpdbg/web-bootstrap.php index 7b8c5d30de..046062997e 100644 --- a/sapi/phpdbg/web-bootstrap.php +++ b/sapi/phpdbg/web-bootstrap.php @@ -1,26 +1,26 @@ <?php /** * The following file shows how to bootstrap phpdbg so that you can mock specific server environments - * + * * eval include("web-bootstrap.php") * exec index.php * compile * break ... * run */ -if (!defined('PHPDBG_BOOTSTRAPPED')) +if (!defined('PHPDBG_BOOTSTRAPPED')) { /* define these once */ define("PHPDBG_BOOTPATH", "/opt/php-zts/htdocs"); define("PHPDBG_BOOTSTRAP", "index.php"); - define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); + define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); } /* * Superglobals are JIT, phpdbg will not over-write whatever you set during bootstrap */ -$_SERVER = array +$_SERVER = array ( 'HTTP_HOST' => 'localhost', 'HTTP_CONNECTION' => 'keep-alive', diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md index 56dcaaa1f7..c02f80f2ca 100644 --- a/sapi/phpdbg/xml.md +++ b/sapi/phpdbg/xml.md @@ -297,7 +297,7 @@ info (subcommands) - <classinfo num="" /> with num having an integer value, indicating the number of loaded user-defined classes - Each class is enumerated with first a <class>, then an optional <parents> container and then a <classsource> element -- The <parents> container contains the <class> elements of the parent of the last <class> element. +- The <parents> container contains the <class> elements of the parent of the last <class> element. - <class type="" flags="" name="" methodcount="" /> - type: either "User" or "Internal" - flags: either "Interface", "Class" or "Abstract Class" diff --git a/scripts/dev/credits b/scripts/dev/credits index 5be84fda07..0683f59882 100755 --- a/scripts/dev/credits +++ b/scripts/dev/credits @@ -7,14 +7,14 @@ for what in ext sapi do file=ext/standard/credits_$what.h cat >$file <<END -/* +/* DO NOT EDIT THIS FILE! - it has been automaticaly created by php7/scripts/credits from + it has been automaticaly created by php7/scripts/credits from the information found in the various php7/ext/.../CREDITS and - php7/sapi/.../CREDITS files - - if you want to change an entry you have to edit the appropriate + php7/sapi/.../CREDITS files + + if you want to change an entry you have to edit the appropriate CREDITS file instead */ diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php index 0881e9ea47..18521638d3 100644 --- a/scripts/dev/find_tested.php +++ b/scripts/dev/find_tested.php @@ -71,7 +71,7 @@ $extension_method_info = mark_methods_as_tested($extension_method_info, $phpt_fi /** * The loop to ouput the test coverage info * Should output: Extension, Class Name, Method/Function Name, Test Status, Test Files - */ + */ foreach($extension_method_info as $record) { echo $record[EXTENSION_NAME] . ","; echo $record[CLASS_NAME] . ","; @@ -84,7 +84,7 @@ foreach($extension_method_info as $record) { * Marks the "tested" status of methods in $method_info according * to whether they are tested in $phpt_files */ -function mark_methods_as_tested($method_info, $phpt_files) { +function mark_methods_as_tested($method_info, $phpt_files) { foreach($phpt_files as $phpt_file) { $tested_functions = extract_tests($phpt_file); @@ -97,7 +97,7 @@ function mark_methods_as_tested($method_info, $phpt_files) { // matched the method name if ($current_method_record[IS_DUPLICATE] == true) { // we cannot be sure which class this method corresponds to, - // so mark method as needing to be verified + // so mark method as needing to be verified $current_method_record[IS_TESTED] = "verify"; } else { $current_method_record[IS_TESTED] = "yes"; @@ -114,7 +114,7 @@ function mark_methods_as_tested($method_info, $phpt_files) { * returns an array containing a record for each defined method. */ function populate_method_info() { - + $method_info = array(); // get functions @@ -197,21 +197,21 @@ function get_phpt_files($dir, &$phpt_file_count, &$all_phpt) } /** - * Extract tests from a specified file, returns an array of tested function tokens - */ + * Extract tests from a specified file, returns an array of tested function tokens + */ function extract_tests($file) { $code = file_get_contents($file); - + if (!preg_match('/--FILE--\s*(.*)\s*--(EXPECTF|EXPECTREGEX|EXPECT)?--/is', $code, $r)) { //print "Unable to get code in ".$file."\n"; return array(); } - + $tokens = token_get_all($r[1]); $functions = array_filter($tokens, 'filter_functions'); $functions = array_map( 'map_token_value',$functions); $functions = array_unique($functions); - + return $functions; } diff --git a/scripts/dev/gen_verify_stub b/scripts/dev/gen_verify_stub index 1dc3ba0cee..ac6dc4434d 100755 --- a/scripts/dev/gen_verify_stub +++ b/scripts/dev/gen_verify_stub @@ -39,7 +39,7 @@ do done for TARBALL in "$PHPROOT/php-$RELEASE_VER.tar.bz2" "$PHPROOT/php-$RELEASE_VER.tar.gz" "$PHPROOT/php-$RELEASE_VER.tar.xz" -do +do basename $TARBALL echo "SHA256 hash: `sha256sum $TARBALL | cut -d' ' -f1`"; echo PGP signature: diff --git a/scripts/dev/generate-phpt/build.xml b/scripts/dev/generate-phpt/build.xml index c01954bda9..098dfcac83 100755 --- a/scripts/dev/generate-phpt/build.xml +++ b/scripts/dev/generate-phpt/build.xml @@ -3,7 +3,7 @@ <project name="generate" default="test" basedir="."> <property name="build.dir" value="_build" /> - + <target name="docs" description="Create API documentation."> <exec command="doxygen doxygen.conf" /> </target> diff --git a/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt b/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt index 7e28494f5b..a957781205 100644 --- a/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt +++ b/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt @@ -3,7 +3,7 @@ unset($unset_var); $variation_array = array( 'unset var' => @$unset_var, - 'undefined var' => @$undefined_var, + 'undefined var' => @$undefined_var, 'empty string DQ' => "", 'empty string SQ' => '', 'uppercase NULL' => NULL, diff --git a/scripts/dev/generate-phpt/src/generate-phpt.php b/scripts/dev/generate-phpt/src/generate-phpt.php index 4f57a70b54..73071e2846 100644 --- a/scripts/dev/generate-phpt/src/generate-phpt.php +++ b/scripts/dev/generate-phpt/src/generate-phpt.php @@ -39,17 +39,17 @@ try { if($options->hasOption('s')) { $optionalSections->setOptions($options); } - + if($options->hasOption('c')) { $name = $options->getOption('c')."_".$options->getOption('m'); $method = new gtMethod($options->getOption('c'), $options->getOption('m')); - + $method->setArgumentNames(); $method->setArgumentLists(); $method->setInitialisationStatements(); - + $method->setConstructorArgumentNames(); $method->setConstructorInitStatements(); $method->setConstructorArgumentList(); diff --git a/scripts/dev/generate-phpt/src/gtClassMap.php b/scripts/dev/generate-phpt/src/gtClassMap.php index 3e45b4764d..1c346b83ce 100644 --- a/scripts/dev/generate-phpt/src/gtClassMap.php +++ b/scripts/dev/generate-phpt/src/gtClassMap.php @@ -1,23 +1,23 @@ <?php $gtClassMap = array( - + 'gtCodeSnippet' => 'gtCodeSnippet.php', 'gtTestSubject' => 'gtTestSubject.php', 'gtFunction' => 'gtFunction.php', 'gtMethod' => 'gtMethod.php', 'gtTestCaseWriter' => 'gtTestCaseWriter.php', 'gtText' => 'gtText.php', - - - + + + 'gtCommandLineOptions' => 'setup/gtCommandLineOptions.php', 'gtOptionalSections' => 'setup/gtOptionalSections.php', 'gtMissingArgumentException' => 'setup/exceptions/gtMissingArgumentException.php', 'gtUnknownOptionException' => 'setup/exceptions/gtUnknownOptionException.php', 'gtUnknownSectionException' => 'setup/exceptions/gtUnknownSectionException.php', 'gtMissingOptionsException' => 'setup/exceptions/gtMissingOptionsException.php', - + 'gtPreCondition' => 'setup/gtPreCondition.php', 'gtPreConditionList' => 'setup/gtPreConditionList.php', 'gtIsSpecifiedTestType' => 'setup/preconditions/gtIsSpecifiedTestType.php', @@ -26,21 +26,21 @@ 'gtIsValidClass' => 'setup/preconditions/gtIsValidClass.php', 'gtIsValidMethod' => 'setup/preconditions/gtIsValidMethod.php', 'gtIsValidFunction' => 'setup/preconditions/gtIsValidFunction.php', - - + + 'gtTestCase' => 'testcase/gtTestCase.php', 'gtVariationTestCase' => 'testcase/gtVariationTestCase.php', 'gtVariationTestCaseFunction' => 'testcase/gtVariationTestCaseFunction.php', 'gtVariationTestCaseMethod' => 'testcase/gtVariationTestCaseMethod.php', - + 'gtBasicTestCase' => 'testcase/gtBasicTestCase.php', 'gtBasicTestCaseFunction' => 'testcase/gtBasicTestCaseFunction.php', 'gtBasicTestCaseMethod' => 'testcase/gtBasicTestCaseMethod.php', - + 'gtErrorTestCase' => 'testcase/gtErrorTestCase.php', 'gtErrorTestCaseFunction' => 'testcase/gtErrorTestCaseFunction.php', 'gtErrorTestCaseMethod' => 'testcase/gtErrorTestCaseMethod.php', - + 'gtVariationContainer' => 'testcase/gtVariationContainer.php', 'gtVariationContainerMethod' => 'testcase/gtVariationContainerMethod.php', 'gtVariationContainerFunction' => 'testcase/gtVariationContainerFunction.php', diff --git a/scripts/dev/generate-phpt/src/gtCodeSnippet.php b/scripts/dev/generate-phpt/src/gtCodeSnippet.php index 220fbdf699..dc6543201a 100644 --- a/scripts/dev/generate-phpt/src/gtCodeSnippet.php +++ b/scripts/dev/generate-phpt/src/gtCodeSnippet.php @@ -2,7 +2,7 @@ /** * Retrieves code snippets for adding to test cases - * + * */ class gtCodeSnippet { @@ -14,21 +14,21 @@ class gtCodeSnippet * @return array */ public static function get($name) { - + $filename = dirname(__FILE__) . '/codeSnippets/' . $name . '.txt'; if (!file_exists($filename)) { throw new LogicException('The code snippet ' . $name . ' does not exist'); } - + $lines = file($filename); foreach($lines as $l) { $array[] = rtrim($l); } return $array; } - - + + /** * Append the code snippet on to an existing array * @@ -47,11 +47,11 @@ class gtCodeSnippet foreach ($text as $t) { $array[] = rtrim($t); } - + return $array; } - - + + /** * Appends blank entries on to an array * @@ -64,9 +64,9 @@ class gtCodeSnippet for ($i=0; $i< $numberOfLines; $i++) { $array[] = ""; } - + return $array; } - + } ?>
\ 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 47f4bafcb3..b2752ad637 100644 --- a/scripts/dev/generate-phpt/src/gtFunction.php +++ b/scripts/dev/generate-phpt/src/gtFunction.php @@ -7,7 +7,7 @@ class gtFunction extends gtTestSubject { private $functionName; - + /** * Set the name of the name of the function * diff --git a/scripts/dev/generate-phpt/src/gtMethod.php b/scripts/dev/generate-phpt/src/gtMethod.php index 820d7e0a76..dc8438c3b5 100644 --- a/scripts/dev/generate-phpt/src/gtMethod.php +++ b/scripts/dev/generate-phpt/src/gtMethod.php @@ -39,7 +39,7 @@ class gtMethod extends gtTestSubject { } } - + /** * Set the names of the mandatory and optional arguments to the method * @@ -87,14 +87,14 @@ class gtMethod extends gtTestSubject { public function getClassName() { return $this->className; } - + /** * Set the list of arguments to be passed to the constructor * */ public function setConstructorArgumentList() { if(count ($this->constructorArgumentNames) > 0) { - + for( $i = 0; $i < count( $this->constructorArgumentNames ); $i++) { $this->constructorArgumentList .= "\$".$this->constructorArgumentNames[$i].", "; } @@ -112,7 +112,7 @@ class gtMethod extends gtTestSubject { return $this->constructorArgumentList; } - + /** * Set up the source statements that initialise constructor arguments; * @@ -126,7 +126,7 @@ class gtMethod extends gtTestSubject { } - + /** * Return the constructor initialisation statements * diff --git a/scripts/dev/generate-phpt/src/gtTestCaseWriter.php b/scripts/dev/generate-phpt/src/gtTestCaseWriter.php index cc57863d9b..9438e0f2ea 100644 --- a/scripts/dev/generate-phpt/src/gtTestCaseWriter.php +++ b/scripts/dev/generate-phpt/src/gtTestCaseWriter.php @@ -5,20 +5,20 @@ * */ class gtTestCaseWriter { - + public static function write($name, $string, $type, $count = 0) { if ($type == 'b') { $fileName = $name."_basic.phpt"; } - + if ($type == 'e') { $fileName = $name."_error.phpt"; } - + if ($type == 'v') { $fileName = $name."_variation".$count.".phpt"; } - + $fh = fopen($fileName, 'w'); fwrite ($fh, $string); fclose($fh); diff --git a/scripts/dev/generate-phpt/src/gtTestSubject.php b/scripts/dev/generate-phpt/src/gtTestSubject.php index 76454dc7b8..782c99d6c7 100644 --- a/scripts/dev/generate-phpt/src/gtTestSubject.php +++ b/scripts/dev/generate-phpt/src/gtTestSubject.php @@ -10,7 +10,7 @@ abstract class gtTestSubject { protected $allowedArgumentLists; protected $maximumArgumentList; - + protected $initialisationStatements; @@ -31,7 +31,7 @@ abstract class gtTestSubject { public function getOptionalArgumentNames() { return $this->optionalArgumentNames; } - + public function setArgumentLists() { $this->setValidArgumentLists(); $this->setExtraArgumentList(); @@ -48,7 +48,7 @@ abstract class gtTestSubject { $this->extraArgumentList .= "\$".$this->mandatoryArgumentNames[$i].", "; } } - + if(count ($this->optionalArgumentNames) > 0) { for( $i = 0; $i < count( $this->optionalArgumentNames ); $i++) { $this->extraArgumentList .= "\$".$this->optionalArgumentNames[$i].", "; @@ -57,7 +57,7 @@ abstract class gtTestSubject { $this->extraArgumentList= $this->extraArgumentList. "\$extra_arg"; } - + /** * Return the list of arguments as it appears in the function call @@ -105,7 +105,7 @@ abstract class gtTestSubject { $this->allowedArgumentLists[0] .= "\$".$this->mandatoryArgumentNames[$i].", "; } } - + if(count ($this->optionalArgumentNames) > 0) { for( $i = 0; $i < count( $this->optionalArgumentNames ); $i++) { $this->allowedArgumentLists[] = $this->allowedArgumentLists[$i]."\$".$this->optionalArgumentNames[$i].", "; @@ -153,7 +153,7 @@ abstract class gtTestSubject { } } } - + /** * Return the initialisation statements * diff --git a/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php b/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php index 0e4d878bab..b1068e4600 100644 --- a/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php +++ b/scripts/dev/generate-phpt/src/setup/gtCommandLineOptions.php @@ -22,7 +22,7 @@ class gtCommandLineOptions { 'x', 'k', ); - + protected $options; protected function isShortOption($arg) @@ -44,7 +44,7 @@ class gtCommandLineOptions { if(count($argv) < 2) { throw new gtMissingOptionsException('Command line options are required'); } - + for ($i=1; $i<count($argv); $i++) { if ($this->isShortOption($argv[$i])) { @@ -72,7 +72,7 @@ class gtCommandLineOptions { $this->options[$option] = $argv[$i]; } } - + /** * */ diff --git a/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php b/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php index 1d2a163175..6c6de18345 100644 --- a/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php +++ b/scripts/dev/generate-phpt/src/setup/gtOptionalSections.php @@ -28,11 +28,11 @@ class gtOptionalSections { if($commandLineOptions->hasOption('k')) { $this->skipifKey = $commandLineOptions->getOption('k'); } - + if($commandLineOptions->hasOption('x')) { $this->skipifExt = $commandLineOptions->getOption('x'); } - + } } @@ -46,7 +46,7 @@ class gtOptionalSections { public function getSkipifKey() { return $this->skipifKey; } - + public function getSkipifExt() { return $this->skipifExt; } @@ -61,7 +61,7 @@ class gtOptionalSections { } return false; } - + public function hasSkipifExt() { if($this->skipifExt != '') { return true; @@ -75,7 +75,7 @@ class gtOptionalSections { public function hasClean() { return $this->optSections['clean']; } - + public function hasDone() { return $this->optSections['done']; } diff --git a/scripts/dev/generate-phpt/src/setup/gtPreCondition.php b/scripts/dev/generate-phpt/src/setup/gtPreCondition.php index 858395bc9d..294b41e9f2 100644 --- a/scripts/dev/generate-phpt/src/setup/gtPreCondition.php +++ b/scripts/dev/generate-phpt/src/setup/gtPreCondition.php @@ -5,10 +5,10 @@ * */ abstract class gtPreCondition { - - abstract public function check($clo); - - abstract public function getMessage(); - + + abstract public function check($clo); + + 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 06c17521f2..88f9b36205 100644 --- a/scripts/dev/generate-phpt/src/setup/gtPreConditionList.php +++ b/scripts/dev/generate-phpt/src/setup/gtPreConditionList.php @@ -5,10 +5,10 @@ * */ class gtPreConditionList { - + private $preConditions = array( 'gtIsSpecifiedTestType', - 'gtIsSpecifiedFunctionOrMethod', + 'gtIsSpecifiedFunctionOrMethod', 'gtIfClassHasMethod', 'gtIsValidClass', 'gtIsValidFunction', diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php index c91b210714..edd7a1cbae 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIfClassHasMethod.php @@ -5,7 +5,7 @@ * */ class gtIfClassHasMethod extends gtPreCondition { - + public function check( $clo) { if($clo->hasOption('c')) { if(!$clo->hasOption('m')) { @@ -15,7 +15,7 @@ class gtIfClassHasMethod extends gtPreCondition { } return true; } - + public function getMessage() { return gtText::get('methodNotSpecified'); } diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php index 7495c73eca..f70af881ec 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedFunctionOrMethod.php @@ -5,15 +5,15 @@ * */ class gtIsSpecifiedFunctionOrMethod extends gtPreCondition { - + public function check( $clo) { if($clo->hasOption('f') || $clo->hasOption('m')) { - + return true; } return false; } - + public function getMessage() { return gtText::get('functionOrMethodNotSpecified'); } diff --git a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php index 40530f3aca..ebc0a68f57 100644 --- a/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php +++ b/scripts/dev/generate-phpt/src/setup/preconditions/gtIsSpecifiedTestType.php @@ -5,15 +5,15 @@ * */ class gtIsSpecifiedTestType extends gtPreCondition { - + public function check( $clo) { if($clo->hasOption('b') || $clo->hasOption('e') || $clo->hasOption('v') ) { - + return true; } return false; } - + public function getMessage() { return gtText::get('testTypeNotSpecified'); } diff --git a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php index 684c24dd7e..92560c8631 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCase.php @@ -23,12 +23,12 @@ abstract class gtBasicTestCase extends gtTestCase { return new gtBasicTestCaseMethod($optionalSections); } } - + public function constructSubjectCalls() { $this->argInit(); $this->subjectCalls(); } - + public function addBasicEcho() { $this->testCase[] = "echo \"*** Test by calling method or function with its expected arguments ***\\n\";"; $this->testCase = gtCodeSnippet::appendBlankLines(1, $this->testCase ); diff --git a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php index f64c6daf32..c0fc9eb61f 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseFunction.php @@ -22,13 +22,13 @@ class gtBasicTestCaseFunction extends gtBasicTestCase { public function constructTestCase() { $this->constructCommonHeaders(); - + $this->addBasicEcho(); - + $this->constructSubjectCalls(); - + $this->constructCommonClosing(); - + } diff --git a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php index 3d3896e233..d009d5038a 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtBasicTestCaseMethod.php @@ -10,34 +10,34 @@ class gtBasicTestCaseMethod extends gtBasicTestCase { } /** - * Set the method + * Set the method * * @param gtMethod $method */ public function setMethod($method) { $this->subject = $method; } - + public function constructTestCase() { $this->constructCommonHeaders(); $this->addBasicEcho(); - + $this->constructorArgInit(); $this->constructorCreateInstance(); - + $this->constructSubjectCalls(); - + $this->constructCommonClosing(); - + } public function testHeader() { $this->testCase[] = "--TEST--"; $this->testCase[] = "Test class ".$this->subject->getClassName()." method ".$this->subject->getName()."() by calling it with its expected arguments"; - + } - + public function subjectCalls() { $lists = $this->subject->getValidArgumentLists(); @@ -45,7 +45,7 @@ public function constructTestCase() { $this->testCase[] = "var_dump( \$class->".$this->subject->getName()."( ".$list." ) );"; $this->testCase = gtCodeSnippet::appendBlankLines(1, $this->testCase ); } - $this->testCase = gtCodeSnippet::appendBlankLines(2, $this->testCase ); + $this->testCase = gtCodeSnippet::appendBlankLines(2, $this->testCase ); } } diff --git a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php index 214e3d28ba..82f955cf46 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCase.php @@ -17,7 +17,7 @@ abstract class gtErrorTestCase extends gtTestCase { * @return test case object */ public static function getInstance($optionalSections, $type = 'function') { - + if($type == 'function') { return new gtErrorTestCaseFunction($optionalSections); } @@ -34,16 +34,16 @@ abstract class gtErrorTestCase extends gtTestCase { public function getLongArgumentList() { return $this->longArgumentList; } - + public function constructSubjectCalls() { $this->argInit(); - + //Initialise the additional argument $this->testCase[] = "\$extra_arg = "; - + $this->subjectCalls(); } - + public function addErrorEcho() { $this->testCase[] = "echo \"*** Test by calling method or function with incorrect numbers of arguments ***\\n\";"; $this->testCase = gtCodeSnippet::appendBlankLines(1, $this->testCase ); diff --git a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php index 2453acf6fd..fcba6d798c 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseFunction.php @@ -26,13 +26,13 @@ class gtErrorTestCaseFunction extends gtErrorTestCase { */ public function constructTestCase() { $this->constructCommonHeaders(); - + $this->addErrorEcho(); - + $this->constructSubjectCalls(); - + $this->constructCommonClosing(); - + } diff --git a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php index 647e52f93e..fa1c8ca3f1 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtErrorTestCaseMethod.php @@ -27,33 +27,33 @@ class gtErrorTestCaseMethod extends gtErrorTestCase { */ public function constructTestCase() { $this->constructCommonHeaders(); - + $this->addErrorEcho(); - + $this->constructorArgInit(); $this->constructorCreateInstance(); - + $this->constructSubjectCalls(); - + $this->constructCommonClosing(); } - + public function testHeader() { $this->testCase[] = "--TEST--"; $this->testCase[] = "Test class ".$this->subject->getClassName()." method ".$this->subject->getName()."() by calling it more than or less than its expected arguments"; } - + public function subjectCalls() { // Construct the argument list to pass to the method being tested $list = $this->subject->getExtraArgumentList(); $this->testCase = gtCodeSnippet::appendBlankLines(1, $this->testCase ); $this->testCase[] = "var_dump(".$this->subject->getName()."( ".$list." ) );"; - + $list = $this->subject->getShortArgumentList(); $this->testCase = gtCodeSnippet::appendBlankLines(1, $this->testCase ); $this->testCase[] = "var_dump(".$this->subject->getName()."( ".$list." ) );"; - + } } ?>
\ No newline at end of file diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php index 60c115a9c1..e6fa7affcf 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php @@ -80,11 +80,11 @@ abstract class gtTestCase { */ public function ConstructCommonClosing() { $this->fileClosing(); - + if ($this->optionalSections->hasDone()) { $this->addDone(); } - + if ($this->optionalSections->hasClean()) { $this->addClean(); } diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php b/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php index 59951707ce..f445d9e7f4 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainer.php @@ -4,9 +4,9 @@ * Container for all possible variation test cases */ abstract class gtVariationContainer { - + protected $variationTests; - + protected $dataTypes = array ( 'array', 'boolean', @@ -16,9 +16,9 @@ abstract class gtVariationContainer { 'object', 'string', ); - - - + + + /** * Return an instance of a containers for either function or method tests * @@ -26,21 +26,21 @@ abstract class gtVariationContainer { * @return variation test container */ public static function getInstance ($optionalSections, $type = 'function') { - + if($type == 'function') { return new gtVariationContainerFunction($optionalSections); } if($type =='method') { return new gtVariationContainerMethod($optionalSections); } - + } - - + + public function constructAll() { } - - + + /** * Returns all varaition tests as an array of arrays * @@ -49,6 +49,6 @@ abstract class gtVariationContainer { public function getVariationTests() { return $this->variationTests; } - + } ?>
\ 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 a62882a81a..b6a3aa473c 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php @@ -4,14 +4,14 @@ * Container for all possible variation test cases of functions */ class gtVariationContainerFunction extends gtVariationContainer { - + protected $function; protected $optionalSections; - + public function __construct($osl) { $this->optionalSections = $osl; } - + /** * Sets function being tested * @@ -20,15 +20,15 @@ class gtVariationContainerFunction extends gtVariationContainer { public function setFunction(gtFunction $function) { $this->function = $function; } - - + + /** * constructs all possible variation testcases in array $this->variationTests * */ public function constructAll() { - - + + $numberOfArguments = count($this->function->getMandatoryArgumentNames()) + count($this->function->getOptionalArgumentNames()); for($i = 1; $i <= $numberOfArguments; $i++) { foreach ($this->dataTypes as $d) { @@ -38,6 +38,6 @@ class gtVariationContainerFunction extends gtVariationContainer { $this->variationTests[] = $testCase->toString(); } } - } + } } ?>
\ 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 bee26b08aa..0d24337b3b 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerMethod.php @@ -3,15 +3,15 @@ * Container for all possible variation test cases for a method */ class gtVariationContainerMethod extends gtVariationContainer { - + protected $method; protected $optionalSections; - + public function __construct($osl) { $this->optionalSections = $osl; } - - + + /** * Sets the method to be tested * @@ -20,27 +20,27 @@ class gtVariationContainerMethod extends gtVariationContainer { public function setMethod(gtMethod $method) { $this->method = $method; } - - + + /** * Constructs all variation tests in $this_variationTests * */ public function constructAll() { - + $numberOfArguments = count($this->method->getMandatoryArgumentNames()) + count($this->method->getOptionalArgumentNames()); - + for($i = 1; $i <= $numberOfArguments; $i++) { - + foreach ($this->dataTypes as $d) { - + $testCase = gtVariationTestCase::getInstance($this->optionalSections, 'method'); $testCase->setUp($this->method, $i, $d); $testCase->constructTestCase(); $this->variationTests[] = $testCase->toString(); - + } } - } + } } ?>
\ 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 039367d5b3..e868b80795 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCase.php @@ -15,7 +15,7 @@ abstract class gtVariationTestCase extends gtTestCase { * @return test case object */ public static function getInstance($optionalSections, $type = 'function') { - + if($type == 'function') { return new gtVariationTestCaseFunction($optionalSections); } diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php index 7bf1c8b778..45cbe2046c 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseFunction.php @@ -32,22 +32,22 @@ class gtVariationTestCaseFunction extends gtVariationTestCase { * */ public function constructTestCase() { - $this->constructCommonHeaders(); - + $this->constructCommonHeaders(); + $this->addVariationEcho(); - + $this->constructSubjectCalls(); - + $this->constructCommonClosing(); - + } public function testHeader() { $this->testCase[] = "--TEST--"; $this->testCase[] = "Test function ".$this->subject->getName()."() by substituting argument ".$this->argumentNumber." with ".$this->variationData." values."; } - - public function subjectCalls() { + + public function subjectCalls() { $this->testCase = gtCodeSnippet::append('loopStart', $this->testCase); // Construct the argument list to pass to the function being tested @@ -59,6 +59,6 @@ class gtVariationTestCaseFunction extends gtVariationTestCase { $this->testCase[] = " var_dump(".$this->subject->getName()."( ".$list." ) );"; $this->testCase = gtCodeSnippet::append('loopClose', $this->testCase); } - + } ?>
\ 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 a9c921f9db..db923f078a 100644 --- a/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php +++ b/scripts/dev/generate-phpt/src/testcase/gtVariationTestCaseMethod.php @@ -34,15 +34,15 @@ class gtVariationTestCaseMethod extends gtVariationTestCase { */ public function constructTestCase() { $this->constructCommonHeaders(); - + $this->addVariationEcho(); - + $this->constructorArgInit(); $this->constructorCreateInstance(); - + $this->constructSubjectcalls(); $this->constructCommonClosing(); - + } public function testHeader() { diff --git a/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php b/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php index dbba0d6470..fa80c0766d 100644 --- a/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtBasicTestCaseFunctionTest.php @@ -6,13 +6,13 @@ class gtBasicTestCaseFunctionTest extends PHPUnit_Framework_TestCase { public function testTestCase() { - + $f = new gtFunction('cos'); $f->setArgumentNames(); $f->setArgumentLists(); $f->setInitialisationStatements(); $optSect = new gtOptionalSections(); - + $btc = gtBasicTestCase::getInstance($optSect); $btc->setFunction($f); $btc->constructTestCase(); diff --git a/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php b/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php index 81307f139c..18768b6294 100644 --- a/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtBasicTestCaseMethodTest.php @@ -6,7 +6,7 @@ class gtBasicTestCaseMethodTest extends PHPUnit_Framework_TestCase { public function testTestCase() { - + $f = new gtMethod('DOMDocument','createAttribute'); $f->setArgumentNames(); $f->setArgumentLists(); @@ -18,11 +18,11 @@ class gtBasicTestCaseMethodTest extends PHPUnit_Framework_TestCase { $btc = gtBasicTestCaseMethod::getInstance($optSect, 'method'); $btc->setMethod($f); $btc->constructTestCase(); - + $fs = $btc->toString(); $this->assertTrue(is_string($fs)); - + } } ?>
\ 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 bc0c48a5a1..6d4d5861c3 100644 --- a/scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php +++ b/scripts/dev/generate-phpt/tests/gtCodeSnippetTest.php @@ -5,7 +5,7 @@ require_once dirname(__FILE__) . '/../src/gtAutoload.php'; class gtCodeSnippetTest extends PHPUnit_Framework_TestCase { - + public function testAppend() { $array = array('something', 'nothing'); $array = gtCodeSnippet::append('loopClose', $array); diff --git a/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php b/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php index 2fd6818a45..1bf32b4608 100644 --- a/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php +++ b/scripts/dev/generate-phpt/tests/gtCommandLineOptionsTest.php @@ -5,7 +5,7 @@ require_once 'PHPUnit/Framework.php'; class gtCommandLineOptionsTest extends PHPUnit_Framework_TestCase { - + /** * @expectedException RuntimeException */ @@ -26,7 +26,7 @@ require_once 'PHPUnit/Framework.php'; $this->assertTrue($clo->hasOption('f')); $this->assertEquals('some-function', $clo->getOption('f')); } - + /** * @expectedException RuntimeException */ @@ -34,7 +34,7 @@ require_once 'PHPUnit/Framework.php'; $clo = new gtCommandLineOptions(); $clo->parse(array('generate-phpt.php', '-z')); } - + /** * @expectedException RuntimeException */ diff --git a/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php b/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php index 5b72fcc9f5..c6399168be 100644 --- a/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtErrorTestCaseFunctionTest.php @@ -6,23 +6,23 @@ class gtErrorTestCaseFunctionTest extends PHPUnit_Framework_TestCase { public function testTestCase() { - + $f = new gtFunction('cos'); $f->setArgumentNames(); $f->setArgumentLists(); $f->setInitialisationStatements(); - + $optSect = new gtOptionalSections(); - + $btc = gtErrorTestCase::getInstance($optSect); $btc->setFunction($f); $btc->constructTestCase(); - - + + $fs = $btc->toString(); $this->assertTrue(is_string($fs)); - + } - + } ?>
\ 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 7077881296..894a551597 100644 --- a/scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtErrorTestCaseMethodTest.php @@ -6,7 +6,7 @@ class gtErrorTestCaseMethodTest extends PHPUnit_Framework_TestCase { public function testTestCase() { - + $f = new gtMethod('DOMDocument', 'createAttribute'); $f->setArgumentNames(); $f->setArgumentLists(); @@ -15,14 +15,14 @@ class gtErrorTestCaseMethodTest extends PHPUnit_Framework_TestCase { $f->setConstructorArgumentNames(); $f->setConstructorInitStatements(); - + $optSect = new gtOptionalSections(); - + $btc = gtErrorTestCase::getInstance($optSect,'method'); $btc->setMethod($f); $btc->constructTestCase(); - - + + $fs = $btc->toString(); $this->assertTrue(is_string($fs)); } diff --git a/scripts/dev/generate-phpt/tests/gtFunctionTest.php b/scripts/dev/generate-phpt/tests/gtFunctionTest.php index 0aa7eac119..5afcd950d4 100644 --- a/scripts/dev/generate-phpt/tests/gtFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtFunctionTest.php @@ -43,25 +43,25 @@ class gtFunctionTest extends PHPUnit_Framework_TestCase $this->assertEquals('$ver1', $f->getShortArgumentList()); } - + public function testAllArgumentList() { $f = new gtFunction('version_compare'); $f->setArgumentNames(); $f->setValidArgumentLists(); $a = $f->getValidArgumentLists(); - + $this->assertEquals('$ver1, $ver2', $a[0]); $this->assertEquals('$ver1, $ver2, $oper', $a[1]); } - + public function testInitialisation() { $f = new gtFunction('version_compare'); $f->setArgumentNames(); $f->setInitialisationStatements(); $a = $f->getInitialisationStatements(); - + $this->assertEquals('$ver1 = ', $a[0]); $this->assertEquals('$ver2 = ', $a[1]); $this->assertEquals('$oper = ', $a[2]); diff --git a/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php b/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php index 064edf3b65..a60f77ef37 100644 --- a/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsSpecifiedFunctionOrMethodTest.php @@ -20,16 +20,16 @@ class gtIsSpecifiedFunctionOrMethodTest extends PHPUnit_Framework_TestCase { $ch = new gtIsSpecifiedFunctionOrMethod(); $this->assertTrue($ch->check($clo)); } - + public function testNotValid() { $clo = new gtCommandLineOptions(); $clo->parse(array('generate-phpt.php', '-b')); $ch = new gtIsSpecifiedFunctionOrMethod(); $this->assertFalse($ch->check($clo)); - + } - + public function testMessage() { $clo = new gtCommandLineOptions(); diff --git a/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php b/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php index c8b0a4e36a..bc7cf9412d 100644 --- a/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsSpecifiedTestTypeTest.php @@ -20,7 +20,7 @@ class gtIsSpecifiedTestTypeTest extends PHPUnit_Framework_TestCase { $ch = new gtIsSpecifiedTestType(); $this->assertFalse($ch->check($clo)); } - + public function testMessage() { $clo = new gtCommandLineOptions(); diff --git a/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php b/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php index 51ca87879d..507ca232db 100644 --- a/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsValidClassTest.php @@ -20,7 +20,7 @@ class gtIsValidClassTest extends PHPUnit_Framework_TestCase { $ch = new gtIsValidClass(); $this->assertFalse($ch->check($clo)); } - + public function testNotGiven() { $clo = new gtCommandLineOptions(); @@ -28,7 +28,7 @@ class gtIsValidClassTest extends PHPUnit_Framework_TestCase { $ch = new gtIsValidClass(); $this->assertTrue($ch->check($clo)); } - + public function testMessage() { $clo = new gtCommandLineOptions(); diff --git a/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php b/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php index d4700b9d66..07a7038dcc 100644 --- a/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsValidFunctionTest.php @@ -20,7 +20,7 @@ class gtIsValidFunctionTest extends PHPUnit_Framework_TestCase { $ch = new gtIsValidFunction(); $this->assertFalse($ch->check($clo)); } - + public function testNotSupplied() { $clo = new gtCommandLineOptions(); @@ -28,7 +28,7 @@ class gtIsValidFunctionTest extends PHPUnit_Framework_TestCase { $ch = new gtIsValidFunction(); $this->assertTrue($ch->check($clo)); } - + public function testMessage() { $clo = new gtCommandLineOptions(); diff --git a/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php b/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php index fe069977ef..0f1b349f4d 100644 --- a/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtIsValidMethodTest.php @@ -20,7 +20,7 @@ class gtIsValidMethodTest extends PHPUnit_Framework_TestCase { $ch = new gtIsValidMethod(); $this->assertFalse($ch->check($clo)); } - + public function testNotGiven() { $clo = new gtCommandLineOptions(); @@ -28,7 +28,7 @@ class gtIsValidMethodTest extends PHPUnit_Framework_TestCase { $ch = new gtIsValidMethod(); $this->assertTrue($ch->check($clo)); } - + public function testMessage() { $clo = new gtCommandLineOptions(); diff --git a/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php b/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php index dbf2994567..541dbdf2dd 100644 --- a/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php +++ b/scripts/dev/generate-phpt/tests/gtOptionalSectionsTest.php @@ -27,29 +27,29 @@ class gtOptionalSectionsTest extends PHPUnit_Framework_TestCase $opt = new gtOptionalSections(); $opt->setOptions($clo); } - + public function testSkip() { $clo = new gtCommandLineOptions(); $clo->parse(array('generate-phpt.php', '-s', 'skipif', '-x', 'standard')); $opt = new gtOptionalSections(); $opt->setOptions($clo); - + $opt = new gtOptionalSections(); $opt->setOptions($clo); - + $this->assertEquals('standard', $opt->getSkipifExt() ); } - + public function testSkipKey() { $clo = new gtCommandLineOptions(); $clo->parse(array('generate-phpt.php', '-s', 'skipif', '-k', 'win')); $opt = new gtOptionalSections(); $opt->setOptions($clo); - + $opt = new gtOptionalSections(); $opt->setOptions($clo); - + $this->assertEquals('win', $opt->getSkipifKey() ); } diff --git a/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php b/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php index df9f21c309..83178b21e7 100644 --- a/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php +++ b/scripts/dev/generate-phpt/tests/gtVariationTestCaseFunctionTest.php @@ -5,55 +5,55 @@ require_once dirname(__FILE__) . '/../src/gtAutoload.php'; class gtVariationTestCaseFunctionTest extends PHPUnit_Framework_TestCase { public function testTestCase() { - + $f = new gtFunction('cos'); $f->setArgumentNames(); $f->setArgumentLists(); - + $optSect = new gtOptionalSections(); - + $vtc = gtVariationTestCase::getInstance($optSect); $vtc->setUp($f, 1, 'int'); $vtc->constructTestCase(); - + $fs = $vtc->toString(); $this->assertTrue(is_string($fs)); - + } public function testTestCase2() { - + $f = new gtFunction('date_sunrise'); $f->setArgumentNames(); $f->setArgumentLists(); $a = $f->getMandatoryArgumentNames(); - + $optSect = new gtOptionalSections(); - + $vtc = gtVariationTestCase::getInstance($optSect); $vtc->setUp($f, 6, 'int'); $vtc->constructTestCase(); - + $fs = $vtc->toString(); $this->assertTrue(is_string($fs)); - + } - + public function testTestCase3() { - + $f = new gtFunction('date_sunrise'); $f->setArgumentNames(); $f->setArgumentLists(); - + $optSect = new gtOptionalSections(); $vtc = gtVariationTestCase::getInstance($optSect); $vtc->setUp($f, 6, 'array'); $vtc->constructTestCase(); - + $fs = $vtc->toString(); $this->assertTrue(is_string($fs)); - + } } ?>
\ 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 d99b6562d0..a074fcceeb 100644 --- a/scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php +++ b/scripts/dev/generate-phpt/tests/gtVariationTestCaseMethodTest.php @@ -5,23 +5,23 @@ require_once dirname(__FILE__) . '/../src/gtAutoload.php'; class gtVariationTestCaseMethodTest extends PHPUnit_Framework_TestCase { public function testTestCase() { - + $f = new gtMethod('DOMDocument','createAttribute'); $f->setArgumentNames(); $f->setArgumentLists(); $f->setConstructorArgumentNames(); $f->setConstructorInitStatements(); - + $optSect = new gtOptionalSections(); - + $vtc = gtVariationTestCase::getInstance($optSect, 'method'); $vtc->setUp($f, 1, 'int'); $vtc->constructTestCase(); $fs = $vtc->toString(); - + $this->assertTrue(is_string($fs)); - + } } ?>
\ No newline at end of file diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in index d2852fdcc5..b885326bfe 100644 --- a/scripts/man1/phpize.1.in +++ b/scripts/man1/phpize.1.in @@ -44,5 +44,5 @@ available through the world-wide-web at the following url: .P If you did not receive a copy of the PHP license and are unable to obtain it through the world-wide-web, please send a note to -.B license@php.net +.B license@php.net so we can mail you a copy immediately. diff --git a/scripts/phpize.in b/scripts/phpize.in index 6302d4ee2f..e67e3d9cc4 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -31,7 +31,7 @@ phpize_no_configm4() echo "Cannot find config.m4. " echo "Make sure that you run '$0$clean' in the top level source directory of the module" - echo + echo } phpize_clean() @@ -107,8 +107,8 @@ phpize_check_shtool() if test ! -x "$builddir/build/shtool"; then cat <<EOF -shtool at '$builddir/build/shtool' does not exist or is not executable. -Make sure that the file exists and is executable and then rerun this script. +shtool at '$builddir/build/shtool' does not exist or is not executable. +Make sure that the file exists and is executable and then rerun this script. EOF exit 1 @@ -121,7 +121,7 @@ phpize_check_autotools() { test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader - + if test ! -x "$PHP_AUTOCONF" && test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <<EOF Cannot find autoconf. Please check your autoconf installation and the @@ -143,7 +143,7 @@ EOF phpize_copy_files() { test -d build || mkdir build - + (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) (cd "$phpdir" && cp $FILES "$builddir") (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) @@ -164,7 +164,7 @@ phpize_autotools() # Main script -case "$1" in +case "$1" in # Cleanup --clean) phpize_check_configm4 1 diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 1094e2812c..39f7998430 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -6,7 +6,7 @@ ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], []) PHP_CONFIG_NICE(config.nice) -dnl +dnl AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl AC_DEFUN([PHP_EXT_DIR],[""])dnl AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl @@ -45,7 +45,7 @@ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null` INCLUDES=`$PHP_CONFIG --includes 2>/dev/null` EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null` PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null` - + if test -z "$prefix"; then AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH]) fi diff --git a/server-tests-config.php b/server-tests-config.php index 5961deea98..645a5e8e98 100755 --- a/server-tests-config.php +++ b/server-tests-config.php @@ -6,7 +6,7 @@ that are directly executed, so you can also set things like PHPRC here to force an executable to use a specific php.ini file. */ - + $conf = array( /* path to the php source tree */ 'TEST_PHP_SRCDIR' => NULL, @@ -43,7 +43,7 @@ $conf = array( TEST_WEB_BASE_URL should be the base url pointing to TEST_PHP_SRCDIR, which should then be accessible via an http server. - + An example would be: TEST_WEB_BASE_URL=http://localhost/test TEST_BASE_PATH=/path/to/htdocs/test diff --git a/server-tests.php b/server-tests.php index ff4b9f6ffc..f914b01187 100755 --- a/server-tests.php +++ b/server-tests.php @@ -154,13 +154,13 @@ function post_result_data($query,$data) $post = "php_test_data=" . urlencode(base64_encode(preg_replace("/[\\x00]/", "[0x0]", $data))); $r = new HTTPRequest($url,NULL,NULL,$post); return $this->response_headers['Status']=='200'; -} +} function execute($command, $args=NULL, $input=NULL, $cwd=NULL, $env=NULL) { $data = ""; - + if (gettype($args)=='array') { $args = join($args,' '); } @@ -179,7 +179,7 @@ function execute($command, $args=NULL, $input=NULL, $cwd=NULL, $env=NULL) return NULL; } } - + fclose($pipes[0]); while (true) { @@ -247,7 +247,7 @@ class HTTPRequest /* URL is the full url headers is assoc array of outgoing http headers - + options may include timeout proxy_host @@ -255,7 +255,7 @@ class HTTPRequest proxy_user proxy_pass method (GET|POST) - + post data is, well, post data. It is not processed so multipart stuff must be prepared before calling this (or add it to class) @@ -269,14 +269,14 @@ class HTTPRequest $this->postdata = &$postdata; $this->doRequest(); } - + function doRequest() { if (!$this->_validateUrl()) return; - - if (isset($this->options['timeout'])) + + if (isset($this->options['timeout'])) $this->timeout = (int)$this->options['timeout']; - + $this->_sendHTTP(); } @@ -295,7 +295,7 @@ class HTTPRequest $this->urlparts['path'] = '/'; return TRUE; } - + function _parseResponse() { if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $this->incoming_payload, $match)) { @@ -319,7 +319,7 @@ class HTTPRequest $this->errmsg = 'Invalid HTTP Response'; return FALSE; } - + function &_getRequest() { $fullpath = $this->urlparts['path']. @@ -343,13 +343,13 @@ class HTTPRequest $headertext .= "$k: $v\r\n"; } $method = trim($this->options['method'])?strtoupper(trim($this->options['method'])):'GET'; - $this->outgoing_payload = + $this->outgoing_payload = "$method $fullpath HTTP/1.0\r\n". $headertext."\r\n". $this->postdata; return $this->outgoing_payload; } - + function _sendHTTP() { $this->_getRequest(); @@ -378,7 +378,7 @@ class HTTPRequest $this->errmsg = "Error Sending Request Data to $host"; return NULL; } - + while ($data = fread($fp, 32768)) { $this->incoming_payload .= $data; } @@ -422,7 +422,7 @@ class testHarness { 'w' => array('TEST_WEB' ,'' ,0 ,'run tests via http'), 'x' => array('TEST_WEB_EXT' ,'file ext' ,'php' ,'http file extension to use') ); - + public $conf = array(); public $test_to_run = array(); public $test_files = array(); @@ -439,7 +439,7 @@ class testHarness { public $test_executable_iscgi = false; public $inisettings; // the test executables settings, used for web tests public $iswin32 = false; - + public $ddash = "====================================================================="; public $sdash = "---------------------------------------------------------------------"; @@ -463,7 +463,7 @@ class testHarness { 'error_append_string'=>'', 'auto_prepend_file'=>'', 'auto_append_file'=>'', - ); + ); public $env = array(); public $info_params = array(); @@ -472,7 +472,7 @@ class testHarness { $this->checkRequirements(); $this->env = $_ENV; $this->removeSensitiveEnvVars(); - + $this->initializeConfiguration(); $this->parseArgs(); $this->setTestPaths(); @@ -490,13 +490,13 @@ class testHarness { $this->conf['TEST_PHP_SRCDIR'] = str_replace('/','\\',$this->conf['TEST_PHP_SRCDIR']); $this->conf['TEST_BASE_PATH'] = str_replace('/','\\',$this->conf['TEST_BASE_PATH']); } - + if (!$this->conf['TEST_WEB'] && !is_executable($this->conf['TEST_PHP_EXECUTABLE'])) { $this->error("invalid PHP executable specified by TEST_PHP_EXECUTABLE = " . $this->conf['TEST_PHP_EXECUTABLE']); return false; } - + $this->getInstalledExtensions(); $this->getExecutableInfo(); $this->getExecutableIniSettings(); @@ -506,11 +506,11 @@ class testHarness { // add TEST_PHP_SRCDIR to the include path, this facilitates // tests including files from src/tests //$this->ini_overwrites['include_path'] = $this->cwd.($this->iswin32?';.;':':.:').$this->exec_info['INCLUDE_PATH']; - + $params = array(); settings2array($this->ini_overwrites,$params); $this->info_params = settings2params($params); - + $this->contextHeader(); if ($this->conf['TEST_CONTEXT_INFO']) return; $this->loadFileList(); @@ -524,7 +524,7 @@ class testHarness { $out = $this->runscript(PHP_INI_SETTINGS_SCRIPT,true); $this->inisettings = unserialize($out); } - + function getExecutableInfo() { $out = $this->runscript(PHP_INFO_SCRIPT,true); @@ -540,7 +540,7 @@ class testHarness { } $this->exec_info = $info; } - + function getInstalledExtensions() { // get the list of installed extensions @@ -579,21 +579,21 @@ class testHarness { } } - + // Use this function to do any displaying of text, so that // things can be over-written as necessary. - + function writemsg($msg) { - + echo $msg; - + } - + // Another wrapper function, this one should be used any time // a particular test passes or fails - + function showstatus($item, $status, $reason = '') { - + switch($status) { case 'PASSED': $this->writemsg("PASSED: $item ($reason)\n"); @@ -606,8 +606,8 @@ class testHarness { break; } } - - + + function help() { $usage = "usage: php run-tests.php [options]\n"; @@ -616,17 +616,17 @@ class testHarness { } return $usage; } - + function parseArgs() { global $argc; global $argv; global $_SERVER; - + if (!isset($argv)) { $argv = $_SERVER['argv']; $argc = $_SERVER['argc']; } - + $conf = NULL; for ($i=1; $i<$argc;) { if ($argv[$i][0] != '-') continue; @@ -661,7 +661,7 @@ class testHarness { break; } } - + // set config into environment, this allows // executed tests to find out about the test // configurations. config file or args overwrite @@ -680,14 +680,14 @@ class testHarness { $this->env['SSH_AUTH_SOCK']='deleted'; $this->env['SSH_TTY']='deleted'; } - + function setEnvConfigVar($name) { if (isset($this->env[$name])) { $this->conf[$name] = $this->env[$name]; } } - + function initializeConfiguration() { foreach ($this->xargs as $arg=>$arg_info) { @@ -715,7 +715,7 @@ class testHarness { } } } - + function test_sort($a, $b) { $ta = strpos($a, "{$this->cwd}/tests")===0 ? 1 + (strpos($a, "{$this->cwd}/tests/run-test")===0 ? 1 : 0) : 0; $tb = strpos($b, "{$this->cwd}/tests")===0 ? 1 + (strpos($b, "{$this->cwd}/tests/run-test")===0 ? 1 : 0) : 0; @@ -745,7 +745,7 @@ class testHarness { exit; } } - + // // Write test context information. // @@ -767,12 +767,12 @@ class testHarness { foreach ($this->conf as $k=>$v) { $conf .= sprintf("%-20.s: %s\n",$k,$v); } - + $exeinfo = ''; if (!$this->conf['TEST_WEB']) $exeinfo = "CWD : {$this->cwd}\n". "PHP : {$this->conf['TEST_PHP_EXECUTABLE']}\n"; - + $this->writemsg("\n$this->ddash\n". "$exeinfo$info\n". "Test Harness Configuration:\n$conf\n". @@ -780,7 +780,7 @@ class testHarness { "Test Dirs : $dirs\n". "$this->ddash\n"); } - + function loadFileList() { foreach ($this->test_dirs as $dir) { @@ -793,7 +793,7 @@ class testHarness { usort($this->test_files,array($this,"test_sort")); $this->writemsg("found ".count($this->test_files)." files\n"); } - + function moveTestFiles() { if (!$this->conf['TEST_BASE_PATH'] || @@ -819,7 +819,7 @@ class testHarness { } $this->test_files = $files; } - + function findFilesInDir($dir,$is_ext_dir=FALSE,$ignore=FALSE) { $skip = array('.', '..', 'CVS'); @@ -833,13 +833,13 @@ class testHarness { } $this->findFilesInDir("$dir/$name", FALSE, $ignore || $skip_ext); } - + // Cleanup any left-over tmp files from last run. if (substr($name, -4) == '.tmp') { @unlink("$dir/$name"); continue; } - + // Otherwise we're only interested in *.phpt files. if (substr($name, -5) == '.phpt') { if ($ignore) { @@ -852,7 +852,7 @@ class testHarness { } closedir($o); } - + function runHeader() { $this->writemsg("TIME START " . date('Y-m-d H:i:s', $this->start_time) . "\n".$this->ddash."\n"); @@ -862,14 +862,14 @@ class testHarness { $this->writemsg("Running all test files.\n"); } } - + function run() { $this->start_time = time(); $this->runHeader(); // Run selected tests. if (count($this->test_to_run)) { - + foreach($this->test_to_run as $name=>$runnable) { if(!preg_match("/\.phpt$/", $name)) continue; @@ -891,10 +891,10 @@ class testHarness { $this->writemsg("No tests were run.\n"); return; } - + $n_total = count($this->test_results); $n_total += $this->ignored_by_ext; - + $sum_results = array('PASSED'=>0, 'SKIPPED'=>0, 'FAILED'=>0); foreach ($this->test_results as $v) { $sum_results[$v]++; @@ -904,7 +904,7 @@ class testHarness { foreach ($sum_results as $v => $n) { $percent_results[$v] = (100.0 * $n) / $n_total; } - + $this->writemsg("\n".$this->ddash."\n". "TIME END " . date('Y-m-d H:i:s', $this->end_time) . "\n". $this->ddash."\n". @@ -920,7 +920,7 @@ class testHarness { $this->sdash."\n". "Time taken : " . sprintf("%4d seconds", $this->end_time - $this->start_time) . "\n". $this->ddash."\n"); - + $failed_test_summary = ''; if ($this->failed_tests) { $failed_test_summary .= "\n".$this->ddash."\n". @@ -930,7 +930,7 @@ class testHarness { } $failed_test_summary .= $this->ddash."\n"; } - + if ($failed_test_summary && !$this->conf['NO_PHPTEST_SUMMARY']) { $this->writemsg($failed_test_summary); } @@ -944,9 +944,9 @@ class testHarness { flush(); $user_input = fgets($fp, 10); $just_save_results = (strtolower($user_input[0]) == 's'); - + if ($just_save_results || strlen(trim($user_input)) == 0 || strtolower($user_input[0]) == 'y') { - /* + /* * Collect information about the host system for our report * Fetch phpinfo() output so that we can see the PHP environment * Make an archive of all the failed tests @@ -961,12 +961,12 @@ class testHarness { $user_email = trim(fgets($fp, 1024)); $user_email = str_replace("@", " at ", str_replace(".", " dot ", $user_email)); } - + $failed_tests_data = ''; $sep = "\n" . str_repeat('=', 80) . "\n"; - + $failed_tests_data .= $failed_test_summary . "\n"; - + if (array_sum($this->failed_tests)) { foreach ($this->failed_tests as $test_info) { $failed_tests_data .= $sep . $test_info['name']; @@ -978,7 +978,7 @@ class testHarness { } else { $status = "success"; } - + $failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep; $failed_tests_data .= "OS:\n". PHP_OS. "\n\n"; $automake = $autoconf = $libtool = $compiler = 'N/A'; @@ -999,7 +999,7 @@ class testHarness { } } } - + $failed_tests_data .= "Automake:\n$automake\n"; $failed_tests_data .= "Autoconf:\n$autoconf\n"; $failed_tests_data .= "Libtool:\n$libtool\n"; @@ -1013,7 +1013,7 @@ class testHarness { $failed_tests_data .= $sep . "PHPINFO" . $sep; $failed_tests_data .= shell_exec($this->conf['TEST_PHP_EXECUTABLE'].' -dhtml_errors=0 -i'); - + $compression = 0; if ($just_save_results || @@ -1022,7 +1022,7 @@ class testHarness { $fp = fopen($output_file, "w"); fwrite($fp, $failed_tests_data); fclose($fp); - + if (!$just_save_results) echo "\nThe test script was unable to automatically send the report to PHP's QA Team\n"; echo "Please send ".$output_file." to ".PHP_QA_EMAIL." manually, thank you.\n"; @@ -1032,7 +1032,7 @@ class testHarness { } } } - + if($this->conf['REPORT_EXIT_STATUS'] and $sum_results['FAILED']) { exit(1); } @@ -1041,7 +1041,7 @@ class testHarness { function getINISettings(&$section_text) { $ini_settings = $this->ini_overwrites; - // Any special ini settings + // Any special ini settings // these may overwrite the test defaults... if (array_key_exists('INI', $section_text)) { settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); @@ -1090,11 +1090,11 @@ class testHarness { // eval fails if no newline return eval("$data\n"); } - + function getENVSettings(&$section_text,$testfile) { $env = $this->env; - // Any special environment settings + // Any special environment settings // these may overwrite the test defaults... if (array_key_exists('ENV', $section_text)) { $sect = $this->evalSettings($testfile,$section_text['ENV']); @@ -1107,7 +1107,7 @@ class testHarness { function getEvalTestSettings($section_text,$testfile) { $rq = array(); - // Any special environment settings + // Any special environment settings // these may overwrite the test defaults... if ($section_text) { $sect = $this->evalSettings($testfile,$section_text); @@ -1116,7 +1116,7 @@ class testHarness { } return $rq; } - + // // Load the sections of the test file. // @@ -1131,10 +1131,10 @@ class testHarness { '_FILE' => $file, '_DIR' => realpath(dirname($file)), ); - + $fp = @fopen($file, "r") or $this->error("Cannot open test file: $file"); - + $section = ''; while (!feof($fp)) { $line = fgets($fp); @@ -1144,7 +1144,7 @@ class testHarness { $section_text[$section] = ''; continue; } - + // Add to the section text. $section_text[$section] .= $line; } @@ -1199,7 +1199,7 @@ class testHarness { if ($this->conf['TEST_PHP_DETAILED'] > 2) print "SKIPIF: [$output]\n"; if (preg_match("/^skip/i", $output)){ - + $reason = (preg_match("/^skip\s*(.+)\$/", $output)) ? preg_replace("/^skip\s*(.+)\$/", "\\1", $output) : FALSE; $this->showstatus($section_text['TEST'], 'SKIPPED', $reason); return 'SKIPPED'; @@ -1221,15 +1221,15 @@ class testHarness { { if ($this->conf['TEST_PHP_DETAILED']) $this->writemsg("\n=================\nTEST $file\n"); - + $section_text = $this->getSectionText($file); - + if ($this->iswin32) $shortname = str_replace($this->conf['TEST_BASE_PATH'].'\\', '', $file); else $shortname = str_replace($this->conf['TEST_BASE_PATH'].'/', '', $file); $tested = $section_text['TEST']." [$shortname]"; - + if ($this->conf['TEST_WEB']) { $tmp_file = preg_replace('/\.phpt$/','.'.$this->conf['TEST_WEB_EXT'],$file); $uri = $this->conf['TEST_BASE_SCRIPT_NAME'].str_replace($this->conf['TEST_BASE_PATH'], '', $tmp_file); @@ -1238,19 +1238,19 @@ class testHarness { $tmp_file = preg_replace('/\.phpt$/','.php',$file); } @unlink($tmp_file); - - // unlink old test results + + // unlink old test results @unlink(preg_replace('/\.phpt$/','.diff',$file)); @unlink(preg_replace('/\.phpt$/','.log',$file)); @unlink(preg_replace('/\.phpt$/','.exp',$file)); @unlink(preg_replace('/\.phpt$/','.out',$file)); - + if (!$this->conf['TEST_WEB']) { // Reset environment from any previous test. $env = $this->getENVSettings($section_text,$tmp_file); $ini_overwrites = $this->getINIParams($section_text); } - + // if this is a cgi test, prepare for it $query_string = ''; $havepost = array_key_exists('POST', $section_text) && !empty($section_text['POST']); @@ -1276,7 +1276,7 @@ class testHarness { $method = isset($request['method'])?$request['method']:$havepost?'POST':'GET'; $query_string = $haveget?$section_text['GET']:''; - + $options = array(); $options['method']=$method; if (isset($this->conf['timeout'])) $options['timeout'] = $this->conf['timeout']; @@ -1284,7 +1284,7 @@ class testHarness { if (isset($this->conf['proxy_port'])) $options['proxy_port'] = $this->conf['proxy_port']; if (isset($this->conf['proxy_user'])) $options['proxy_user'] = $this->conf['proxy_user']; if (isset($this->conf['proxy_pass'])) $options['proxy_pass'] = $this->conf['proxy_pass']; - + $post = $havepost?$section_text['POST']:NULL; $url = $this->conf['TEST_SERVER_URL']; if (isset($request['SCRIPT_NAME'])) @@ -1303,7 +1303,7 @@ class testHarness { $this->writemsg("\nURL = $url\n"); } else if ($do_cgi) { $query_string = $haveget?$section_text['GET']:''; - + if (!array_key_exists('GATEWAY_INTERFACE', $env)) $env['GATEWAY_INTERFACE']='CGI/1.1'; if (!array_key_exists('SERVER_SOFTWARE', $env)) @@ -1327,7 +1327,7 @@ class testHarness { $env['SCRIPT_NAME']=''; if (!array_key_exists('SCRIPT_FILENAME', $env)) $env['SCRIPT_FILENAME']=''; - + if (array_key_exists('POST', $section_text) && (!$haveget || !empty($section_text['POST']))) { $post = $section_text['POST']; $content_length = strlen($post); @@ -1346,14 +1346,14 @@ class testHarness { $env['CONTENT_LENGTH']=''; } if ($this->conf['TEST_PHP_DETAILED'] > 1) - $this->writemsg("\nCONTENT_LENGTH = " . $env['CONTENT_LENGTH'] . - "\nCONTENT_TYPE = " . $env['CONTENT_TYPE'] . - "\nPATH_TRANSLATED = " . $env['PATH_TRANSLATED'] . - "\nPATH_INFO = " . $env['PATH_INFO'] . - "\nQUERY_STRING = " . $env['QUERY_STRING'] . - "\nREDIRECT_STATUS = " . $env['REDIRECT_STATUS'] . - "\nREQUEST_METHOD = " . $env['REQUEST_METHOD'] . - "\nSCRIPT_NAME = " . $env['SCRIPT_NAME'] . + $this->writemsg("\nCONTENT_LENGTH = " . $env['CONTENT_LENGTH'] . + "\nCONTENT_TYPE = " . $env['CONTENT_TYPE'] . + "\nPATH_TRANSLATED = " . $env['PATH_TRANSLATED'] . + "\nPATH_INFO = " . $env['PATH_INFO'] . + "\nQUERY_STRING = " . $env['QUERY_STRING'] . + "\nREDIRECT_STATUS = " . $env['REDIRECT_STATUS'] . + "\nREQUEST_METHOD = " . $env['REQUEST_METHOD'] . + "\nSCRIPT_NAME = " . $env['SCRIPT_NAME'] . "\nSCRIPT_FILENAME = " . $env['SCRIPT_FILENAME'] . "\n"); /* not cgi spec to put query string on command line, but used by a couple tests to catch a security hole @@ -1390,14 +1390,14 @@ class testHarness { } } } - + if ($this->conf['TEST_PHP_DETAILED'] > 2) { echo "HEADERS: "; print_r($headers); echo "OUTPUT: \n$out\n"; - + } - + // Does the output match what is expected? $output = trim($out); $output = preg_replace('/\r\n/',"\n",$output); @@ -1473,7 +1473,7 @@ class testHarness { $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $wanted_re); $wanted_re = str_replace('%c', '.', $wanted_re); // %f allows two points "-.0.0" but that is the best *simple* expression - + } /* DEBUG YOUR REGEX HERE var_dump($wanted_re); @@ -1482,7 +1482,7 @@ class testHarness { */ $failed = !preg_match("/^$wanted_re\$/s", $output); } - + $skipexpect = false; if (!$failed && $this->conf['TEST_WEB'] && isset($section_text['EXPECTHEADERS'])) { $want = array(); @@ -1502,7 +1502,7 @@ class testHarness { $failed = TRUE; } } - + // different servers may do different things on non-200 results // for instance, IIS will deliver it's own error pages, so we // cannot expect to match up the EXPECT section. We may however, @@ -1510,50 +1510,50 @@ class testHarness { // need to change later. $skipexpect = isset($headers['Status']) && $headers['Status'] != 200; } - + if (!$failed && !$skipexpect && isset($section_text['EXPECT'])) { $wanted = $section_text['EXPECT']; $wanted = preg_replace('/\r\n/',"\n",$wanted); $failed = (0 != strcmp($output,$wanted)); } - + if (!$failed) { @unlink($tmp_file); $this->showstatus($tested, 'PASSED'); return 'PASSED'; } - + // Test failed so we need to report details. $this->showstatus($tested, 'FAILED'); - + $this->failed_tests[] = array( 'name' => $file, 'test_name' => $tested, 'output' => preg_replace('/\.phpt$/','.log', $file), 'diff' => preg_replace('/\.phpt$/','.diff', $file) ); - + if ($this->conf['TEST_PHP_DETAILED']) $this->writemsg(generate_diff($wanted,$output)."\n"); - + // write .exp if (strpos($this->conf['TEST_PHP_LOG_FORMAT'],'E') !== FALSE) { $logname = preg_replace('/\.phpt$/','.exp',$file); file_put_contents($logname,$wanted); } - + // write .out if (strpos($this->conf['TEST_PHP_LOG_FORMAT'],'O') !== FALSE) { $logname = preg_replace('/\.phpt$/','.out',$file); file_put_contents($logname,$output); } - + // write .diff if (strpos($this->conf['TEST_PHP_LOG_FORMAT'],'D') !== FALSE) { $logname = preg_replace('/\.phpt$/','.diff',$file); file_put_contents($logname,generate_diff($wanted,$output)); } - + // write .log if (strpos($this->conf['TEST_PHP_LOG_FORMAT'],'L') !== FALSE) { $logname = preg_replace('/\.phpt$/','.log',$file); @@ -1572,7 +1572,7 @@ class testHarness { // // Write an error in a format recognizable to Emacs or MSVC. // - function error_report($testname,$logname,$tested) + function error_report($testname,$logname,$tested) { $testname = realpath($testname); $logname = realpath($logname); diff --git a/tests/classes/constants_basic_003.inc b/tests/classes/constants_basic_003.inc index 5eb9065b82..17e067b534 100644 --- a/tests/classes/constants_basic_003.inc +++ b/tests/classes/constants_basic_003.inc @@ -1,5 +1,5 @@ <?php class A { - const MY_CONST = "hello from A"; + const MY_CONST = "hello from A"; } ?> diff --git a/tests/classes/interface_optional_arg_003.inc b/tests/classes/interface_optional_arg_003.inc index 27b3350da0..be2a69a4c6 100644 --- a/tests/classes/interface_optional_arg_003.inc +++ b/tests/classes/interface_optional_arg_003.inc @@ -1,4 +1,4 @@ -<?php +<?php interface I { function f($a = null); } diff --git a/tests/lang/015.inc b/tests/lang/015.inc index d436a7bb14..fae56c4810 100644 --- a/tests/lang/015.inc +++ b/tests/lang/015.inc @@ -1,3 +1,3 @@ -<?php +<?php echo "Hello"; ?> diff --git a/tests/lang/016.inc b/tests/lang/016.inc index b73333f7b0..56aa85d65b 100644 --- a/tests/lang/016.inc +++ b/tests/lang/016.inc @@ -1,4 +1,4 @@ -<?php +<?php function MyFunc ($a) { echo $a; } diff --git a/tests/lang/023-1.inc b/tests/lang/023-1.inc index 8d52e844c9..153f5d7668 100644 --- a/tests/lang/023-1.inc +++ b/tests/lang/023-1.inc @@ -10,11 +10,11 @@ ?> *** Testing assignments and variable aliasing: ***<br> -<?php +<?php /* This test tests assignments to variables using other variables as variable-names */ - $a = "b"; - $$a = "test"; - $$$a = "blah"; + $a = "b"; + $$a = "test"; + $$$a = "blah"; ${$$$a}["associative arrays work too"] = "this is nifty"; ?> This should read "blah": <?php echo "$test<br>\n"; ?> @@ -22,7 +22,7 @@ This should read "this is nifty": <?php echo $blah[$test="associative arrays wor *************************************************<br> *** Testing integer operators ***<br> -<?php +<?php /* test just about any operator possible on $i and $j (ints) */ $i = 5; $j = 3; @@ -38,7 +38,7 @@ Correct result - 3: <?php echo $j%$i; ?><br> *********************************<br> *** Testing real operators ***<br> -<?php +<?php /* test just about any operator possible on $i and $j (floats) */ $i = 5.0; $j = 3.0; @@ -55,7 +55,7 @@ Correct result - 3: <?php echo $j%$i; ?><br> *** Testing if/elseif/else control ***<br> -<?php +<?php /* sick if/elseif/else test by Andi :) */ $a = 5; if ($a == "4") { @@ -90,7 +90,7 @@ if ($a == "4") { *** Seriously nested if's test ***<br> ** spelling correction by kluzz ** -<?php +<?php /* yet another sick if/elseif/else test by Zeev */ $i=$j=0; echo "Only two lines of text should follow:<br>\n"; @@ -98,7 +98,7 @@ if (0) { /* this code is not supposed to be executed */ echo "hmm, this shouldn't be displayed #1<br>\n"; $j++; if (1) { - $i + $i += $j; if (0) { @@ -128,7 +128,7 @@ if (0) { /* this code is not supposed to be executed */ } elseif (2-2) { /* as long as 2-2==0, this isn't supposed to be executed either */ $i = ++$j; echo "hmm, this shouldn't be displayed #2<br>\n"; - if (1) { + if (1) { $j = ++$i; if (0) { $j = $i*2+$j*($i++); @@ -182,7 +182,7 @@ if (0) { /* this code is not supposed to be executed */ ?> *** C-style else-if's ***<br> -<?php +<?php /* looks like without we even tried, C-style else-if structure works fine! */ if ($a=0) { echo "This shouldn't be displayed<br>\n"; @@ -199,7 +199,7 @@ if (0) { /* this code is not supposed to be executed */ *************************<br> *** WHILE tests ***<br> -<?php +<?php $i=0; $j=20; while ($i<(2*$j)) { @@ -217,7 +217,7 @@ while ($i<(2*$j)) { *** Nested WHILEs ***<br> -<?php +<?php $arr_len=3; $i=0; @@ -253,7 +253,7 @@ while ($i<$arr_len) { *********************<br> *** hash test... ***<br> -<?php +<?php /* $i=0; @@ -273,7 +273,7 @@ echo "commented out..."; **************************<br> *** Hash resizing test ***<br> -<?php +<?php $i = 10; $a = 'b'; while ($i > 0) { @@ -295,7 +295,7 @@ while ($i > 0) { *** break/continue test ***<br> -<?php +<?php $i=0; echo "\$i should go from 0 to 2<br>\n"; @@ -349,7 +349,7 @@ while ($i<5) { <?php include("023-2.inc"); ?> ********************************<br> -<?php +<?php { echo "Tests completed.<br>\n"; # testing some PHP style comment... } diff --git a/tests/lang/023-2.inc b/tests/lang/023-2.inc index 6dd1e730f1..a66030775d 100644 --- a/tests/lang/023-2.inc +++ b/tests/lang/023-2.inc @@ -1,5 +1,5 @@ <html> -This is Finish.phtml. This file is supposed to be included +This is Finish.phtml. This file is supposed to be included from regression_test.phtml. This is normal HTML. <?php echo "and this is PHP code, 2+2=".(2+2).""; ?> diff --git a/tests/quicktester.inc b/tests/quicktester.inc index 48ed6b549f..70cb115684 100644 --- a/tests/quicktester.inc +++ b/tests/quicktester.inc @@ -15,7 +15,7 @@ TESTS; Remember to NOT put a trailing ; after a line! */ -error_reporting(E_ALL); +error_reporting(E_ALL); $tests = explode("\n",$tests); $success = TRUE; foreach ($tests as $n=>$test) @@ -72,4 +72,4 @@ foreach ($tests as $n=>$test) } } if ($success) echo "OK"; - + diff --git a/tests/security/open_basedir.inc b/tests/security/open_basedir.inc index c5de8ca112..d229f8497f 100644 --- a/tests/security/open_basedir.inc +++ b/tests/security/open_basedir.inc @@ -3,7 +3,7 @@ // This file contains helper functions for testing open_basedir configuration // Care must be taken with where the directories are created because different // SAPIs set the working directory differently. So simply creating a directory -// relative to the current working directory like this: mkdir("blah") might +// relative to the current working directory like this: mkdir("blah") might // actually create it in several different places depending on the SAPI..! // // Note also depending on the version of php being tested, so the open_basedir @@ -26,7 +26,7 @@ function recursive_delete_directory($directory) { // Make sure the directory is valid if (is_dir($directory) == FALSE) { return FALSE; - } + } // Check we can access the directory if (is_readable($directory) == FALSE) { @@ -110,7 +110,7 @@ function test_open_basedir_array($function) { global $savedDirectory; test_open_basedir_before($function); - test_open_basedir_error($function); + test_open_basedir_error($function); var_dump(is_array($function("./../."))); var_dump(is_array($function("../ok"))); var_dump(is_array($function("ok.txt"))); @@ -124,7 +124,7 @@ function test_open_basedir_array($function) { function test_open_basedir($function) { global $savedDirectory; test_open_basedir_before($function); - test_open_basedir_error($function); + test_open_basedir_error($function); var_dump($function("./../.")); var_dump($function("../ok")); var_dump($function("ok.txt")); diff --git a/travis/ext/pgsql/setup.sh b/travis/ext/pgsql/setup.sh index 32b39a4044..ef13733edc 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash -echo ' +echo ' <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc" psql -c 'create database test;' -U postgres
\ No newline at end of file diff --git a/win32/build/Makefile b/win32/build/Makefile index 1412f8405d..68fa579b5f 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -74,14 +74,14 @@ Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_pars sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_parser.y $(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y - + !if $(RE2C) != "" Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l Zend\zend_language_scanner.c: Zend\zend_language_scanner.l $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l - + sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l !endif @@ -134,7 +134,7 @@ $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV): @for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL @if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL @cd "$(PHP_SRC_DIR)" - + clean-sapi: @echo Cleaning SAPI diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index 9d2f318c97..2fbbdad93c 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -56,17 +56,17 @@ function find_config_w32(dirname) var c, i, ok, n; var item = null; var re_dep_line = new RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\)", "gm"); - + for (; !fc.atEnd(); fc.moveNext()) { ok = true; /* check if we already picked up a module with the same dirname; * if we have, don't include it here */ n = FSO.GetFileName(fc.item()); - + if (n == '.svn' || n == 'tests') continue; - + // WScript.StdOut.WriteLine("checking " + dirname + "/" + n); if (MODULES.Exists(n)) { WScript.StdOut.WriteLine("Skipping " + dirname + "/" + n + " -- already have a module with that name"); diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 43b03626a4..4f7a463442 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -66,7 +66,7 @@ if (VS_TOOLSET && PHP_MP != 'disable') { if(PHP_DEBUG == 'yes') { STDOUT.WriteLine('WARNING: Debug builds cannot be built using multi processing'); } else { - // no from disable-all + // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { ADD_FLAG('CFLAGS', ' /MP '); PHP_MP_DISABLED = false; diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 5d9cd6efa6..812d28faf5 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -44,7 +44,7 @@ ARG_WITH('prefix', 'PHP installation prefix', PHP_PREFIX); ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto'); var PHP_MP_DISABLED = true; if (VS_TOOLSET && PHP_MP != 'disable') { - // no from disable-all + // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { ADD_FLAG('CFLAGS', ' /MP '); PHP_MP_DISABLED = false; diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1771297a54..b216659ebf 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -48,7 +48,7 @@ var PHP_TEST_INI_EXT_EXCLUDE = ""; var PHP_MAKEFILE_FRAGMENTS = PHP_SRC_DIR + "\\Makefile.fragments.w32"; -/* Care also about NTDDI_VERSION and _WIN32_WINNT in config.w32.h.in +/* Care also about NTDDI_VERSION and _WIN32_WINNT in config.w32.h.in and manifest. */ var WINVER = "0x0601"; /* 7/2008r2 */ @@ -122,7 +122,7 @@ var PHP_VERSION_STRING = "7.2.0"; function get_version_numbers() { var cin = file_get_contents("configure.ac"); - + if (cin.match(new RegExp("PHP_MAJOR_VERSION=(\\d+)"))) { PHP_VERSION = RegExp.$1; } @@ -224,7 +224,7 @@ function condense_path(path) /* on a different drive */ break; } - + return path; } @@ -239,7 +239,7 @@ function ConfigureArg(type, optname, helptext, defval) this.arg = "--" + type + "-" + optname; this.imparg = "--" + opptype + "-" + optname; } - + this.optname = optname; this.helptext = helptext; this.defval = defval; @@ -286,7 +286,7 @@ function word_wrap_and_indent(indent, text, line_suffix, indent_char) if (text == null) { return ""; } - + var words = text.split(new RegExp("\\s+", "g")); var i = 0; var ret_text = ""; @@ -306,7 +306,7 @@ function word_wrap_and_indent(indent, text, line_suffix, indent_char) for (i = 0; i < indent; i++) { space += indent_char; } - + for (i = 0; i < words.length; i++) { if (this_line.length) { t = this_line + " " + words[i]; @@ -345,7 +345,7 @@ function conf_process_args() var analyzed = false; var nice = "cscript /nologo configure.js "; var disable_all = false; - + args = WScript.Arguments; for (i = 0; i < args.length; i++) { arg = args(i); @@ -470,7 +470,7 @@ can be built that way. \ analyzed = analyze_arg(arg.defval); shared = analyzed[0]; argval = analyzed[1]; - + // Don't trust a default "yes" answer for a non-core module // in a snapshot build if (PHP_SNAPSHOT_BUILD != "no" && argval == "yes" && !shared) { @@ -499,7 +499,7 @@ can be built that way. \ } } } - + if (PHP_SNAPSHOT_BUILD != "no" && argval == "no") { force = true; for (j = 0; j < snapshot_build_exclusions.length; j++) { @@ -787,7 +787,7 @@ function CHECK_LIB(libnames, target, path_to_check, common_name) var i, j, k, libname; var location = false; var path = path_to_check.split(';'); - + for (i = 0; i < libnames.length; i++) { libname = libnames[i]; @@ -860,7 +860,7 @@ function OLD_CHECK_LIB(libnames, target, path_to_check) } else { target = "_" + target.toUpperCase(); } - + if (path_to_check == null) { path_to_check = php_usual_lib_suspects; } else { @@ -939,7 +939,7 @@ function CHECK_FUNC_IN_HEADER(header_name, func_name, path_to_check, add_to_flag return c; } STDOUT.WriteLine("No"); - return false; + return false; } function GREP_HEADER(header_name, regex, path_to_check) @@ -961,7 +961,7 @@ function GREP_HEADER(header_name, regex, path_to_check) if (typeof(p) == "string") { c = file_get_contents(p); } - } + } if (!c) { return false; } @@ -981,7 +981,7 @@ function GREP_HEADER(header_name, regex, path_to_check) function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env, add_dir_part, add_to_flag_only) { var dir_part_to_add = ""; - + if (use_env == null) { use_env = true; } @@ -999,7 +999,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env } else { path_to_check += ";" + php_usual_include_suspects; } - + var p = search_paths(header_name, path_to_check, use_env ? "INCLUDE" : null); var have = 0; var sym; @@ -1016,7 +1016,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env if (typeof(p) == "string" && add_dir_part) { ADD_FLAG(flag_name, '/I "' + p + dir_part_to_add + '" '); } - } + } have = p ? 1 : 0 sym = header_name.toUpperCase(); @@ -1136,15 +1136,15 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": $(PHP_DIR)\\build\\template.rc"); MFO.WriteLine("\t$(RC) /nologo $(BASE_INCLUDES) /I $(PHP_DIR)/include /n /fo $(BUILD_DIR)\\" + resname + logo + debug + ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' - + makefiletarget + '\\"" /d URL="\\"' + project_url + - '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + + + makefiletarget + '\\"" /d URL="\\"' + project_url + + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" $(PHP_DIR)\\build\\template.rc'); } else { MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": win32\\build\\template.rc"); MFO.WriteLine("\t$(RC) /nologo $(BASE_INCLUDES) /n /fo $(BUILD_DIR)\\" + resname + logo + debug + ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' - + makefiletarget + '\\"" /d URL="\\"' + project_url + - '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + + + makefiletarget + '\\"" /d URL="\\"' + project_url + + '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" win32\\build\\template.rc'); } MFO.WriteBlankLines(1); @@ -1204,7 +1204,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir) resname = generate_version_info_resource(makefiletarget, sapiname, configure_module_dirname, true); manifest_name = generate_version_info_manifest(makefiletarget); - + MFO.WriteLine(makefiletarget + ": $(BUILD_DIR)\\" + makefiletarget); MFO.WriteLine("\t@echo SAPI " + sapiname_for_printing + " build complete"); if (MODE_PHPIZE) { @@ -1224,7 +1224,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir) ldflags = "$(LDFLAGS)"; manifest = "-@$(_VC_MANIFEST_EMBED_EXE)"; } - + if (PHP_SANITIZER == "yes") { if (CLANG_TOOLSET) { add_asan_opts("CFLAGS_" + SAPI, "LIBS_" + SAPI, (is_lib ? "ARFLAGS_" : "LDFLAGS_") + SAPI); @@ -1264,7 +1264,7 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir) if (manifest) { MFO.WriteLine("\t" + manifest); } - + DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')'); if (configure_module_dirname.match("pecl")) { @@ -1284,7 +1284,7 @@ function ADD_DIST_FILE(filename) } else { ADD_FLAG("PHP_EXTRA_DIST_FILES", filename); } -} +} function file_get_contents(filename) { @@ -1387,7 +1387,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) if (force_all_shared()) { shared = true; eval("PHP_" + EXT + "_SHARED = true;"); - } else { + } else { eval("shared = PHP_" + EXT + "_SHARED;"); } } else { @@ -1417,7 +1417,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) MFO.WriteBlankLines(1); ADD_SOURCES(configure_module_dirname, file_list, extname, obj_dir); - + MFO.WriteBlankLines(1); if (shared) { @@ -1465,7 +1465,7 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) MFO.WriteLine(dllname + ": $(BUILD_DIR)\\" + dllname); MFO.WriteLine("\t@echo EXT " + extname + " build complete"); MFO.WriteBlankLines(1); - + DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_' + EXT + ')'); } else { ADD_FLAG("STATIC_EXT_OBJS", "$(" + EXT + "_GLOBAL_OBJS)"); @@ -1502,9 +1502,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) } } } - + extension_module_ptrs += '\tphpext_' + extname + '_ptr,\r\n'; - + DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')'); } if (MODE_PHPIZE) { @@ -1569,7 +1569,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) var _tmp = src.split("\\"); var filename = _tmp.pop(); - + // build the obj out dir and use it as a key var dirname = _tmp.join("\\"); @@ -1595,7 +1595,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) var build_dir = (dirname ? obj_dir + "\\" + dirname : obj_dir).replace(new RegExp("^..\\\\"), ""); } - obj = sub_build + build_dir + "\\" + filename.replace(re, ".obj"); + obj = sub_build + build_dir + "\\" + filename.replace(re, ".obj"); if (i > 0) { srcs_line += " " + dir + "\\" + src; @@ -1610,7 +1610,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) if (!srcs_by_dir.hasOwnProperty(build_dir)) { srcs_by_dir[build_dir] = []; - } + } /* storing the index from the file_list */ srcs_by_dir[build_dir].push(i); @@ -1640,7 +1640,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) if (PHP_ANALYZER == "clang") { var analyzer_base_args = X64 ? "-m64" : "-m32"; var analyzer_base_flags = ""; - + analyzer_base_args += " --analyze"; var vc_ver; @@ -1660,7 +1660,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) } else { analyzer_base_flags += " -D _MSC_VER=" + probe_binary(PATH_PROG('cl', null)); } - + if (X64) { analyzer_base_flags += " -D _M_X64 -D _WIN64"; } else { @@ -1681,7 +1681,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) "--library=win32\\build\\cppcheck.cfg " + "--library=" + cppcheck_lib + " " + /* "--rule-file=win32\build\cppcheck_rules.xml " + */ - " --std=c89 --std=c++11 " + + " --std=c89 --std=c++11 " + "--quiet --inconclusive --template=vs -j 4 "; var cppcheck_build_dir = get_define("CPPCHECK_BUILD_DIR"); @@ -1701,9 +1701,9 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) MFO.WriteLine("\t@$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + d + obj); if ("clang" == PHP_ANALYZER) { - MFO.WriteLine("\t@\"$(CLANG_CL)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + dir + "\\" + src); + MFO.WriteLine("\t@\"$(CLANG_CL)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + dir + "\\" + src); } else if ("cppcheck" == PHP_ANALYZER) { - MFO.WriteLine("\t\"@$(CPPCHECK)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + analyzer_base_flags + " " + dir + "\\" + src); + MFO.WriteLine("\t\"@$(CPPCHECK)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + analyzer_base_flags + " " + dir + "\\" + src); }else if (PHP_ANALYZER == "pvs") { MFO.WriteLine("\t@\"$(PVS_STUDIO)\" --cl-params $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " --source-file " + dir + "\\" + src + " --cfg PVS-Studio.conf --errors-off \"V122 V117 V111\" "); @@ -1728,8 +1728,8 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) DEFINE(sym, tv); - /* Generate the object response file and define it to the Makefile. This can be - useful when getting the "command line too long" linker errors. + /* Generate the object response file and define it to the Makefile. This can be + useful when getting the "command line too long" linker errors. TODO pack this into a function when response files are used for other kinds of info. */ var obj_lst_fh = null; if (!FSO.FileExists(obj_lst_fn)) { @@ -1773,11 +1773,11 @@ function generate_internal_functions() var indata; STDOUT.WriteLine("Generating main/internal_functions.c"); - + infile = FSO.OpenTextFile("main/internal_functions.c.in", 1); indata = infile.ReadAll(); infile.Close(); - + indata = indata.replace("@EXT_INCLUDE_CODE@", extension_include_code); indata = indata.replace("@EXT_MODULE_PTRS@", extension_module_ptrs); @@ -1953,7 +1953,7 @@ function generate_tmp_php_ini() if ("shared" != extensions_enabled[i][1]) { continue; } - + var directive = "extension"; if ("opcache" == extensions_enabled[i][0] || "xdebug" == extensions_enabled[i][0]) { directive = "zend_extension"; @@ -2172,11 +2172,11 @@ function generate_config_h() prefix = PHP_PREFIX.replace(new RegExp("\\\\", "g"), "\\\\"); STDOUT.WriteLine("Generating main/config.w32.h"); - + infile = FSO.OpenTextFile("win32/build/config.w32.h.in", 1); indata = infile.ReadAll(); infile.Close(); - + outfile = FSO.CreateTextFile("main/config.w32.h", true); indata = indata.replace(new RegExp("@PREFIX@", "g"), prefix); @@ -2218,7 +2218,7 @@ function generate_config_h() pieces += '" "'; } } - + outfile.WriteLine("#define " + keys[i] + " " + pieces); } @@ -2229,7 +2229,7 @@ function generate_config_h() outfile.WriteLine("#define HAVE_ATANH 1"); } - + outfile.Close(); } @@ -2245,7 +2245,7 @@ function generate_phpize() var MF = FSO.CreateTextFile(dest + "/phpize.js", true); var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true); - + prefix = get_define("PHP_PREFIX"); prefix = prefix.replace(new RegExp("/", "g"), "\\"); prefix = prefix.replace(new RegExp("\\\\", "g"), "\\\\"); @@ -2367,7 +2367,7 @@ function handle_analyzer_makefile_flags(fd, key, val) } val = new_val; - if ("clang" == PHP_ANALYZER) { + if ("clang" == PHP_ANALYZER) { val = val.replace(/\/FD /, "") .replace(/\/Fp.+? /, "") .replace(/\/Fo.+? /, "") @@ -2432,7 +2432,7 @@ function generate_makefile() /* \s+\/ eliminates extra whitespace caused when using \ for string continuation, whereby \/ is the start of the next compiler switch */ var val = trim(configure_subst.Item(keys[i])).replace(/\s+\//gm, " /"); - + MF.WriteLine(keys[i] + "=" + val + " "); MF.WriteBlankLines(1); @@ -2460,7 +2460,7 @@ function generate_makefile() MF.WriteLine(" @for %D in ($(INSTALL_HEADERS_DIR)) do @if not exist $(BUILD_DIR_DEV)\\include\\%D mkdir $(BUILD_DIR_DEV)\\include\\%D >nul"); for (i in headers_install) { if (headers_install[i][2] != "") { - MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + " mkdir $(BUILD_DIR_DEV)\\include\\" + + MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + " mkdir $(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + ">nul"); MF.WriteLine(" @copy " + headers_install[i][0] + " " + "$(BUILD_DIR_DEV)\\include\\" + headers_install[i][2] + " /y >nul"); } @@ -2538,7 +2538,7 @@ function generate_makefile() FSO.DeleteFile(PHP_MAKEFILE_FRAGMENTS, true); } - MF.Close(); + MF.Close(); } function ADD_FLAG(name, flags, target) @@ -2553,7 +2553,7 @@ function ADD_FLAG(name, flags, target) /* Prefix with a space, thus making sure the current flag is not a substring of some other. It's still not a complete check if - some flags with spaces got added. + some flags with spaces got added. TODO rework to use an array, so direct match can be done. This will also @@ -2562,7 +2562,7 @@ function ADD_FLAG(name, flags, target) if (curr_flags.indexOf(" " + flags) >= 0 || curr_flags.indexOf(flags + " ") >= 0) { return; } - + flags = curr_flags + " " + flags; configure_subst.Remove(name); } @@ -2639,7 +2639,7 @@ function copy_and_subst(srcname, destname, subst_array) content = content.replace(re, rep); } - + var f = FSO.CreateTextFile(destname, true); f.Write(content); f.Close(); @@ -2660,14 +2660,14 @@ function glob(path_pattern) if (FSO.FileExists(path_pattern)) { return new Array(path_pattern); } - + // first, build as much as possible that doesn't have a pattern for (p = 0; p < path_parts.length; p++) { if (path_parts[p].match(is_pat_re)) break; if (p) base += "\\"; - base += path_parts[p]; + base += path_parts[p]; } return _inner_glob(base, p, path_parts); @@ -3030,7 +3030,7 @@ function toolset_is_64() return null != full.match(/x86_64/);*/ /* Even executed within an environment setup with vcvars32.bat, - clang-cl doesn't recognize the arch toolset. But as it needs + clang-cl doesn't recognize the arch toolset. But as it needs the VS environment, checking the arch of cl.exe is correct. */ return probe_binary(PATH_PROG('cl', null), 64); } else if (ICC_TOOLSET) { diff --git a/win32/build/default.manifest b/win32/build/default.manifest index 8c394ca649..aa5da5c4d0 100644 --- a/win32/build/default.manifest +++ b/win32/build/default.manifest @@ -7,8 +7,8 @@ </requestedPrivileges> </security> </trustInfo> - <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> - <application> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> <!-- Windows 7 --> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- Windows 8 --> @@ -17,7 +17,7 @@ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- Windows 10 --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> - </application> + </application> </compatibility> <application xmlns="urn:schemas-microsoft-com:asm.v3"> <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index f4969442b7..7a39bea02b 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -74,13 +74,13 @@ function get_depends($module) "api-ms-win-crt-.+\.dll", ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; - + $bd = strtolower(realpath($build_dir)); $is_pecl = in_array($module, $pecl_targets); - + $cmd = "$GLOBALS[build_dir]\\deplister.exe \"$module\" \"$GLOBALS[build_dir]\""; - $proc = proc_open($cmd, + $proc = proc_open($cmd, array(1 => array("pipe", "w")), $pipes); @@ -112,7 +112,7 @@ function get_depends($module) continue; } } - + if ($is_pecl) { if (!in_array($dep, $pecl_dll_deps)) { $pecl_dll_deps[] = $dep; @@ -209,7 +209,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ $hdr['size'] = octdec(trim($hdr['size'])); echo "File: $hdr[filename] $hdr[size]\n"; - + if ($filename == $hdr['filename']) { echo "Found the file we want\n"; $dest = fopen($destfilename, 'wb'); @@ -218,14 +218,14 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ echo "Wrote $x bytes into $destfilename\n"; break; } - + /* skip body of the file */ $size = 512 * ceil((int)$hdr['size'] / 512); echo "Skipping $size bytes\n"; gzseek($fp, gztell($fp) + $size); - + } while (!$done); - + } /* }}} */ @@ -333,9 +333,9 @@ foreach ($extra_dll_deps as $dll) { } /* TODO: -add sanity check and test if all required DLLs are present, per version +add sanity check and test if all required DLLs are present, per version This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD). -Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard +Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard deps. For example, libenchant.dll loads libenchant_myspell.dll or libenchant_ispell.dll */ @@ -457,7 +457,7 @@ function copy_test_dir($directory, $dest) } } - closedir($directory_list); + closedir($directory_list); } function make_phar_dot_phar($dist_dir) @@ -543,7 +543,7 @@ if (!$use_pear_template) { extract_file_from_tarball('Archive_Tar', 'Archive/Tar.php', "$dist_dir/PEAR/go-pear-bundle"); extract_file_from_tarball('Console_Getopt', 'Console/Getopt.php', "$dist_dir/PEAR/go-pear-bundle"); } - + /* add extras from the template dir */ if (file_exists($snapshot_template)) { $items = glob("$snapshot_template/*"); @@ -573,7 +573,7 @@ if (file_exists($snapshot_template)) { } } } - + /* copy c++ runtime */ $items = glob("$snapshot_template/dlls/*.CRT"); diff --git a/win32/codepage.c b/win32/codepage.c index 8823219184..25cd4d786f 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -96,7 +96,7 @@ PW32CP wchar_t *php_win32_cp_conv_to_w(DWORD cp, DWORD flags, const char* in, si PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size_t *out_len) {/*{{{*/ wchar_t *ret = NULL; - const char *idx = in, *end; + const char *idx = in, *end; assert(in && in_len ? in[in_len] == '\0' : 1); @@ -385,7 +385,7 @@ PW32CP wchar_t *php_win32_cp_env_any_to_w(const char* env) } while (NULL != (cur = strchr(prev, '\0')) && cur++ && *cur && bin_len + (cur - prev) < 32760); - envw = (wchar_t *) malloc((bin_len + 3) * sizeof(wchar_t)); + envw = (wchar_t *) malloc((bin_len + 3) * sizeof(wchar_t)); if (!envw) { SET_ERRNO_FROM_WIN32_CODE(ERROR_OUTOFMEMORY); return NULL; @@ -524,7 +524,7 @@ PW32CP const struct php_win32_cp *php_win32_cp_cli_do_restore(DWORD id) /* {{{ proto bool sapi_windows_cp_set(int cp) * Set process codepage. */ -PHP_FUNCTION(sapi_windows_cp_set) +PHP_FUNCTION(sapi_windows_cp_set) { zend_long id; const struct php_win32_cp *cp; @@ -605,12 +605,12 @@ PHP_FUNCTION(sapi_windows_cp_conv) php_error_docref(NULL, E_WARNING, "String is too long"); RETURN_NULL(); } - + if (IS_LONG == Z_TYPE_P(z_in_cp)) { if (ZEND_LONG_UINT_OVFL(Z_LVAL_P(z_in_cp))) { php_error_docref(NULL, E_WARNING, "Argument %d is out of range", Z_LVAL_P(z_in_cp)); RETURN_NULL(); - } + } in_cp = php_win32_cp_get_by_id((DWORD)Z_LVAL_P(z_in_cp)); if (!in_cp) { @@ -631,7 +631,7 @@ PHP_FUNCTION(sapi_windows_cp_conv) if (ZEND_LONG_UINT_OVFL(Z_LVAL_P(z_out_cp))) { php_error_docref(NULL, E_WARNING, "Argument %d is out of range", Z_LVAL_P(z_out_cp)); RETURN_NULL(); - } + } out_cp = php_win32_cp_get_by_id((DWORD)Z_LVAL_P(z_out_cp)); if (!out_cp) { diff --git a/win32/codepage.h b/win32/codepage.h index 9cfe3cd80b..cf3d72e39b 100644 --- a/win32/codepage.h +++ b/win32/codepage.h @@ -84,8 +84,8 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t if (php_win32_cp_use_unicode()) { /* First try the pure ascii conversion. This is the fastest way to do the - thing. Only applicable if the source string is UTF-8 in general. - While it could possibly be ok with European encodings, usage with + thing. Only applicable if the source string is UTF-8 in general. + While it could possibly be ok with European encodings, usage with Asian encodings can cause unintended side effects. Lookup the term "mojibake" if need more. */ ret = php_win32_cp_conv_ascii_to_w(in, in_len, out_len); @@ -97,7 +97,7 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t /* Still need this fallback with regard to possible broken data in the existing scripts. Broken data might be hardcoded in the user scripts, as UTF-8 settings was de facto ignored in - older PHP versions. The fallback can be removed later for + older PHP versions. The fallback can be removed later for the sake of purity, keep now for BC reasons. */ if (!ret) { const struct php_win32_cp *acp = php_win32_cp_get_by_id(GetACP()); diff --git a/win32/cp_enc_map_gen.c b/win32/cp_enc_map_gen.c index 243b1d2fbd..2010e0ca4c 100644 --- a/win32/cp_enc_map_gen.c +++ b/win32/cp_enc_map_gen.c @@ -165,7 +165,7 @@ static const struct cp cp_map[] = { { 65001, "utf-8", "UTF-8", "Unicode (UTF-8)" }, { 0, NULL, NULL }, }; - + diff --git a/win32/dllmain.c b/win32/dllmain.c index 2c52f54fb6..1c5ed48c97 100644 --- a/win32/dllmain.c +++ b/win32/dllmain.c @@ -42,11 +42,11 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy) case DLL_PROCESS_ATTACH: /* * We do not need to check the return value of php_win32_init_gettimeofday() - * because the symbol bare minimum symbol we need is always available on our + * because the symbol bare minimum symbol we need is always available on our * lowest supported platform. * * On Windows 8 or greater, we use a more precise symbol to obtain the system - * time, which is dynamically. The fallback allows us to proper support + * time, which is dynamically. The fallback allows us to proper support * Vista/7/Server 2003 R2/Server 2008/Server 2008 R2. * * Instead simply initialize the global in win32/time.c for gettimeofday() @@ -76,8 +76,8 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy) } #ifdef HAVE_LIBXML - /* This imply that only LIBXML_STATIC_FOR_DLL is supported ATM. - If that changes, this place will need some rework. + /* This imply that only LIBXML_STATIC_FOR_DLL is supported ATM. + If that changes, this place will need some rework. TODO Also this should be revisited as no initialization might be needed for TS build (libxml build with TLS support. */ diff --git a/win32/getrusage.c b/win32/getrusage.c index 809a5dd84b..4d5b8faf8d 100644 --- a/win32/getrusage.c +++ b/win32/getrusage.c @@ -21,8 +21,8 @@ #include "getrusage.h" /* - * Parts of this file is based on code from the OpenVSwitch project, that - * is released under the Apache 2.0 license and is copyright 2014 Nicira, Inc. + * Parts of this file is based on code from the OpenVSwitch project, that + * is released under the Apache 2.0 license and is copyright 2014 Nicira, Inc. * and have been modified to work with PHP. */ diff --git a/win32/getrusage.h b/win32/getrusage.h index dd4b50cf39..0bed8ba6f6 100644 --- a/win32/getrusage.h +++ b/win32/getrusage.h @@ -21,8 +21,8 @@ /* * Note - * - * RUSAGE_CHILDREN is not implemented, and the RUSAGE_THREAD will + * + * RUSAGE_CHILDREN is not implemented, and the RUSAGE_THREAD will * therefore instead be used instead to emulate the behavior. */ diff --git a/win32/install.txt b/win32/install.txt index 0b989e8fe9..283619d86a 100644 --- a/win32/install.txt +++ b/win32/install.txt @@ -237,8 +237,8 @@ c:\php Server modules provide significantly better performance and additional functionality compared to the CGI binary. The FastCGI is significantly more stable and can be faster than the ISAPI module with IIS. - The CLI version is designed to let you use PHP for command line - scripting. More information about CLI is available in the chapter + The CLI version is designed to let you use PHP for command line + scripting. More information about CLI is available in the chapter about using PHP from the command line. Warning @@ -268,8 +268,8 @@ c:\php The next step is to set up a valid configuration file for PHP, php.ini. There are two ini files distributed in the zip file, php.ini-development - and php.ini-production. We advise you to use php.ini-production, - because we optimized the default settings in this file for performance, + and php.ini-production. We advise you to use php.ini-production, + because we optimized the default settings in this file for performance, and security. Read this well documented file carefully because it has changes from php.ini-production that will drastically affect your setup. Some examples are display_errors being off and magic_quotes_gpc being off. @@ -670,8 +670,8 @@ AddType application/x-httpd-php .php PHPIniDir "C:/php" Note: Remember to substitute your actual path to PHP for the c:/php/ - in the above examples. Take care to use either - php5apache2.dll in your LoadModule directive and not php5apache.dll + in the above examples. Take care to use either + php5apache2.dll in your LoadModule directive and not php5apache.dll as the latter ones are designed to run with Apache 1.3.x. Note: If you want to use content negotiation, read related FAQ. @@ -969,8 +969,8 @@ extension_dir = C:\php\extensions extension=php_bz2.dll * Some of the extensions need extra DLLs to work. Couple of them can - be found in the distribution package, in in the main folder in PHP 5, - but some, for example Oracle (php_oci8.dll) require DLLs which are + be found in the distribution package, in in the main folder in PHP 5, + but some, for example Oracle (php_oci8.dll) require DLLs which are not bundled with the distribution package. * Some of these DLLs are not bundled with the PHP distribution. See each extensions documentation page for details. Also, read the @@ -1004,7 +1004,7 @@ extension=php_bz2.dll php_filepro.dll filePro functions Read-only access php_ftp.dll FTP functions php_gd2.dll GD library image functions GD2 - php_gettext.dll Gettext functions, requires libintl-1.dll, + php_gettext.dll Gettext functions, requires libintl-1.dll, iconv.dll (bundled). php_iconv.dll ICONV characterset conversion Requires: iconv.dll php_imap.dll IMAP POP3 and NNTP functions None @@ -1061,7 +1061,7 @@ Introduction to PECL Installations When building PHP modules, it's important to have known-good versions of the required tools (autoconf, automake, libtool, etc.) See the - SVN Instructions for details on the required tools, and required + SVN Instructions for details on the required tools, and required versions. __________________________________________________________________ @@ -1078,10 +1078,10 @@ Downloading PECL extensions PECL extensions that have releases listed on the PECL web site are available for download and installation using the pecl command. Specific revisions may also be specified. - * SVN + * SVN Most PECL extensions also reside in SVN. A web-based view may be seen at http://svn.php.net/pecl/. To download straight from SVN, - the following sequence of commands may be used. + the following sequence of commands may be used. $ svn co http://svn.php.net/repository/pecl/<extname>/trunk diff --git a/win32/ioutil.c b/win32/ioutil.c index 9a13c1cd6e..07dc70d917 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -38,7 +38,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. - */ + */ #include <assert.h> #include <stdlib.h> @@ -112,7 +112,7 @@ PW32IO BOOL php_win32_ioutil_posix_to_open_opts(int flags, mode_t mode, php_iout * be deleted even whilst it's open. */ /* opts->share = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; */ - /* XXX No UINX behavior Good to know it's doable. + /* XXX No UINX behavior Good to know it's doable. Not being done as this means a behavior change. Should be evaluated properly. */ opts->share = FILE_SHARE_READ | FILE_SHARE_WRITE; @@ -394,7 +394,7 @@ PW32IO int php_win32_ioutil_chdir_w(const wchar_t *path) {/*{{{*/ int ret = 0; DWORD err = 0; - + if (!SetCurrentDirectoryW(path)) { err = GetLastError(); ret = -1; @@ -408,7 +408,7 @@ PW32IO int php_win32_ioutil_rename_w(const wchar_t *oldname, const wchar_t *newn {/*{{{*/ int ret = 0; DWORD err = 0; - + PHP_WIN32_IOUTIL_CHECK_PATH_W(oldname, -1, 0) PHP_WIN32_IOUTIL_CHECK_PATH_W(newname, -1, 0) @@ -447,7 +447,7 @@ PW32IO wchar_t *php_win32_ioutil_getcwd_w(wchar_t *buf, size_t len) } buf = tmp_buf; } - + if (!GetCurrentDirectoryW(tmp_len, buf)) { err = GetLastError(); SET_ERRNO_FROM_WIN32_CODE(err); @@ -468,7 +468,7 @@ PW32IO size_t php_win32_ioutil_dirname(char *path, size_t len) if (len == 0) { return 0; } - + start = path; /* Don't really care about the path normalization, pure parsing here. */ @@ -628,7 +628,7 @@ PW32IO HANDLE php_win32_ioutil_findfirstfile_w(char *path, WIN32_FIND_DATA *data } ret = FindFirstFileW(pathw, data); - + if (INVALID_HANDLE_VALUE == ret && path) { ret = FindFirstFileA(path, data); } diff --git a/win32/ioutil.h b/win32/ioutil.h index 43b8859c87..1ce6cbbb7c 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -38,7 +38,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. - */ + */ #ifndef PHP_WIN32_IOUTIL_H #define PHP_WIN32_IOUTIL_H @@ -150,7 +150,7 @@ typedef enum { PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(wchar_t **buf, size_t len, size_t *new_len); #ifdef PHP_EXPORTS -/* This symbols are needed only for the DllMain, but should not be exported +/* This symbols are needed only for the DllMain, but should not be exported or be available when used with PHP binaries. */ BOOL php_win32_ioutil_init(void); #endif @@ -161,7 +161,7 @@ __forceinline static wchar_t *php_win32_ioutil_conv_any_to_w(const char* in, siz {/*{{{*/ wchar_t *mb, *ret; size_t mb_len; - + mb = php_win32_cp_conv_any_to_w(in, in_len, &mb_len); if (!mb) { return NULL; diff --git a/win32/nice.c b/win32/nice.c index 4988ba5549..993df0a041 100644 --- a/win32/nice.c +++ b/win32/nice.c @@ -22,7 +22,7 @@ /* * Basic Windows implementation for the nice() function. * - * This implementation uses SetPriorityClass() as a backend for defining + * This implementation uses SetPriorityClass() as a backend for defining * a process priority. * * The following values of inc, defines the value sent to SetPriorityClass(): @@ -44,19 +44,19 @@ * * These values tries to mimic that of the UNIX version of nice(). * - * This is applied to the main process, not per thread, although this could + * This is applied to the main process, not per thread, although this could * be implemented using SetThreadPriority() at one point. * * Note, the following priority classes are left out with intention: * * . REALTIME_PRIORITY_CLASS - * Realtime priority class requires special system permissions to set, and + * Realtime priority class requires special system permissions to set, and * can be dangerous in certain cases. * * . PROCESS_MODE_BACKGROUND_BEGIN * . PROCESS_MODE_BACKGROUND_END - * Process mode is not covered because it can easily forgotten to be changed - * back and can cause unforseen side effects that is hard to debug. Besides + * Process mode is not covered because it can easily forgotten to be changed + * back and can cause unforseen side effects that is hard to debug. Besides * that, these do generally not really fit into making a Windows somewhat * compatible nice() function. */ @@ -65,7 +65,7 @@ PHPAPI int nice(zend_long p) { DWORD dwFlag = NORMAL_PRIORITY_CLASS; - if (p < -9) { + if (p < -9) { dwFlag = HIGH_PRIORITY_CLASS; } else if (p < -4) { dwFlag = ABOVE_NORMAL_PRIORITY_CLASS; diff --git a/win32/readdir.c b/win32/readdir.c index 18e87d369d..f3d33e61d7 100644 --- a/win32/readdir.c +++ b/win32/readdir.c @@ -118,7 +118,7 @@ struct dirent *readdir(DIR *dp) memmove(dp->dent.d_name, _tmp, reclen + 1); free(_tmp); dp->dent.d_reclen = (unsigned short)reclen; - + dp->offset++; dp->dent.d_ino = 1; diff --git a/win32/time.h b/win32/time.h index 4fe00bc21e..07afae487a 100644 --- a/win32/time.h +++ b/win32/time.h @@ -55,7 +55,7 @@ PHPAPI int nanosleep( const struct timespec * rqtp, struct timespec * rmtp ); PHPAPI int usleep(unsigned int useconds); #ifdef PHP_EXPORTS -/* This symbols are needed only for the DllMain, but should not be exported +/* This symbols are needed only for the DllMain, but should not be exported or be available when used with PHP binaries. */ void php_win32_init_gettimeofday(void); #endif diff --git a/win32/winutil.c b/win32/winutil.c index 6e37ddfbfc..8cf5cbac0f 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -123,7 +123,7 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err) int eerrno; }; - static const struct code_to_errno_map errmap[] = + static const struct code_to_errno_map errmap[] = { /* 1 */ { ERROR_INVALID_FUNCTION , EINVAL } /* 2 */ , { ERROR_FILE_NOT_FOUND , ENOENT } |