mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
typo fixes
This commit is contained in:
Veres Lajos
Stanislav Malyshev
parent
b79b13b4ef
commit
e9a95d78ef
96 changed files with 154 additions and 154 deletions
|
|
@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
|
|||
and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
|
||||
code execution (with specialized executor and direct threading execution
|
||||
method). As in most PHP applications raw execution speed isn't the limiting
|
||||
factor but system calls and database callls are, your mileage with this patch
|
||||
factor but system calls and database calls are, your mileage with this patch
|
||||
will vary.
|
||||
|
||||
Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
|
|||
--FILE--
|
||||
<?php
|
||||
/* A non-static closure has a bound instance if it has a scope
|
||||
* and does't have an instance if it has no scope */
|
||||
* and doesn't have an instance if it has no scope */
|
||||
|
||||
$nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
|
||||
|
||||
|
|
|
|||
|
|
@ -3911,7 +3911,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
|
|||
/** With the other traits, we are more permissive.
|
||||
We do not give errors for those. This allows to be more
|
||||
defensive in such definitions.
|
||||
However, we want to make sure that the insteadof declartion
|
||||
However, we want to make sure that the insteadof declaration
|
||||
is consistent in itself.
|
||||
*/
|
||||
j = 0;
|
||||
|
|
|
|||
|
|
@ -1417,7 +1417,7 @@ for ($i = 1; $i < $argc; $i++) {
|
|||
// Disabling code for old-style executor
|
||||
define("ZEND_VM_OLD_EXECUTOR", 1);
|
||||
} else if ($argv[$i] == "--with-lines") {
|
||||
// Enabling debuging using original zend_vm_def.h
|
||||
// Enabling debugging using original zend_vm_def.h
|
||||
define("ZEND_VM_LINES", 1);
|
||||
} else if ($argv[$i] == "--help") {
|
||||
usage();
|
||||
|
|
|
|||
2
build/libtool.m4
vendored
2
build/libtool.m4
vendored
|
|
@ -1230,7 +1230,7 @@ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
|
|||
test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
|
||||
test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
|
||||
|
||||
# We can hardcode non-existant directories.
|
||||
# We can hardcode non-existent directories.
|
||||
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
|
||||
# If the only mechanism to avoid hardcoding is shlibpath_var, we
|
||||
# have to relink, otherwise we might link with an installed library
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV)
|
||||
Bug #55397 (comparison of incomplete DateTime causes SIGSEGV)
|
||||
--INI--
|
||||
--FILE--
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -889,7 +889,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
|||
RETURN_FALSE;
|
||||
}
|
||||
if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) {
|
||||
/* Needed becasue some systems do not allow to write to the original
|
||||
/* Needed because some systems do not allow to write to the original
|
||||
* file contents with O_APPEND being set.
|
||||
*/
|
||||
if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&info->fd, 1)) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ DBA GDBM handler test
|
|||
$lock_flag = ''; // lock in library
|
||||
require_once dirname(__FILE__) .'/dba_handler.inc';
|
||||
|
||||
// Read during write is system dependant. Important is that there is no deadlock
|
||||
// Read during write is system dependent. Important is that there is no deadlock
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
DomDocument::schemaValidate() - non-existant schema file
|
||||
DomDocument::schemaValidate() - non-existent schema file
|
||||
--CREDITS--
|
||||
Daniel Convissor <danielc@php.net>
|
||||
# TestFest 2009 NYPHP
|
||||
|
|
@ -12,14 +12,14 @@ $doc = new DOMDocument;
|
|||
|
||||
$doc->load(dirname(__FILE__)."/book.xml");
|
||||
|
||||
$result = $doc->schemaValidate(dirname(__FILE__)."/non-existant-file");
|
||||
$result = $doc->schemaValidate(dirname(__FILE__)."/non-existent-file");
|
||||
var_dump($result);
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existant-file" in %s.php on line %d
|
||||
Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existent-file" in %s.php on line %d
|
||||
|
||||
Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existant-file'. in %s.php on line %d
|
||||
Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existent-file'. in %s.php on line %d
|
||||
|
||||
Warning: DOMDocument::schemaValidate(): Invalid Schema in %s.php on line %d
|
||||
bool(false)
|
||||
|
|
|
|||
|
|
@ -674,7 +674,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
|
|||
described/referred to by 'tag'. The ordering is a comma delimited
|
||||
list of provider names. As a special exception, the "*" tag can
|
||||
be used as a language tag to declare a default ordering for any
|
||||
language that does not explictly declare an ordering. */
|
||||
language that does not explicitly declare an ordering. */
|
||||
|
||||
PHP_FUNCTION(enchant_broker_set_ordering)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2595,7 +2595,7 @@ static int exif_process_string_raw(char **result, char *value, size_t byte_count
|
|||
|
||||
/* {{{ exif_process_string
|
||||
* Copy a string in Exif header to a character string and return length of allocated buffer if any.
|
||||
* In contrast to exif_process_string this function does allways return a string buffer */
|
||||
* In contrast to exif_process_string this function does always return a string buffer */
|
||||
static int exif_process_string(char **result, char *value, size_t byte_count TSRMLS_DC) {
|
||||
/* we cannot use strlcpy - here the problem is that we cannot use strlen to
|
||||
* determin length of string and we cannot use strlcpy with len=byte_count+1
|
||||
|
|
|
|||
|
|
@ -1630,7 +1630,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
|
|||
/* Verify we have enough data to match magic type */
|
||||
switch (m->type) {
|
||||
case FILE_BYTE:
|
||||
if (nbytes < (offset + 1)) /* should alway be true */
|
||||
if (nbytes < (offset + 1)) /* should always be true */
|
||||
return 0;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -3303,7 +3303,7 @@
|
|||
>>>0x44 string =GLOB \b.
|
||||
>>>>0x60 beshort x \b%.4d
|
||||
|
||||
# Scripts that run in the embeded Python interpreter
|
||||
# Scripts that run in the embedded Python interpreter
|
||||
0 string #!BPY Blender3D BPython script
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
|
|||
fseek($fp, $postition);
|
||||
var_dump(urlencode(fgets($fp)));
|
||||
|
||||
//test non-existant file request
|
||||
//test non-existent file request
|
||||
ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII);
|
||||
|
||||
//remove file
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY));
|
|||
var_dump(urlencode(file_get_contents($tmpfname)));
|
||||
unlink($tmpfname);
|
||||
|
||||
//test non-existant file request
|
||||
//test non-existent file request
|
||||
ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
|
||||
?>
|
||||
--EXPECTF--
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
|
|||
/* IMPORTANT NOTE FOR NEW FILTER
|
||||
* Do not forget to update:
|
||||
* IMAGE_FILTER_MAX: define the last filter index
|
||||
* IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments
|
||||
* IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
|
||||
* image_filter array in PHP_FUNCTION(imagefilter)
|
||||
* */
|
||||
#define IMAGE_FILTER_NEGATE 0
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ WebPResult WebPDecode(const uint8* data,
|
|||
* height.
|
||||
* 6. y_stride: The width (in bytes) of one row of Y data. This may not
|
||||
* match width if there is end of row padding (e.g., for 32
|
||||
* bit row aligment).
|
||||
* bit row alignment).
|
||||
* 7. QP: the quantization parameter. This parameter controls the
|
||||
* compression vs quality tradeoff. Use smaller numbers for better
|
||||
* quality (compression will be lesser) and vice versa. 20 is a
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ file_put_contents( $filename, 'The quick brown fox jumped over the lazy dog.' );
|
|||
echo "\n-- Testing hash_file() function with an unknown algorithm --\n";
|
||||
var_dump( hash_file( 'foobar', $filename ) );
|
||||
|
||||
echo "\n-- Testing hash_file() function with a non-existant file --\n";
|
||||
var_dump( hash_file( 'md5', 'nonexistant.txt' ) );
|
||||
echo "\n-- Testing hash_file() function with a non-existent file --\n";
|
||||
var_dump( hash_file( 'md5', 'nonexistent.txt' ) );
|
||||
|
||||
echo "\n-- Testing hash_file() function with less than expected no. of arguments --\n";
|
||||
var_dump( hash_file( 'md5' ) );
|
||||
|
|
@ -50,7 +50,7 @@ unlink( $filename );
|
|||
Warning: hash_file(): Unknown hashing algorithm: %s in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- Testing hash_file() function with a non-existant file --
|
||||
-- Testing hash_file() function with a non-existent file --
|
||||
|
||||
Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d
|
||||
bool(false)
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@ Transliterator::create (error)
|
|||
<?php
|
||||
|
||||
ini_set("intl.error_level", E_WARNING);
|
||||
Transliterator::create("inexistant id");
|
||||
Transliterator::create("inexistent id");
|
||||
echo intl_get_error_message(), "\n";
|
||||
Transliterator::create("bad UTF-8 \x8F");
|
||||
echo intl_get_error_message(), "\n";
|
||||
|
||||
echo "Done.\n";
|
||||
--EXPECTF--
|
||||
Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
|
||||
transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
|
||||
Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
|
||||
transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
|
||||
|
||||
Warning: Transliterator::create(): String conversion of id to UTF-16 failed in %s on line %d
|
||||
String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ echo transliterator_transliterate("\x8F", $str), "\n";
|
|||
echo intl_get_error_message(), "\n";
|
||||
|
||||
class A {
|
||||
function __toString() { return "inexistant id"; }
|
||||
function __toString() { return "inexistent id"; }
|
||||
}
|
||||
|
||||
echo transliterator_transliterate(new A(), $str), "\n";
|
||||
|
|
@ -29,9 +29,9 @@ Warning: transliterator_transliterate(): Could not create transliterator with ID
|
|||
|
||||
String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
|
||||
|
||||
Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
|
||||
Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
|
||||
|
||||
Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistant id" (transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID) in %s on line %d
|
||||
Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistent id" (transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID) in %s on line %d
|
||||
|
||||
transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
|
||||
transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
|
||||
Done.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ var_dump(ldap_get_values_len($link));
|
|||
var_dump(ldap_get_values_len($link, $entry));
|
||||
var_dump(ldap_get_values_len($link, $entry, "weirdAttribute", "Additional data"));
|
||||
|
||||
var_dump(ldap_get_values_len($link, $entry, "inexistantAttribute"));
|
||||
var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute"));
|
||||
?>
|
||||
===DONE===
|
||||
--CLEAN--
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ function rebind_proc ($ds, $ldap_url) {
|
|||
$link = ldap_connect($host, $port);
|
||||
var_dump(ldap_set_rebind_proc($link));
|
||||
var_dump(ldap_set_rebind_proc($link, "rebind_proc", "Additional data"));
|
||||
var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistant"));
|
||||
var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent"));
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
|
|
@ -45,6 +45,6 @@ bool(false)
|
|||
Warning: ldap_set_rebind_proc() expects exactly 2 parameters, 3 given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistant' to be a valid callback in %s on line %d
|
||||
Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistent' to be a valid callback in %s on line %d
|
||||
bool(false)
|
||||
===DONE===
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
|
|||
} catch (mysqli_sql_exception $e) {
|
||||
$ok = true;
|
||||
if ('' == $e->getMessage())
|
||||
printf("[008] getMessage() has returned an emptry string.\n");
|
||||
printf("[008] getMessage() has returned an empty string.\n");
|
||||
if ('' == $e->getCode())
|
||||
printf("[009] getCode() has returned an empty string.\n");
|
||||
if ('' == $e->getFile())
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ mysqli_fetch_assoc() - utf8
|
|||
die("skip Looks like UTF8 is not available on the server");
|
||||
|
||||
if (strtolower($tmp['Charset']) !== 'utf8')
|
||||
die("skip Not sure if UTF8 is available, cancelling the test");
|
||||
die("skip Not sure if UTF8 is available, canceling the test");
|
||||
|
||||
mysqli_free_result($res);
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ mysqli_fetch_assoc() - utf8
|
|||
die("skip Looks like UCS2 is not available on the server");
|
||||
|
||||
if (strtolower($tmp['Charset']) !== 'ucs2')
|
||||
die("skip Not sure if UCS2 is available, cancelling the test");
|
||||
die("skip Not sure if UCS2 is available, canceling the test");
|
||||
|
||||
mysqli_free_result($res);
|
||||
mysqli_close($link);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
|
|||
|
||||
$valid_options = array(
|
||||
MYSQLI_READ_DEFAULT_GROUP => "MYSQLI_READ_DEFAULT_GROUP",
|
||||
MYSQLI_READ_DEFAULT_FILE => "MYSQLI_READ_DEFAUTL_FILE",
|
||||
MYSQLI_READ_DEFAULT_FILE => "MYSQLI_READ_DEFAULT_FILE",
|
||||
MYSQLI_OPT_CONNECT_TIMEOUT => "MYSQLI_OPT_CONNECT_TIMEOUT",
|
||||
MYSQLI_OPT_LOCAL_INFILE => "MYSQLI_OPT_LOCAL_INFILE",
|
||||
MYSQLI_INIT_COMMAND => "MYSQLI_INIT_COMMAND",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ require(dirname(__FILE__).'/skipif.inc');
|
|||
--FILE--
|
||||
<?php
|
||||
|
||||
// This test is similar to bug43492.phpt without the explict free.
|
||||
// This test is similar to bug43492.phpt without the explicit free.
|
||||
// Now that bug 44206 is fixed an automatic clean up will occur -
|
||||
// though it is still recommended in practice.
|
||||
|
||||
|
|
|
|||
|
|
@ -2704,7 +2704,7 @@ PHP_FUNCTION(odbc_num_rows)
|
|||
|
||||
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
|
||||
/* {{{ proto bool odbc_next_result(resource result_id)
|
||||
Checks if multiple results are avaiable */
|
||||
Checks if multiple results are available */
|
||||
PHP_FUNCTION(odbc_next_result)
|
||||
{
|
||||
odbc_result *result;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "Zend/zend.h"
|
||||
#include "Zend/zend_signal.h"
|
||||
|
||||
/* php_signal using sigaction is derrived from Advanced Programing
|
||||
/* php_signal using sigaction is derived from Advanced Programing
|
||||
* in the Unix Environment by W. Richard Stevens p 298. */
|
||||
Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
|
|||
* Testing how preg_grep reacts to being passed bad regexes
|
||||
*/
|
||||
echo "*** Testing preg_grep() : error conditions ***\n";
|
||||
$values = array('abcdef', //Regex without delimeter
|
||||
'/[a-zA-Z]', //Regex without closing delimeter
|
||||
'[a-zA-Z]/', //Regex without opening delimeter
|
||||
$values = array('abcdef', //Regex without delimiter
|
||||
'/[a-zA-Z]', //Regex without closing delimiter
|
||||
'[a-zA-Z]/', //Regex without opening delimiter
|
||||
'/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
|
||||
'[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
|
||||
);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
|
|||
* Testing how preg_match_all reacts to being passed the wrong type of regex argument
|
||||
*/
|
||||
echo "*** Testing preg_match_all() : error conditions ***\n";
|
||||
$regex_array = array('abcdef', //Regex without delimeter
|
||||
'/[a-zA-Z]', //Regex without closing delimeter
|
||||
'[a-zA-Z]/', //Regex without opening delimeter
|
||||
$regex_array = array('abcdef', //Regex without delimiter
|
||||
'/[a-zA-Z]', //Regex without closing delimiter
|
||||
'[a-zA-Z]/', //Regex without opening delimiter
|
||||
'/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
|
||||
'[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
|
||||
);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
|
|||
* Testing how preg_match reacts to being passed the wrong type of regex argument
|
||||
*/
|
||||
echo "*** Testing preg_match() : error conditions ***\n";
|
||||
$regex_array = array('abcdef', //Regex without delimeter
|
||||
'/[a-zA-Z]', //Regex without closing delimeter
|
||||
'[a-zA-Z]/', //Regex without opening delimeter
|
||||
$regex_array = array('abcdef', //Regex without delimiter
|
||||
'/[a-zA-Z]', //Regex without closing delimiter
|
||||
'[a-zA-Z]/', //Regex without opening delimiter
|
||||
'/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
|
||||
'[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
|
||||
);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
|
|||
* Testing how preg_replace reacts to being passed the wrong type of regex argument
|
||||
*/
|
||||
echo "*** Testing preg_replace() : error conditions***\n";
|
||||
$regex_array = array('abcdef', //Regex without delimeter
|
||||
'/[a-zA-Z]', //Regex without closing delimeter
|
||||
'[a-zA-Z]/', //Regex without opening delimeter
|
||||
$regex_array = array('abcdef', //Regex without delimiter
|
||||
'/[a-zA-Z]', //Regex without closing delimiter
|
||||
'[a-zA-Z]/', //Regex without opening delimiter
|
||||
'/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
|
||||
'[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
|
||||
);
|
||||
|
|
|
|||
|
|
@ -899,7 +899,7 @@ static PHP_METHOD(PDO, getAttribute)
|
|||
PDO_DBH_CLEAR_ERR();
|
||||
PDO_CONSTRUCT_CHECK;
|
||||
|
||||
/* handle generic PDO-level atributes */
|
||||
/* handle generic PDO-level attributes */
|
||||
switch (attr) {
|
||||
case PDO_ATTR_PERSISTENT:
|
||||
RETURN_BOOL(dbh->is_persistent);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
PDO_OCI: Atrribute: closing a connection in non-autocommit mode commits data
|
||||
PDO_OCI: Attribute: closing a connection in non-autocommit mode commits data
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ ORDER BY 1;
|
|||
/*
|
||||
* mysql_list_fields()
|
||||
*
|
||||
* See also pg_meta_data(). It returns field defintion as array.
|
||||
* See also pg_meta_data(). It returns field definition as array.
|
||||
*/
|
||||
function pg_list_fields($db, $table)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
ReflectionExtension::getClassNames() method on an extension which acually returns some information
|
||||
ReflectionExtension::getClassNames() method on an extension which actually returns some information
|
||||
--CREDITS--
|
||||
Felix De Vliegher <felix.devliegher@gmail.com>
|
||||
--FILE--
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Test session_status() function : disabled
|
|||
--SKIPIF--
|
||||
<?php include('skipif.inc'); ?>
|
||||
--INI--
|
||||
session.save_handler=non-existant
|
||||
session.save_handler=non-existent
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ class Interop_Client
|
|||
|
||||
/**
|
||||
* decodeSoapval
|
||||
* decodes a soap value to php type, used for test result comparisions
|
||||
* decodes a soap value to php type, used for test result comparisons
|
||||
*
|
||||
* @param SOAP_Value soapval
|
||||
* @return mixed result
|
||||
|
|
@ -398,7 +398,7 @@ class Interop_Client
|
|||
$namespace = $soapaction = 'http://soapinterop.org/';
|
||||
// hack to make tests work with MS SoapToolkit
|
||||
// it's the only one that uses this soapaction, and breaks if
|
||||
// it isn't right. Can't wait for soapaction to be fully depricated
|
||||
// it isn't right. Can't wait for soapaction to be fully deprecated
|
||||
if ($this->currentTest == 'base' &&
|
||||
strstr($endpoint_info['endpointName'],'MS SOAP ToolKit 2.0')) {
|
||||
$soapaction = 'urn:soapinterop';
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ classes to define what the type of the value is.</p>
|
|||
|
||||
<h3>Client Test Interface</h3>
|
||||
<p>The <a href="client_round2.php">client interface</a> allows you to run the PHP SOAP
|
||||
Client against a choosen interop server. Each run updates the results database below.</p>
|
||||
Client against a chosen interop server. Each run updates the results database below.</p>
|
||||
|
||||
<h3>Interop Client Test Results</h3>
|
||||
<p>This is a database of the current test results using PHP SOAP Clients against interop servers.</p>
|
||||
|
|
|
|||
|
|
@ -1284,7 +1284,7 @@ PHP_METHOD(SoapServer, setClass)
|
|||
}
|
||||
}
|
||||
} else {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to set a non existant class (%s)", classname);
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to set a non existent class (%s)", classname);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1415,7 +1415,7 @@ PHP_METHOD(SoapServer, addFunction)
|
|||
zend_str_tolower_copy(key, Z_STRVAL_PP(tmp_function), key_len);
|
||||
|
||||
if (zend_hash_find(EG(function_table), key, key_len+1, (void**)&f) == FAILURE) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existant function '%s'", Z_STRVAL_PP(tmp_function));
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existent function '%s'", Z_STRVAL_PP(tmp_function));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1437,7 +1437,7 @@ PHP_METHOD(SoapServer, addFunction)
|
|||
zend_str_tolower_copy(key, Z_STRVAL_P(function_name), key_len);
|
||||
|
||||
if (zend_hash_find(EG(function_table), key, key_len+1, (void**)&f) == FAILURE) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existant function '%s'", Z_STRVAL_P(function_name));
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existent function '%s'", Z_STRVAL_P(function_name));
|
||||
return;
|
||||
}
|
||||
if (service->soap_functions.ft == NULL) {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ array(42) {
|
|||
string(86) "struct MGCodeLibelle {
|
||||
string Code;
|
||||
string Libelle;
|
||||
boolean Defaut;
|
||||
boolean Default;
|
||||
anyType Tag;
|
||||
}"
|
||||
[9]=>
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ type="s:string" />
|
|||
type="s:string" />
|
||||
<s:element minOccurs="0" maxOccurs="1" name="Libelle"
|
||||
type="s:string" />
|
||||
<s:element minOccurs="1" maxOccurs="1" name="Defaut"
|
||||
<s:element minOccurs="1" maxOccurs="1" name="Default"
|
||||
type="s:boolean" />
|
||||
<s:element minOccurs="0" maxOccurs="1" name="Tag" />
|
||||
</s:sequence>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* 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 erros.
|
||||
* prevent missuse. If you do not you must expect exceptions or fatal errors.
|
||||
*
|
||||
* It is also possible to derive the class and implement IteratorAggregate by
|
||||
* downcasting the instances returned in getIterator. See the following
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
SplFileObject::fgetcsv with alternative delimeter
|
||||
SplFileObject::fgetcsv with alternative delimiter
|
||||
--FILE--
|
||||
<?php
|
||||
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
SplFileObject::fgetcsv with alternative delimeter
|
||||
SplFileObject::fgetcsv with alternative delimiter
|
||||
--FILE--
|
||||
<?php
|
||||
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
SplFileObject::fgetcsv with alternative delimeter
|
||||
SplFileObject::fgetcsv with alternative delimiter
|
||||
--FILE--
|
||||
<?php
|
||||
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
SplFileObject::fgetcsv with alternative delimeter
|
||||
SplFileObject::fgetcsv with alternative delimiter
|
||||
--FILE--
|
||||
<?php
|
||||
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
SplFileObject::fgetcsv with alternative delimeter
|
||||
SplFileObject::fgetcsv with alternative delimiter
|
||||
--FILE--
|
||||
<?php
|
||||
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
SplFileObject::fgetcsv with alternative delimeter
|
||||
SplFileObject::fgetcsv with alternative delimiter
|
||||
--FILE--
|
||||
<?php
|
||||
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
|
||||
|
|
|
|||
|
|
@ -11864,7 +11864,7 @@ SQLITE_PRIVATE int sqlite3MemdebugNoType(void*,u8);
|
|||
**
|
||||
*************************************************************************
|
||||
**
|
||||
** This file contains definitions of global variables and contants.
|
||||
** This file contains definitions of global variables and constants.
|
||||
*/
|
||||
|
||||
/* An array to map all upper-case characters into their corresponding
|
||||
|
|
@ -16130,7 +16130,7 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetMemsys3(void){
|
|||
** 1. All memory allocations sizes are rounded up to a power of 2.
|
||||
**
|
||||
** 2. If two adjacent free blocks are the halves of a larger block,
|
||||
** then the two blocks are coalesed into the single larger block.
|
||||
** then the two blocks are coalesced into the single larger block.
|
||||
**
|
||||
** 3. New memory is allocated from the first available free block.
|
||||
**
|
||||
|
|
@ -20926,7 +20926,7 @@ do_atof_calc:
|
|||
/* store the result */
|
||||
*pResult = result;
|
||||
|
||||
/* return true if number and no extra non-whitespace chracters after */
|
||||
/* return true if number and no extra non-whitespace characters after */
|
||||
return z>=zEnd && nDigits>0 && eValid;
|
||||
#else
|
||||
return !sqlite3Atoi64(z, pResult, length, enc);
|
||||
|
|
@ -30074,7 +30074,7 @@ static int unixGetLastError(sqlite3_vfs *NotUsed, int NotUsed2, char *NotUsed3){
|
|||
** setting the environment variable SQLITE_FORCE_PROXY_LOCKING to 1 will
|
||||
** force proxy locking to be used for every database file opened, and 0
|
||||
** will force automatic proxy locking to be disabled for all database
|
||||
** files (explicity calling the SQLITE_SET_LOCKPROXYFILE pragma or
|
||||
** files (explicitly calling the SQLITE_SET_LOCKPROXYFILE pragma or
|
||||
** sqlite_file_control API is not affected by SQLITE_FORCE_PROXY_LOCKING).
|
||||
*/
|
||||
|
||||
|
|
@ -69899,7 +69899,7 @@ SQLITE_PRIVATE int sqlite3MemJournalSize(void){
|
|||
|
||||
/*
|
||||
** Walk an expression tree. Invoke the callback once for each node
|
||||
** of the expression, while decending. (In other words, the callback
|
||||
** of the expression, while descending. (In other words, the callback
|
||||
** is invoked before visiting children.)
|
||||
**
|
||||
** The return value from the callback should be one of the WRC_*
|
||||
|
|
@ -70936,7 +70936,7 @@ static int resolveOrderGroupBy(
|
|||
}
|
||||
|
||||
/*
|
||||
** Resolve names in the SELECT statement p and all of its descendents.
|
||||
** Resolve names in the SELECT statement p and all of its descendants.
|
||||
*/
|
||||
static int resolveSelectStep(Walker *pWalker, Select *p){
|
||||
NameContext *pOuterNC; /* Context that contains this SELECT */
|
||||
|
|
@ -71244,7 +71244,7 @@ SQLITE_PRIVATE void sqlite3ResolveSelectNames(
|
|||
** affinity of that column is returned. Otherwise, 0x00 is returned,
|
||||
** indicating no affinity for the expression.
|
||||
**
|
||||
** i.e. the WHERE clause expresssions in the following statements all
|
||||
** i.e. the WHERE clause expressions in the following statements all
|
||||
** have an affinity:
|
||||
**
|
||||
** CREATE TABLE t1(a);
|
||||
|
|
@ -74260,13 +74260,13 @@ static int evalConstExpr(Walker *pWalker, Expr *pExpr){
|
|||
|
||||
/*
|
||||
** Preevaluate constant subexpressions within pExpr and store the
|
||||
** results in registers. Modify pExpr so that the constant subexpresions
|
||||
** results in registers. Modify pExpr so that the constant subexpressions
|
||||
** are TK_REGISTER opcodes that refer to the precomputed values.
|
||||
**
|
||||
** This routine is a no-op if the jump to the cookie-check code has
|
||||
** already occur. Since the cookie-check jump is generated prior to
|
||||
** any other serious processing, this check ensures that there is no
|
||||
** way to accidently bypass the constant initializations.
|
||||
** way to accidentally bypass the constant initializations.
|
||||
**
|
||||
** This routine is also a no-op if the SQLITE_FactorOutConst optimization
|
||||
** is disabled via the sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS)
|
||||
|
|
@ -75132,7 +75132,7 @@ static void renameParentFunc(
|
|||
** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER
|
||||
** statement. The second is a table name. The table name in the CREATE
|
||||
** TRIGGER statement is replaced with the third argument and the result
|
||||
** returned. This is analagous to renameTableFunc() above, except for CREATE
|
||||
** returned. This is analogous to renameTableFunc() above, except for CREATE
|
||||
** TRIGGER, not CREATE INDEX and CREATE TABLE.
|
||||
*/
|
||||
static void renameTriggerFunc(
|
||||
|
|
@ -86752,7 +86752,7 @@ static int xferOptimization(
|
|||
}
|
||||
#endif
|
||||
#ifndef SQLITE_OMIT_FOREIGN_KEY
|
||||
/* Disallow the transfer optimization if the destination table constains
|
||||
/* Disallow the transfer optimization if the destination table constrains
|
||||
** any foreign key constraints. This is more restrictive than necessary.
|
||||
** But the main beneficiary of the transfer optimization is the VACUUM
|
||||
** command, and the VACUUM command disables foreign key constraints. So
|
||||
|
|
@ -93175,7 +93175,7 @@ static int flattenSubquery(
|
|||
pSubSrc = pSub->pSrc;
|
||||
assert( pSubSrc );
|
||||
/* Prior to version 3.1.2, when LIMIT and OFFSET had to be simple constants,
|
||||
** not arbitrary expresssions, we allowed some combining of LIMIT and OFFSET
|
||||
** not arbitrary expressions, we allowed some combining of LIMIT and OFFSET
|
||||
** because they could be computed at compile-time. But when LIMIT and OFFSET
|
||||
** became arbitrary expressions, we were forced to add restrictions (13)
|
||||
** and (14). */
|
||||
|
|
@ -94472,7 +94472,7 @@ SQLITE_PRIVATE int sqlite3Select(
|
|||
*/
|
||||
if( pGroupBy ){
|
||||
KeyInfo *pKeyInfo; /* Keying information for the group by clause */
|
||||
int j1; /* A-vs-B comparision jump */
|
||||
int j1; /* A-vs-B comparison jump */
|
||||
int addrOutputRow; /* Start of subroutine that outputs a result row */
|
||||
int regOutputRow; /* Return address register for output subroutine */
|
||||
int addrSetAbort; /* Set the abort flag and return */
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ PHP_FUNCTION(count)
|
|||
|
||||
/* Numbers are always smaller than strings int this function as it
|
||||
* anyway doesn't make much sense to compare two different data types.
|
||||
* This keeps it consistant and simple.
|
||||
* This keeps it consistent and simple.
|
||||
*
|
||||
* This is not correct any more, depends on what compare_func is set to.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ static struct gfxinfo *php_handle_gif (php_stream * stream TSRMLS_DC)
|
|||
result->width = (unsigned int)dim[0] | (((unsigned int)dim[1])<<8);
|
||||
result->height = (unsigned int)dim[2] | (((unsigned int)dim[3])<<8);
|
||||
result->bits = dim[4]&0x80 ? ((((unsigned int)dim[4])&0x07) + 1) : 0;
|
||||
result->channels = 3; /* allways */
|
||||
result->channels = 3; /* always */
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
|
|||
sendmail = popen_ex(sendmail_cmd, "wb", NULL, NULL TSRMLS_CC);
|
||||
#else
|
||||
/* Since popen() doesn't indicate if the internal fork() doesn't work
|
||||
* (e.g. the shell can't be executed) we explicitely set it to 0 to be
|
||||
* (e.g. the shell can't be executed) we explicitly set it to 0 to be
|
||||
* sure we don't catch any older errno value. */
|
||||
errno = 0;
|
||||
sendmail = popen(sendmail_cmd, "w");
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ char machine_little_endian;
|
|||
/* Mapping of byte from char (8bit) to long for machine endian */
|
||||
static int byte_map[1];
|
||||
|
||||
/* Mappings of bytes from int (machine dependant) to int for machine endian */
|
||||
/* Mappings of bytes from int (machine dependent) to int for machine endian */
|
||||
static int int_map[sizeof(int)];
|
||||
|
||||
/* Mappings of bytes from shorts (16bit) for all endian environments */
|
||||
|
|
|
|||
|
|
@ -1581,7 +1581,7 @@ PHP_FUNCTION(pathinfo)
|
|||
const char *p;
|
||||
int idx;
|
||||
|
||||
/* Have we alrady looked up the basename? */
|
||||
/* Have we already looked up the basename? */
|
||||
if (!have_basename && !ret) {
|
||||
php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Test array_key_exists() function : usage variations - Pass differnt data types to $search arg
|
||||
Test array_key_exists() function : usage variations - Pass different data types to $search arg
|
||||
--FILE--
|
||||
<?php
|
||||
/* Prototype : bool array_key_exists(mixed $key, array $search)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ $file_handle = fopen(__FILE__, "r");
|
|||
//directory type resource
|
||||
$dir_handle = opendir( dirname(__FILE__) );
|
||||
|
||||
//store resources in array for comparision.
|
||||
//store resources in array for comparison.
|
||||
$resources = array($file_handle, $dir_handle);
|
||||
|
||||
// search for resouce type in the resource array
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Test array_values() function : usage variations - Internal order check
|
|||
|
||||
/*
|
||||
* Check that array_values is re-assigning keys according to the internal order of the array,
|
||||
* and is not dependant on the \$input argument's keys
|
||||
* and is not dependent on the \$input argument's keys
|
||||
*/
|
||||
|
||||
echo "*** Testing array_values() : usage variations ***\n";
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ Bug #34066 (recursive array_walk causes segfault)
|
|||
"ProceedKeyArticle" => "01",
|
||||
"ActionKey" => "00",
|
||||
"ContactCommissionArticle"=> "0,00",
|
||||
"QuantDependantPriceKey"=> "",
|
||||
"QuantdependentPriceKey"=> "",
|
||||
"Quant" => "1",
|
||||
"QuantUnit" => "",
|
||||
"Meas" => array(
|
||||
|
|
@ -584,7 +584,7 @@ gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
|
|||
/Docs/Doc/DocItems/DocItem/ContactCommissionArticle=0,00
|
||||
gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
|
||||
gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
|
||||
/Docs/Doc/DocItems/DocItem/QuantDependantPriceKey
|
||||
/Docs/Doc/DocItems/DocItem/QuantdependentPriceKey
|
||||
gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
|
||||
gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
|
||||
/Docs/Doc/DocItems/DocItem/Quant=1
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ Bug #34066 (recursive array_walk causes segfault)
|
|||
"ProceedKeyArticle" => "01",
|
||||
"ActionKey" => "00",
|
||||
"ContactCommissionArticle"=> "0,00",
|
||||
"QuantDependantPriceKey"=> "",
|
||||
"QuantdependentPriceKey"=> "",
|
||||
"Quant" => "1",
|
||||
"QuantUnit" => "",
|
||||
"Meas" => array(
|
||||
|
|
@ -543,7 +543,7 @@ gen_xml(prefix=/Docs/)
|
|||
/Docs/ContactCommissionArticle=0,00
|
||||
gen_xml(prefix=/Docs/) end
|
||||
gen_xml(prefix=/Docs/)
|
||||
/Docs/QuantDependantPriceKey
|
||||
/Docs/QuantdependentPriceKey
|
||||
gen_xml(prefix=/Docs/) end
|
||||
gen_xml(prefix=/Docs/)
|
||||
/Docs/Quant=1
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ $file_handle = fopen(__FILE__, "r");
|
|||
//directory type resource
|
||||
$dir_handle = opendir( dirname(__FILE__) );
|
||||
|
||||
//store resources in array for comparision.
|
||||
//store resources in array for comparison.
|
||||
$resources = array($file_handle, $dir_handle);
|
||||
|
||||
// search for resouce type in the resource array
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ Test uasort() function : object functionality - sort diff. objects
|
|||
*
|
||||
|
||||
/*
|
||||
* This testcase tests uasort() functionality with differnt objects
|
||||
* This testcase tests uasort() functionality with different objects
|
||||
* Objects of different classes:
|
||||
* simple class,
|
||||
* child class,
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Test uasort() function : usage variations - sort array with reference variables
|
|||
* Testing uasort() with 'array_arg' containing different reference variables
|
||||
*/
|
||||
|
||||
// comparision function
|
||||
// comparison function
|
||||
/* Prototype : int cmp_function(mixed $value1, mixed $value2)
|
||||
* Parameters : $value1 and $value2 - values to be compared
|
||||
* Return value : 0 - if both values are same
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Test uasort() function : usage variations - sort different numeric values
|
|||
* integer, octal, hexadecimal & float
|
||||
*/
|
||||
|
||||
// comparision function
|
||||
// comparison function
|
||||
/* Prototype : int cmp_function(mixed $value1, mixed $value2)
|
||||
* Parameters : $value1 and $value2 - values to be compared
|
||||
* Return value : 0 - if both values are same
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) die('skip windows only test');
|
|||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
$result = exec('cd 1:\non_existant; dir nonexistant');
|
||||
$result = exec('cd 1:\non_existent; dir nonexistent');
|
||||
echo "$result";
|
||||
system('cd 1:\non_existant; dir nonexistant');
|
||||
system('cd 1:\non_existent; dir nonexistent');
|
||||
?>
|
||||
--EXPECT--
|
||||
The system cannot find the drive specified.
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
|
|||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
$result = exec('cd 1:\\non_existant; dir nonexistant');
|
||||
$result = exec('cd 1:\\non_existent; dir nonexistent');
|
||||
echo "$result";
|
||||
?>
|
||||
--EXPECT--
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
|
|||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
system('cd 1:\\non_existant; dir nonexistant');
|
||||
system('cd 1:\\non_existent; dir nonexistent');
|
||||
?>
|
||||
--EXPECT--
|
||||
The system cannot find the drive specified.
|
||||
|
|
@ -575,13 +575,13 @@ Description:
|
|||
Compares two stat values, stat value should be obtained by stat/lstat
|
||||
$stat1 = first stat array
|
||||
$stat2 = second stat array
|
||||
$op = type of the comparision to be perform between elements of stat1 and stat2
|
||||
$op = type of the comparison to be perform between elements of stat1 and stat2
|
||||
"!=" compare for not equal
|
||||
"==" 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.
|
||||
type of the comparision is based on $op argument value
|
||||
type of the comparison is based on $op argument value
|
||||
$flag = specify true to dump the stat1 and stat2
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ var_dump( lchown( $filename ) );
|
|||
// More than expected arguments
|
||||
var_dump( lchown( $filename, $uid, 'foobar' ) );
|
||||
|
||||
// Non-existant filename
|
||||
// Non-existent filename
|
||||
var_dump( lchown( 'foobar_lchown.txt', $uid ) );
|
||||
|
||||
// Wrong argument types
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ symlink(basename($prefix . "_file"), $prefix . "_link1");
|
|||
symlink(basename($prefix . "_link1"), $prefix . "_link2");
|
||||
|
||||
// symlink to a non-existent path
|
||||
@unlink($prefix . "_nonexistant");
|
||||
symlink(basename($prefix . "_nonexistant"), $prefix . "_link3");
|
||||
@unlink($prefix . "_nonexistent");
|
||||
symlink(basename($prefix . "_nonexistent"), $prefix . "_link3");
|
||||
|
||||
// symlink to a regular file using an absolute path
|
||||
symlink($prefix . "_file", $prefix . "_link4");
|
||||
|
|
@ -45,6 +45,6 @@ unlink($prefix . "_file");
|
|||
--EXPECTF--
|
||||
%unicode|string%(%d) "symlink_to_symlink.php_file"
|
||||
%unicode|string%(%d) "symlink_to_symlink.php_link1"
|
||||
%unicode|string%(%d) "symlink_to_symlink.php_nonexistant"
|
||||
%unicode|string%(%d) "symlink_to_symlink.php_nonexistent"
|
||||
%unicode|string%(%d) "%s/symlink_to_symlink.php_file"
|
||||
%unicode|string%(%d) "%s/symlink_to_symlink.php_link4"
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class mystream
|
|||
}
|
||||
|
||||
if (@stream_wrapper_register("bogus", "class_not_exist")) {
|
||||
die("Registered a non-existant class!!!???");
|
||||
die("Registered a non-existent class!!!???");
|
||||
}
|
||||
echo "Not Registered\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ $n += test_me("bug #7368", 2, "1345", "1234");
|
|||
$n += test_me("bug #6562", 1, "debugg", "debug");
|
||||
$n += test_me("bug #6562", 1, "ddebug", "debug");
|
||||
$n += test_me("bug #6562", 2, "debbbug", "debug");
|
||||
$n += test_me("bug #6562", 1, "debugging", "debuging");
|
||||
$n += test_me("bug #6562", 1, "debugging", "debugging");
|
||||
|
||||
$n += test_me("bug #16473", 2, "a", "bc");
|
||||
$n += test_me("bug #16473", 2, "xa", "xbc");
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ class sample {
|
|||
//getting the resource
|
||||
$file_handle = fopen(__FILE__, "r");
|
||||
|
||||
// array with different values for $delimeter
|
||||
$delimeters = array (
|
||||
// array with different values for $delimiter
|
||||
$delimiters = array (
|
||||
|
||||
// integer values
|
||||
0,
|
||||
|
|
@ -68,13 +68,13 @@ $delimeters = array (
|
|||
@$unset_var
|
||||
);
|
||||
|
||||
// loop through with each element of the $delimeters array to test explode() function
|
||||
// loop through with each element of the $delimiters array to test explode() function
|
||||
$count = 1;
|
||||
$string = "piece1 piece2 piece3 piece4 piece5 piece6";
|
||||
$limit = 5;
|
||||
foreach($delimeters as $delimeter) {
|
||||
foreach($delimiters as $delimiter) {
|
||||
echo "-- Iteration $count --\n";
|
||||
var_dump( explode($delimeter, $string, $limit) );
|
||||
var_dump( explode($delimiter, $string, $limit) );
|
||||
$count ++;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #38322 (reading past array in sscanf() leads to segfault/arbitary code execution)
|
||||
Bug #38322 (reading past array in sscanf() leads to segfault/arbitrary code execution)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #47322 (sscanf %d does't work)
|
||||
Bug #47322 (sscanf %d doesn't work)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ echo "\n-- Testing explode() function with no arguments --\n";
|
|||
var_dump( explode() );
|
||||
|
||||
echo "\n-- Testing explode() function with more than expected no. of arguments --\n";
|
||||
$delimeter = " ";
|
||||
$delimiter = " ";
|
||||
$string = "piece1 piece2 piece3 piece4 piece5 piece6";
|
||||
$limit = 5;
|
||||
$extra_arg = 10;
|
||||
var_dump( explode($delimeter, $string, $limit, $extra_arg) );
|
||||
var_dump( explode($delimiter, $string, $limit, $extra_arg) );
|
||||
|
||||
?>
|
||||
===Done===
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ class sample {
|
|||
//getting the resource
|
||||
$file_handle = fopen(__FILE__, "r");
|
||||
|
||||
// array with different values for $delimeter
|
||||
$delimeters = array (
|
||||
// array with different values for $delimiter
|
||||
$delimiters = array (
|
||||
|
||||
// integer values
|
||||
/*1*/ 0,
|
||||
|
|
@ -68,13 +68,13 @@ $delimeters = array (
|
|||
/*22*/ @$unset_var
|
||||
);
|
||||
|
||||
// loop through with each element of the $delimeters array to test explode() function
|
||||
// loop through with each element of the $delimiters array to test explode() function
|
||||
$count = 1;
|
||||
$string = "piece1 piece2 piece3 piece4 piece5 piece6";
|
||||
$limit = 5;
|
||||
foreach($delimeters as $delimeter) {
|
||||
foreach($delimiters as $delimiter) {
|
||||
echo "-- Iteration $count --\n";
|
||||
var_dump( explode($delimeter, $string, $limit) );
|
||||
var_dump( explode($delimiter, $string, $limit) );
|
||||
$count ++;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -70,11 +70,11 @@ $strings = array (
|
|||
|
||||
// loop through with each element of the $strings array to test explode() function
|
||||
$count = 1;
|
||||
$delimeter = " ";
|
||||
$delimiter = " ";
|
||||
$limit = 5;
|
||||
foreach($strings as $string) {
|
||||
echo "-- Iteration $count --\n";
|
||||
var_dump( explode($delimeter, $string, $limit) );
|
||||
var_dump( explode($delimiter, $string, $limit) );
|
||||
$count ++;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class sample {
|
|||
//getting the resource
|
||||
$file_handle = fopen(__FILE__, "r");
|
||||
|
||||
// array with different values for $delimeter
|
||||
// array with different values for $delimiter
|
||||
$limits = array (
|
||||
|
||||
// integer values
|
||||
|
|
@ -70,11 +70,11 @@ $limits = array (
|
|||
|
||||
// loop through with each element of the $limits array to test explode() function
|
||||
$count = 1;
|
||||
$delimeter = " ";
|
||||
$delimiter = " ";
|
||||
$string = "piece1 piece2 piece3 piece4 piece5 piece6";
|
||||
foreach($limits as $limit) {
|
||||
echo "-- Iteration $count --\n";
|
||||
var_dump( explode($delimeter, $string, $limit) );
|
||||
var_dump( explode($delimiter, $string, $limit) );
|
||||
$count ++;
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -34,7 +34,7 @@ var_dump( strrchr("Hello, World", "Hi") );
|
|||
var_dump( strrchr("Hello, World", "o") );
|
||||
var_dump( strrchr("Hello, World", "ooo") );
|
||||
|
||||
var_dump( strrchr("Hello, World", "Zzzz") ); //non-existant needle in haystack
|
||||
var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack
|
||||
echo "*** Done ***";
|
||||
?>
|
||||
--EXPECTF--
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ echo "\n-- Testing substr_replace() function with start and length different typ
|
|||
var_dump(substr_replace($s1, "evening", array(5)));
|
||||
var_dump(substr_replace($s1, "evening", 5, array(8)));
|
||||
|
||||
echo "\n-- Testing substr_replace() function with start and length with a different number of elments --\n";
|
||||
echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n";
|
||||
var_dump(substr_replace($s1, "evening", array(5, 1), array(8)));
|
||||
|
||||
echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n";
|
||||
|
|
@ -58,7 +58,7 @@ string(12) "Good morning"
|
|||
Warning: substr_replace(): 'from' and 'len' should be of same type - numerical or array in %s on line %d
|
||||
string(12) "Good morning"
|
||||
|
||||
-- Testing substr_replace() function with start and length with a different number of elments --
|
||||
-- Testing substr_replace() function with start and length with a different number of elements --
|
||||
|
||||
Warning: substr_replace(): 'from' and 'len' should have the same number of elements in %s on line %d
|
||||
string(12) "Good morning"
|
||||
|
|
|
|||
|
|
@ -1121,7 +1121,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
|
|||
break;
|
||||
|
||||
case CS_CMD_FAIL:
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Command failed, cancelling rest");
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Command failed, canceling rest");
|
||||
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
|
||||
fail = 1;
|
||||
break;
|
||||
|
|
@ -1131,7 +1131,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
|
|||
case CS_PARAM_RESULT:
|
||||
case CS_ROW_RESULT:
|
||||
/* Unexpected results, cancel them. */
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, cancelling current");
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, canceling current");
|
||||
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_CURRENT);
|
||||
break;
|
||||
|
||||
|
|
@ -1141,7 +1141,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
|
|||
break;
|
||||
|
||||
default:
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, cancelling all");
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Unexpected results, canceling all");
|
||||
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1696,7 +1696,7 @@ PHP_FUNCTION(sybase_free_result)
|
|||
|
||||
/* Did we fetch up until the end? */
|
||||
if (result->last_retcode != CS_END_DATA && result->last_retcode != CS_END_RESULTS) {
|
||||
/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cancelling the rest of the results"); */
|
||||
/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: canceling the rest of the results"); */
|
||||
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
|
||||
php_sybase_finish_results(result TSRMLS_CC);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ bool(true)
|
|||
select "bar"
|
||||
|
||||
|
||||
Notice: sybase_query(): Sybase: Unexpected results, cancelling current in %stest.inc on line %d
|
||||
Notice: sybase_query(): Sybase: Unexpected results, canceling current in %stest.inc on line %d
|
||||
<<< Return: resource
|
||||
array(1) {
|
||||
[0]=>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ Sybase-CT bug #43578 (Incurred fault #6 - if returned textfield ist empty)
|
|||
var_dump(sybase_query('insert into #Resource values (123, NULL)', $db));
|
||||
var_dump(sybase_query('insert into #Resource values (124, "")', $db));
|
||||
|
||||
// Select non-existant
|
||||
// Select non-existent
|
||||
var_dump(sybase_select_ex($db, 'select DC_Rights from #Resource where Resource_ID = 122'));
|
||||
|
||||
// Select null
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ Sybase-CT sybase_fetch_object
|
|||
// Test with object
|
||||
var_export(fetch_object($db, new article())); echo "\n";
|
||||
|
||||
// Test with non-existant class
|
||||
// Test with non-existent class
|
||||
var_export(fetch_object($db, '***')); echo "\n";
|
||||
|
||||
sybase_close($db);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Sybase-CT server message handler
|
|||
|
||||
$db= sybase_connect_ex();
|
||||
|
||||
echo 'Nonexistant: '; sybase_set_messagehandler_ex('function_does_not_exist');
|
||||
echo 'Nonexistent: '; sybase_set_messagehandler_ex('function_does_not_exist');
|
||||
echo 'Static method: '; sybase_set_messagehandler_ex(array('sybase', 'static_handler'));
|
||||
echo 'Instance method: '; sybase_set_messagehandler_ex(array(new sybase(), 'handler'));
|
||||
echo 'Lambda function: '; sybase_set_messagehandler_ex(create_function('', 'return FALSE;'));
|
||||
|
|
@ -25,7 +25,7 @@ Sybase-CT server message handler
|
|||
sybase_close($db);
|
||||
?>
|
||||
--EXPECTF--
|
||||
Nonexistant:
|
||||
Nonexistent:
|
||||
Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, function 'function_does_not_exist' not found or invalid function name in %stest.inc on line %d
|
||||
NULL
|
||||
Static method: bool(true)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #41287 (Namespace functions don't allow xmlns defintion to be optional)
|
||||
Bug #41287 (Namespace functions don't allow xmlns definition to be optional)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded("xmlwriter")) die("skip");
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ sprintf offers the ability to make a lot of failures since it does not know
|
|||
the size of the buffer it uses. Therefore usage of sprintf often
|
||||
results in possible entries for buffer overrun attacks. So please
|
||||
use this version only if you are sure the call is safe. sprintf
|
||||
allways terminstes the buffer it writes to.
|
||||
always terminstes the buffer it writes to.
|
||||
|
||||
snprintf knows the buffers size and will not write behind it. But you will
|
||||
have to use either a static buffer or allocate a dynamic buffer
|
||||
|
|
@ -48,7 +48,7 @@ spprintf is the dynamical version of snprintf. It allocates the buffer in size
|
|||
snprintf and offers possible memory leakes if you miss freeing the
|
||||
buffer allocated by the function. Therfore this function should be
|
||||
used where either no maximum is known or the maximum is much bigger
|
||||
than normal size required. spprintf allways terminates the buffer.
|
||||
than normal size required. spprintf always terminates the buffer.
|
||||
|
||||
Example:
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ Example:
|
|||
sprintf(buffer, "test"); | snprintf(buffer, MAX, "test"); | spprintf(&buffer, MAX, "text");
|
||||
| | if (!buffer)
|
||||
| | return OUT_OF_MEMORY
|
||||
// sprintf allways terminates | // manual termination of | // spprintf allays terminates buffer
|
||||
// sprintf always terminates | // manual termination of | // spprintf allays terminates buffer
|
||||
// buffer | // buffer *IS* required |
|
||||
| buffer[MAX-1] = 0; |
|
||||
action_with_buffer(buffer); | action_with_buffer(buffer); | action_with_buffer(buffer);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
The pbuf parameter of all spprintf version receives a pointer to the allocated
|
||||
buffer. This buffer must be freed manually after usage using efree() function.
|
||||
The buffer will allways be terminated by a zero character. When pbuf is NULL
|
||||
The buffer will always be terminated by a zero character. When pbuf is NULL
|
||||
the function can be used to calculate the required size of the buffer but for
|
||||
that purpose snprintf is faster. When both pbuf and the return value are 0
|
||||
than you are out of memory.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
; All relative paths in this configuration file are relative to PHP's install
|
||||
; prefix (@prefix@). This prefix can be dynamicaly changed by using the
|
||||
; prefix (@prefix@). This prefix can be dynamically changed by using the
|
||||
; '-p' argument from the command line.
|
||||
|
||||
; Include one or more files. If glob(3) exists, it is used to include a bunch of
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ process.
|
|||
|
||||
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 desireable
|
||||
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.
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -23,7 +23,7 @@ class gtVariationContainerFunction extends gtVariationContainer {
|
|||
|
||||
|
||||
/**
|
||||
* Constucts all possible variation testcases in array $this->variationTests
|
||||
* constructs all possible variation testcases in array $this->variationTests
|
||||
*
|
||||
*/
|
||||
public function constructAll() {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--TEST--
|
||||
Bug #45986 (wrong error message for a non existant file on rename)
|
||||
Bug #45986 (wrong error message for a non existent file on rename)
|
||||
--CREDITS--
|
||||
Sebastian Schürmann
|
||||
sebs@php.net
|
||||
|
|
|
|||
|
|
@ -408,7 +408,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char
|
|||
|
||||
snprintf(Buffer, sizeof(Buffer), "HELO %s\r\n", LocalHost);
|
||||
|
||||
/* in the beggining of the dialog */
|
||||
/* in the beginning of the dialog */
|
||||
/* attempt reconnect if the first Post fail */
|
||||
if ((res = Post(Buffer)) != SUCCESS) {
|
||||
MailConnect();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue