No rows found
\n"); RETURN_LONG(0); } - + /* Start table tag */ if (ZEND_NUM_ARGS() == 1) { php_printf("| %s | ", result->values[i].name); } @@ -2332,14 +2332,14 @@ PHP_FUNCTION(odbc_result_all) php_printf("Not printable | "); 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("Not printable | "); + php_printf("Not printable | "); 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(""); 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(" |
|---|
* $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 e5ac8bab6d9..2c1f40dfe49 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 b0eba6cc69a..b5222f58053 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 deeaa417619..52f5a235073 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 9b8d348fbb6..0df7ee99335 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 aceab0d26b9..ad16fda6592 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 231c5bee202..4cf4b9ce653 100644
--- a/ext/posix/package.xml
+++ b/ext/posix/package.xml
@@ -12,12 +12,12 @@
-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.
PHP
diff --git a/ext/pspell/README b/ext/pspell/README
index 2e68a2cb9d3..58806289db4 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 0a00370fce5..d63df8bef93 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 00ce0a82721..f1096fbe817 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 e4033399654..da3fceaac77 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 b6a8babae8b..83f85eb66bc 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 ^ ^ ^[^hash_bits^]
ECHO.
- ECHO Where ^ is the session directory
+ ECHO Where ^ is the session directory
ECHO ^ 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 d8da991c6db..b313d8bb655 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 03fcbf66daf..bfca714e1a9 100644
--- a/ext/session/package.xml
+++ b/ext/session/package.xml
@@ -18,8 +18,8 @@
-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.
PHP
diff --git a/ext/session/tests/save_handler.inc b/ext/session/tests/save_handler.inc
index 4d5ac75d03f..15ad29029f6 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 c4970376b0d..1bb95b220e2 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
-
+
+ returns zero
+
diff --git a/ext/shmop/config.m4 b/ext/shmop/config.m4
index 6c1709d7152..4017982a540 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 669da64bcff..07c3edafcf8 100644
--- a/ext/shmop/package.xml
+++ b/ext/shmop/package.xml
@@ -18,7 +18,7 @@
Portable Shared Memory access
-
+
PHP
stable
diff --git a/ext/shmop/package2.xml b/ext/shmop/package2.xml
index a8b00f371c3..f5a20c86b80 100644
--- a/ext/shmop/package2.xml
+++ b/ext/shmop/package2.xml
@@ -26,7 +26,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
PHP
package.xml added to support installation using pear installer
-
+
diff --git a/ext/simplexml/README b/ext/simplexml/README
index bb9240d1036..406b3120022 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 ec1b2b2cc5f..cb0b8438524 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 909b4e652c4..413be72087d 100755
--- a/ext/simplexml/tests/sxe.xml
+++ b/ext/simplexml/tests/sxe.xml
@@ -14,4 +14,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/ext/simplexml/tests/sxe私はガラスを食べられます.xml b/ext/simplexml/tests/sxe私はガラスを食べられます.xml
index 909b4e652c4..413be72087d 100644
--- a/ext/simplexml/tests/sxe私はガラスを食べられます.xml
+++ b/ext/simplexml/tests/sxe私はガラスを食べられます.xml
@@ -14,4 +14,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index dd7a3bf68d1..7342872c321 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 0db1a4f82b6..6b4e8d97055 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 4d37902636d..72423251fda 100644
--- a/ext/snmp/tests/skipif.inc
+++ b/ext/snmp/tests/skipif.inc
@@ -1,11 +1,11 @@
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 ccf479a5cce..dc1ab42f844 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 "FAILED: [$res] {$fault->faultstring}\n";
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 44e4a142f58..b894a1eabfe 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 90c53288a2a..4cf0323a0a8 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 6561ff135c5..b65da2782c3 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 74ca5775f04..af74db7c747 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 bfc4ce0db44..7afc4e697ce 100644
--- a/ext/soap/tests/schema/test_schema.inc
+++ b/ext/soap/tests/schema/test_schema.inc
@@ -44,7 +44,7 @@ $wsdl = <<
-
diff --git a/ext/sockets/package.xml b/ext/sockets/package.xml
index 5fa67d9939f..8fb5a70dd45 100644
--- a/ext/sockets/package.xml
+++ b/ext/sockets/package.xml
@@ -30,8 +30,8 @@
-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.
PHP
diff --git a/ext/spl/README b/ext/spl/README
index 28373a3eda5..0f0e1e31b0d 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 2f77946ce54..63427fb2863 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 5871e7d63ba..2ccd0d1be8b 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 346ac1f2f7a..f217c345467 100755
--- a/ext/spl/examples/dba_array.php
+++ b/ext/spl/examples/dba_array.php
@@ -11,7 +11,7 @@
* If \ is specified then \ is set to \ in \.
* Else the value of \ 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 2c698d427a1..7ea8e762552 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 \.
* The regular expression \ 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 d448ad7299b..d6ee56f442d 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 b09791239be..01de37e990c 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 37f14b7106e..454bd908839 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 5808e3b89ea..3f0bb263e2a 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 8e65d0db120..8454d9e3056 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 4cee203436c..eeb8ae869ca 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 b43ee0cbbc1..288c0924b14 100755
--- a/ext/spl/examples/findregex.php
+++ b/ext/spl/examples/findregex.php
@@ -1,5 +1,5 @@
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 51369110962..4c6c89bd70d 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 \.
* The regular expression \ 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 62cfa3e0296..cb2bb04a57d 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 eaf6b77364d..abc925ec432 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 2ee15ca1e6d..d75788e840d 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 \ \ [\]
*
- * Create phar archive \ using entries from \ that
+ * Create phar archive \ using entries from \ that
* optionally match \.
*/
diff --git a/ext/spl/examples/recursivecomparedualiterator.inc b/ext/spl/examples/recursivecomparedualiterator.inc
index 75265c1d587..5b63e9f0b3e 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 cfa3bccbbcd..a56984e0832 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 944a4ac5a55..ff4963bc72c 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 28e32b15f66..72eb258136b 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 4d4bf8dbff8..077ac726cf6 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 3330cc9e47e..e11e467a10e 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 451d05da320..cdf89d83062 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 c5bddead780..00c41228723 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 cc377fcc6bb..69a223444d9 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 a9450e12a51..2059b97c1c6 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 cd5d3e31f51..3ae127ad94b 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 b089919a302..87d98da8852 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 1eab3d69b2b..6e6c023486d 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 35fa801e784..c22a92bf716 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 ffcff0ce474..42231043987 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 c6addb93d26..706eff33a71 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 b4f66bde4da..77286369818 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 e87e4b11d5c..f01b6306a72 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 df941c63071..4b0c757b816 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 ffc6c994889..f27da4e0014 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 368a2597f38..259e8ddd12e 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 70b1443846e..05436b585db 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 714ab46656a..1d969be2fff 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 f7fbc2602bb..1f8a4eff787 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 365caa51d0c..0f982930471 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 b800aaa12fd..a9231d8421a 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 ee1935fe872..deb96928636 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 18defb29b45..005bebbe200 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 23853b5750b..530f93c1846 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 75d21c07616..b80f982fe7b 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 f0188c1a907..c634727ea35 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 0299d85262e..1b7b050bb26 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 39eab7b530b..446534b336e 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 180d053c11a..461373d76bb 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 ae10b8a6e7d..7d154841abe 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 e60464a4e92..c92925b9037 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 3ab92320b11..c9e21cb866f 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 68fcd3149cd..33339718788 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 0b876c96114..175c3b30c56 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 dd7267b934e..1c28c6a49c7 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 b1a5489cb98..912ebf4cba0 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 2991274be88..bbc8d43c232 100644
--- a/ext/standard/tests/array/data.inc
+++ b/ext/standard/tests/array/data.inc
@@ -1,6 +1,6 @@
'PHP: Hypertext Preprocessor',
5=>'Test',
diff --git a/ext/standard/tests/class_object/AutoTest.inc b/ext/standard/tests/class_object/AutoTest.inc
index 0627096ffff..a0c8244265e 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 aff9d107d92..afee2d20ce4 100644
--- a/ext/standard/tests/file/file.inc
+++ b/ext/standard/tests/file/file.inc
@@ -1,29 +1,29 @@
$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 2d4b47cd513..505368b8b02 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 57fd8f94276..98cec87dc63 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 0785552e548..2197a1f8c17 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 006594021d2..8da04b072a4 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 070ca8ef938..19cc5d84d40 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 3d23925657f..295b7b67c5b 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 b47384b8107..6dc37a0ad79 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 c5a1fcd3384..5cad89a99c6 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 d7aee2d652d..1cae9b7d9a8 100644
--- a/ext/tidy/examples/dumpit5.php
+++ b/ext/tidy/examples/dumpit5.php
@@ -11,21 +11,21 @@
*
* Usage; php dumpit5.php
*/
-
+
$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. foo 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 875baf0cf90..afa90b5f3a0 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 a5b461ce450..a3f2413b24a 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.
2003-11-13
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.
-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.
PHP
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 715f65a9158..0bdaceb0c8f 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=])
])
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 ae5e6450d8f..cf9d382ce6d 100644
--- a/ext/xml/package.xml
+++ b/ext/xml/package.xml
@@ -24,8 +24,8 @@
-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.
PHP
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 498f4713612..637932f5d9c 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 9b8281e1b35..da635fd7061 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 f85e4a21213..66f16b6cbcb 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 6536b78c1f1..8136d787809 100644
--- a/ext/xmlreader/package.xml
+++ b/ext/xmlreader/package.xml
@@ -4,8 +4,8 @@
xmlreader
Provides fast, non-cached, forward-only access to XML data under PHP 5.
- 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.
PHP License
@@ -52,7 +52,7 @@
2005-05-24
beta
- Add OO interface (php5 only)
+ Add OO interface (php5 only)
Add test cases
diff --git a/ext/xmlwriter/package2.xml b/ext/xmlwriter/package2.xml
index ec6ef313b16..a5a4ecb0225 100644
--- a/ext/xmlwriter/package2.xml
+++ b/ext/xmlwriter/package2.xml
@@ -87,7 +87,7 @@
stable
stable
- PHP License
+ PHP License
Promote to stable
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 9b6f8aaa497..b06fdbf8021 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 47c8bbff946..8c88f081ee4 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 e39fac3803c..6e3aef4e43e 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 2f17f43ebd0..82a6277f3a8 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 c2533744e15..4139ac239dc 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 7eb9fa0936f..d1061510c80 100644
--- a/ext/zlib/package.xml
+++ b/ext/zlib/package.xml
@@ -30,9 +30,9 @@
-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).
PHP
diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc
index 441199ff08a..dce79b02041 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 67e11163789..fde9f02ffaa 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 59ff3c4f4c7..89bdb29f1eb 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 6f7556fffac..6216fd81761 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 c5cf5a5f06b..13964e34f84 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 330d4bd7eea..b104fb3486f 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 88cef70c566..f138c86c737 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)
diff --git a/makedist b/makedist
index 18965abc819..9eb9f52b116 100755
--- a/makedist
+++ b/makedist
@@ -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-.
+# in a directory called php-.
# A .tar.bz2 file is also created.
-#
+#
# Written by Stig Bakken 1997-05-28.
# Adapted to git by Stanislav Malyshev
@@ -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 8dbdba32749..2c18ba41dcc 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 bcb082827c5..b8f8449aff2 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 f4720f5b76a..2801959f10f 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 4defa336c6a..d624141c9f0 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 2e64b215e5c..88791408437 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 f0f11e102dc..4d34ff3dacf 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 e51277c2188..16bb2126d2d 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 dc98dc0f23a..61b339e49f7 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 8720250f6ad..5b303aa82df 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 5d82093c0a4..88a43d30cb1 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 293159a693d..3ea19fd3200 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 b4c08b4fa50..c6a290f9d59 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 8a9c60a4f97..4cf4ba4972d 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
#include
#include
@@ -400,7 +400,7 @@ AC_DEFUN([AC_FPM_PORT],
AC_MSG_CHECKING([for port framework])
AC_TRY_COMPILE(
- [
+ [
#include
], [
int port;
@@ -423,7 +423,7 @@ AC_DEFUN([AC_FPM_DEVPOLL],
AC_MSG_CHECKING([for /dev/poll])
AC_TRY_COMPILE(
- [
+ [
#include
#include
], [
@@ -448,7 +448,7 @@ AC_DEFUN([AC_FPM_EPOLL],
AC_MSG_CHECKING([for epoll])
AC_TRY_COMPILE(
- [
+ [
#include
], [
int epollfd;
@@ -484,7 +484,7 @@ AC_DEFUN([AC_FPM_POLL],
AC_MSG_CHECKING([for poll])
AC_TRY_COMPILE(
- [
+ [
#include
], [
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
@@ -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 b5d642f8a63..26583881af5 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 8b73df895de..b2ce46356f9 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 4497e6e61c8..86edaa894fa 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 77914a6f2b5..a4afd5916ac 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.
-->
-
+
-
+
PHP-FPM status page
-
+
-
+
PHP-FPM real-time status page
- Status URL Ajax status Refresh Rate Status URL Ajax status Refresh Rate
Actions
-
+
- Pool Status
+ Pool Status
- Active Processes status
+ Active Processes status
PID↓ Start Time Start Since Requests Served Request Duration Request method Request URI Content Length User Script
- Idle Processes status
+ Idle Processes status
PID↓ Start Time Start Since Requests Served Request Duration Request method Request URI Content Length User Script Last Request %CPU Last Request Memory
diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc
index 71bdad17b95..07603a808e0 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 99967ce3d6d..e744030de74 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.
-
-A major drawback of FastCGI PHP comparing to Apache mod_php is lacking
-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 configuration to enhance server security when mod_php is used.
-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.
+which is nearly twice the performance that Apache mod_php can deliver.
-PHP with LiteSpeed SAPI is highly recommended over FastCGI PHP for
-PHP scripting with LiteSpeed web server.
+A major drawback of FastCGI PHP comparing to Apache mod_php is lacking
+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 configuration to enhance server security when mod_php is used.
+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.
+
+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 can be IPv4, IPv6 or Unix Domain Socket address.
+start manually from command with option "-b ", 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 268b9aecde3..36e614c8537 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 0c5f5cc9ac4..1cfd45ebbf0 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 f377472fe53..685892e7081 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 f767738f1b2..6ceed3fb8bc 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 9f40df37d50..cc0186ef79f 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 1ad35218ede..7ee34fccaa3 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 5af6ba619b9..2a5ea29a0ba 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 99a1ab328b8..1f0b1fdbf92 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 1bf7227b1fd..150647aa7eb 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 to continue or q 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 da08df21997..16ca21d5d1a 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 ");
}
-
+
return SUCCESS;
} /* }}} */
@@ -90,7 +90,7 @@ PHPDBG_SET(lines) /* {{{ */
default:
phpdbg_error("setlines", "type=\"wrongargs\"", "set lines used incorrectly: set lines ");
}
-
+
return SUCCESS;
} /* }}} */
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
index 0c0df7f97ad..8fa47ca1df8 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 7b8c5d30de8..046062997ee 100644
--- a/sapi/phpdbg/web-bootstrap.php
+++ b/sapi/phpdbg/web-bootstrap.php
@@ -1,26 +1,26 @@
'localhost',
'HTTP_CONNECTION' => 'keep-alive',
diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md
index 56dcaaa1f71..c02f80f2ca8 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 5be84fda074..0683f59882d 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 <
diff --git a/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt b/scripts/dev/generate-phpt/src/codeSnippets/emptyUnsetUndefNull.txt
index 7e28494f5b6..a9577812056 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 4f57a70b54a..73071e28460 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 3e45b4764de..1c346b83ce3 100644
--- a/scripts/dev/generate-phpt/src/gtClassMap.php
+++ b/scripts/dev/generate-phpt/src/gtClassMap.php
@@ -1,23 +1,23 @@
'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 220fbdf6997..dc6543201a7 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 47f4bafcb34..b2752ad637b 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 820d7e0a760..dc8438c3b5f 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 cc57863d9bd..9438e0f2ea1 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 76454dc7b85..782c99d6c72 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 0e4d878bab4..b1068e46004 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; $iisShortOption($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 1d2a163175b..6c6de183456 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 858395bc9dc..294b41e9f2c 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 06c17521f2f..88f9b36205c 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 c91b210714c..edd7a1cbae6 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 7495c73ecaa..f70af881ec0 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 40530f3aca8..ebc0a68f576 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 684c24dd7ea..92560c86311 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 f64c6daf329..c0fc9eb61f5 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 3d3896e233b..d009d5038ae 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 214e3d28ba1..82f955cf467 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 2453acf6fde..fcba6d798c4 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 647e52f93e6..fa1c8ca3f19 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 60c115a9c1a..e6fa7affcf2 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 59951707ce1..f445d9e7f4d 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 a62882a81a0..b6a3aa473cd 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 bee26b08aa2..0d24337b3b0 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 039367d5b3d..e868b80795e 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 7bf1c8b778d..45cbe2046cc 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 a9c921f9db5..db923f078ac 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 dbba0d6470e..fa80c0766da 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 81307f139ca..18768b62943 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 bc0c48a5a1c..6d4d5861c31 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 2fd6818a450..1bf32b46086 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 5b72fcc9f5b..c6399168be3 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 7077881296f..894a5515971 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 0aa7eac1199..5afcd950d46 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 064edf3b655..a60f77ef377 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 c8b0a4e36a9..bc7cf9412d7 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 51ca87879d6..507ca232db5 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 d4700b9d665..07a7038dccd 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 fe069977eff..0f1b349f4d5 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 dbf29945676..541dbdf2ddb 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 df9f21c309e..83178b21e78 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 d99b6562d00..a074fcceeb3 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 d2852fdcc54..b885326bfed 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 6302d4ee2f3..e67e3d9cc40 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 < 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 1094e2812c8..39f79984301 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 5961deea982..645a5e8e982 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 ff4b9f6ffc3..f914b011871 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 5eb9065b828..17e067b534e 100644
--- a/tests/classes/constants_basic_003.inc
+++ b/tests/classes/constants_basic_003.inc
@@ -1,5 +1,5 @@
diff --git a/tests/classes/interface_optional_arg_003.inc b/tests/classes/interface_optional_arg_003.inc
index 27b3350da05..be2a69a4c6c 100644
--- a/tests/classes/interface_optional_arg_003.inc
+++ b/tests/classes/interface_optional_arg_003.inc
@@ -1,4 +1,4 @@
-
diff --git a/tests/lang/016.inc b/tests/lang/016.inc
index b73333f7b02..56aa85d65b1 100644
--- a/tests/lang/016.inc
+++ b/tests/lang/016.inc
@@ -1,4 +1,4 @@
-
*** Testing assignments and variable aliasing: ***
-
This should read "blah": \n"; ?>
@@ -22,7 +22,7 @@ This should read "this is nifty":
*** Testing integer operators ***
-
*********************************
*** Testing real operators ***
-
*** Testing if/elseif/else control ***
-
** spelling correction by kluzz **
-\n";
@@ -98,7 +98,7 @@ if (0) { /* this code is not supposed to be executed */
echo "hmm, this shouldn't be displayed #1
\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
\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 ***
-\n";
@@ -199,7 +199,7 @@ if (0) { /* this code is not supposed to be executed */
*************************
*** WHILE tests ***
-
-
*** hash test... ***
-
*** Hash resizing test ***
- 0) {
@@ -295,7 +295,7 @@ while ($i > 0) {
*** break/continue test ***
-\n";
@@ -349,7 +349,7 @@ while ($i<5) {
********************************
-\n"; # testing some PHP style comment...
}
diff --git a/tests/lang/023-2.inc b/tests/lang/023-2.inc
index 6dd1e730f16..a66030775d1 100644
--- a/tests/lang/023-2.inc
+++ b/tests/lang/023-2.inc
@@ -1,5 +1,5 @@
-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.
diff --git a/tests/quicktester.inc b/tests/quicktester.inc
index 48ed6b549fa..70cb1156843 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 c5de8ca1126..d229f8497fd 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 32b39a40443..ef13733edc9 100755
--- a/travis/ext/pgsql/setup.sh
+++ b/travis/ext/pgsql/setup.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-echo '
+echo '
' >> "./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 1412f8405d6..68fa579b5f4 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 9d2f318c972..2fbbdad93cc 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 43b03626a42..4f7a4634422 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 5d9cd6efa6d..812d28faf5e 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 1771297a545..b216659ebf9 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 8c394ca6490..aa5da5c4d08 100644
--- a/win32/build/default.manifest
+++ b/win32/build/default.manifest
@@ -7,8 +7,8 @@
-
-
+
+
+
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index f4969442b7b..7a39bea02b3 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 88232191844..25cd4d786f4 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 9cfe3cd80b5..cf3d72e39bc 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 243b1d2fbdc..2010e0ca4cb 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 2c52f54fb6a..1c5ed48c971 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 809a5dd84b1..4d5b8faf8de 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 dd4b50cf39c..0bed8ba6f6e 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 0b989e8fe97..283619d86a5 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//trunk
diff --git a/win32/ioutil.c b/win32/ioutil.c
index 9a13c1cd6e2..07dc70d9177 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
#include
@@ -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 43b8859c876..1ce6cbbb7c0 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 4988ba55492..993df0a041d 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 18e87d369d1..f3d33e61d73 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 4fe00bc21e4..07afae487ab 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 6e37ddfbfc1..8cf5cbac0f7 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 }