clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ast

Browse Source
This commit is contained in:
Nikita Popov 2014-08-18 18:16:11 +02:00
commit ced6d3068a
42 changed files with 76 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -10,6 +10,9 @@ PHP NEWS
- Core:
. Added PHP_INT_MIN constant. (Andrea)
- Reflection
. Fixed inheritance chain of Reflector interface (Tjerk)
- DBA:
. Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)

19
Zend/tests/bug67858.phpt Normal file
View File

@ -0,0 +1,19 @@
--TEST--
Bug #67858: Leak when $php_errormsg already set
--INI--
track_errors=1
error_reporting=E_ALL
--FILE--
<?php
function f() {
$php_errormsg = [1, 2, 3];
echo $var;
var_dump($php_errormsg);
}
f();
?>
--EXPECTF--
Notice: Undefined variable: var in %s on line %d
string(23) "Undefined variable: var"

6
Zend/zend_API.h
View File

@ -1078,15 +1078,15 @@ static zend_always_inline int _z_param_long(zval *arg, long *dest, zend_bool *is
*is_null = 0;
}
if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
*dest = Z_LVAL_P(arg);
} else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
if (strict && UNEXPECTED(Z_DVAL_P(arg) > LONG_MAX)) {
*dest = LONG_MAX;
} else if (strict && UNEXPECTED(Z_DVAL_P(arg) < LONG_MIN)) {
*dest = LONG_MIN;
} else {
*dest = Z_LVAL_P(arg);
*dest = zend_dval_to_lval(Z_DVAL_P(arg));
}
} else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
*dest = zend_dval_to_lval(Z_DVAL_P(arg));
} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
double d;
int type;

1
Zend/zend_execute_API.c
View File

@ -1724,6 +1724,7 @@ ZEND_API int zend_set_local_var_str(const char *name, int len, zval *value, int
if (op_array->vars[i]->h == h &&
op_array->vars[i]->len == len &&
memcmp(op_array->vars[i]->val, name, len) == 0) {
zval_ptr_dtor(EX_VAR_NUM(i));
ZVAL_COPY_VALUE(EX_VAR_NUM(i), value);
return SUCCESS;
}

2
acinclude.m4
View File

@ -2800,7 +2800,7 @@ AC_DEFUN([PHP_DETECT_ICC],
dnl PHP_DETECT_SUNCC
dnl Detect if the systems default compiler is suncc.
dnl We also set some usefull CFLAGS if the user didn't set any
dnl We also set some useful CFLAGS if the user didn't set any
AC_DEFUN([PHP_DETECT_SUNCC],[
SUNCC="no"
AC_MSG_CHECKING([for suncc])

2
ext/ereg/tests/eregi_basic.phpt
View File

@ -9,7 +9,7 @@ Test eregi() function : basic functionality - confirm case insensitivity
*/
/*
* Test basic funtionality of eregi()
* Test basic functionality of eregi()
*/
echo "*** Testing eregi() : basic functionality ***\n";

12
ext/fileinfo/tests/magic
View File

@ -3474,7 +3474,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
#------------------------------------------------------------------------------
@ -5154,7 +5154,7 @@
>>0 ubyte 0xF5 FoxPro with memo
# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
#>>0 ubyte 0xFA FoxPro 2.x, with memo
# unkown version (should not happen)
# unknown version (should not happen)
>>0 default x xBase
>>>0 ubyte x (0x%x)
# flags in version byte
@ -5226,7 +5226,7 @@
>>>>0 ubelong =0 \b, next free block index %lu
>>>>0 ubelong !0 \b, next free block index %lu
>>>512 default x dBase IV DBT
# DBF file name without extention
# DBF file name without extension
>>>>8 string >\0 \b of %-.8s.DBF
# size of blocks ; not reliable 0x2020204C
#>>>>4 ulelong =0 \b, blocks size %lu
@ -6591,7 +6591,7 @@
>>>>>379 string GRUB\ \0 \b, GRUB version 0.95 or 0.96
>>>>391 string Geom\0Hard\ Disk\0Read\0\ Error\0
>>>>>385 string GRUB\ \0 \b, GRUB version 0.97
#unkown version
#unknown version
>>>343 string Geom\0Read\0\ Error\0
>>>>321 string Loading\ stage1.5 \b, GRUB version x.y
>>>380 string Geom\0Hard\ Disk\0Read\0\ Error\0
@ -12695,7 +12695,7 @@
#>65 string ZSYS (Pre-System 7 system file)
#>65 string acf3 (Aldus FreeHand)
#>65 string cdev (control panel)
#>65 string dfil (Desk Acessory suitcase)
#>65 string dfil (Desk Accessory suitcase)
#>65 string libr (library)
#>65 string nX^d (WriteNow word processor)
#>65 string nX^w (WriteNow dictionary)
@ -17992,7 +17992,7 @@
# $File: sysex,v 1.7 2013/09/16 15:12:42 christos Exp $
# sysex: file(1) magic for MIDI sysex files
#
# GRR: orginal 1 byte test at offset was too general as it catches also many FATs of DOS filesystems
# GRR: original 1 byte test at offset was too general as it catches also many FATs of DOS filesystems
# where real SYStem EXclusive messages at offset 1 are limited to seven bits
# http://en.wikipedia.org/wiki/MIDI
0 ubeshort&0xFF80 0xF000 SysEx File -

2
ext/json/json.c
View File

@ -365,7 +365,7 @@ static int json_utf8_to_utf16(unsigned short *utf16, char utf8[], int len) /* {{
}
}
} else {
/* Only check if utf8 string is valid, and compute utf16 lenght */
/* Only check if utf8 string is valid, and compute utf16 length */
for (j=0 ; pos < len ; j++) {
us = php_next_utf8_char((const unsigned char *)utf8, len, &pos, &status);
if (status != SUCCESS) {

2
ext/mbstring/mb_gpc.c
View File

@ -258,7 +258,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i
goto out;
}
num = n; /* make sure to process initilized vars only */
num = n; /* make sure to process initialized vars only */
/* initialize converter */
if (info->num_from_encodings <= 0) {

4
ext/mbstring/oniguruma/HISTORY
View File

@ -897,7 +897,7 @@ History
2004/10/18: [impl] (thanks Imai Yasumasa)
enclose #include <sys/types.h> by #ifndef __BORLANDC__.
2004/10/18: [bug] (thanks Imai Yasumasa)
memory acess violation in select_opt_exact_info().
memory access violation in select_opt_exact_info().
2004/09/25: [dist] fix doc/API and doc/API.ja.
2004/09/25: [bug] fix OP_SEMI_END_BUF process in match_at() for
the case USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
@ -1831,7 +1831,7 @@ History
2003/01/31: [impl] rename TTRANS() to TOLOWER().
2003/01/30: [bug] .c.o --> .c.obj in win32\Makefile.
2003/01/30: [impl] add -DNOT_RUBY to Makefile.in.
NOT_RUBY is refered in regint.h for escape double
NOT_RUBY is referred in regint.h for escape double
including config.h.
2003/01/30: [impl] when string hasn't case ambiguity, don't compile
to ignore case opcode.

2
ext/mysqli/tests/045.phpt
View File

@ -31,7 +31,7 @@ mysqli_stmt_bind_result (SHOW)
mysqli_stmt_bind_result($stmt, $c1, $c2);
mysqli_stmt_fetch($stmt);
mysqli_stmt_close($stmt);
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && mysqli_get_server_version($link) < 50000) {
if ((version_compare(PHP_VERSION, '6.0', '==') == 1) && mysqli_get_server_version($link) < 50000) {
/* variables are binary */
settype($c1, "unicode");
settype($c2, "unicode");

2
ext/mysqli/tests/065.phpt
View File

@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_charset')) {
die('skip mysqli_set_charset() not available');
}
if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}
?>

3
ext/mysqli/tests/bug35517.phpt
View File

@ -24,8 +24,7 @@ require_once('skipifconnectfailure.inc');
if (gettype($id) !== 'string') {
printf("[002] Expecting string on 32bit got %s/%s\n", gettype($id), var_export($id, true));
}
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
(version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
if ((version_compare(PHP_VERSION, '6.0', '==') == 1) &&
!is_unicode($id)) {
printf("[003] Expecting unicode string\n");
}

2
ext/mysqli/tests/bug37090.phpt
View File

@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_charset')) {
die('skip mysqli_set_charset() not available');
}
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) {
die("skip Functionality not available in unicode mode");
}
?>

2
ext/mysqli/tests/mysqli_change_user_set_names.phpt
View File

@ -129,7 +129,7 @@ if ($version[0] <= 4 && $version[1] < 1)
var_dump($defaults);
}
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) {
// charsets cannot take any other value but utf8 in unicode mode
$defaults['charset_client'] = 'utf8';
$defaults['charset_connection'] = 'utf8';

3
ext/mysqli/tests/mysqli_character_set.phpt
View File

@ -10,9 +10,6 @@ require_once('skipifemb.inc');
if (!function_exists('mysqli_set_charset')) {
die('skip mysqli_set_charset() not available');
}
if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}
?>
--FILE--
<?php

2
ext/mysqli/tests/mysqli_error_unicode.phpt
View File

@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc');
$host, $user, $db, $port, $socket);
}
if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
if (!(version_compare(PHP_VERSION, '6.0', '==') == 1)) {
mysqli_query($link, "set names utf8");
}

2
ext/mysqli/tests/mysqli_get_client_stats.phpt
View File

@ -119,7 +119,7 @@ mysqlnd.collect_memory_statistics=1
mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, $info, $test_counter);
/* we need to skip this test in unicode - we send set names utf8 during mysql_connect */
if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1))
if (!(version_compare(PHP_VERSION, '6.0', '==') == 1))
mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, $info, $test_counter);
mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, $test_counter);
mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, $test_counter);

3
ext/mysqli/tests/mysqli_get_warnings.phpt
View File

@ -129,8 +129,7 @@ if (!$TEST_EXPERIMENTAL)
$warning = new mysqli_warning($mysqli);
$i = 1;
while ($warning->next() && ('' != ($tmp = $warning->message))) {
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
(version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
if ((version_compare(PHP_VERSION, '6.0', '==') == 1) &&
!is_unicode($tmp))
printf("[033a] Warning should have been a unicode string, got %s/%s", gettype($tmp), $tmp);
$i++;

3
ext/mysqli/tests/mysqli_info.phpt
View File

@ -30,8 +30,7 @@ require_once('skipifconnectfailure.inc');
if (!is_string($tmp = mysqli_info($link)) || ('' == $tmp))
printf("[006] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp);
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) &&
(version_compare(PHP_VERSION, '6.9.9', '<=') == 1) &&
if ((version_compare(PHP_VERSION, '6.0', '==') == 1) &&
!is_unicode($tmp))
printf("[007] Expecting unicode, because unicode mode it on. Got binary string\n");

2
ext/mysqli/tests/mysqli_query_unicode.phpt
View File

@ -88,7 +88,7 @@ mysqli_close($link);
/*
Trying to test what Ramil suggests in http://bugs.mysql.com/bug.php?id=29576
However, this won't work, because we're lacking MYSQLI_SET_CHARSET_NAME.
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) {
if (mysqli_get_server_version() > 50002) {
@mysqli_query($link, "DROP USER IF EXISTS 'тест'@'%'");
if (TRUE !== mysqli_query($link, "CREATE USER 'тест'@'%'")) {

2
ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
View File

@ -2,7 +2,7 @@
mysqli_real_escape_string() - gbk
--SKIPIF--
<?php
if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}

2
ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
View File

@ -2,7 +2,7 @@
mysqli_real_escape_string() - sjis
--SKIPIF--
<?php
if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}

2
ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
View File

@ -10,7 +10,7 @@ require_once('connect.inc');
if (!$IS_MYSQLND)
die("skip Test for mysqlnd only");
if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1))
if ((version_compare(PHP_VERSION, '6.0', '==') == 1))
die("skip (TODO) PHP 6.0 has a difference debug_zval_dump output format");
?>
<?php require_once('skipifemb.inc'); ?>

2
ext/mysqli/tests/mysqli_set_charset.phpt
View File

@ -6,7 +6,7 @@ require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
die('skip set character set not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}

2
ext/mysqli/tests/mysqli_stmt_bind_result.phpt
View File

@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
<?php
require_once("connect.inc");
$hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? "unicode":"string";
$hint_str_or_unicode = (version_compare(PHP_VERSION, '6.0', '==') == 1) ? "unicode":"string";
$tmp = NULL;
$link = NULL;

2
ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
View File

@ -15,7 +15,7 @@ mysqli_stmt_get_result - data types
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
$hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? 'unicode' : 'string';
$hint_str_or_unicode = (version_compare(PHP_VERSION, '6.0', '==') == 1) ? 'unicode' : 'string';
function func_mysqli_stmt_get_result($link, $engine, $bind_type, $sql_type, $bind_value, $offset, $type_hint = null) {

2
ext/mysqli/tests/mysqli_store_result_copy.phpt
View File

@ -75,7 +75,7 @@ mysqlnd.fetch_data_copy=0
printf("No result: %d\n", $no_result);
/* implicit free, implicit store */
/* meta and fetch lenghts code */
/* meta and fetch lengths code */
if (!$res = mysqli_query($link, "SELECT CONCAT(id, id) AS _c, label FROM test ORDER BY id DESC LIMIT 2"))
printf("[011] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

2
ext/mysqli/tests/skipifunicode.inc
View File

@ -1,5 +1,5 @@
<?php
if (version_compare(PHP_VERSION, '6.0', '!=') == 1) {
if (version_compare(PHP_VERSION, '6.0', '==') == 1) {
die('skip Not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}
?>

2
ext/mysqlnd/mysqlnd_result.c
View File

@ -1343,7 +1343,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
No need to FREE_ALLOCA as we can reuse the
'lengths' and 'fields' arrays. For lengths its absolutely safe.
'fields' is reused because the ownership of the strings has been
transfered above.
transferred above.
*/
}
/* Overflow ? */

2
ext/pcre/pcrelib/ChangeLog
View File

@ -5431,7 +5431,7 @@ by an auxiliary program - but can then be edited by hand if required. There are
now no calls to isalnum(), isspace(), isdigit(), isxdigit(), tolower() or
toupper() in the code.
7. Turn the malloc/free funtions variables into pcre_malloc and pcre_free and
7. Turn the malloc/free functions variables into pcre_malloc and pcre_free and
make them global. Abolish the function for setting them, as the caller can now
set them directly.

22
ext/reflection/php_reflection.c
View File

@ -261,15 +261,6 @@ static void _default_lookup_entry(zval *object, char *name, int name_len, zval *
/* }}} */
#endif
static void reflection_register_implement(zend_class_entry *class_entry, zend_class_entry *interface_entry TSRMLS_DC) /* {{{ */
{
zend_uint num_interfaces = ++class_entry->num_interfaces;
class_entry->interfaces = (zend_class_entry **) realloc(class_entry->interfaces, sizeof(zend_class_entry *) * num_interfaces);
class_entry->interfaces[num_interfaces - 1] = interface_entry;
}
/* }}} */
static zend_function *_copy_function(zend_function *fptr TSRMLS_DC) /* {{{ */
{
if (fptr
@ -5687,7 +5678,6 @@ ZEND_END_ARG_INFO()
static const zend_function_entry reflection_function_abstract_functions[] = {
ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
PHP_ABSTRACT_ME(reflection_function, __toString, arginfo_reflection__void)
ZEND_ME(reflection_function, inNamespace, arginfo_reflection__void, 0)
ZEND_ME(reflection_function, isClosure, arginfo_reflection__void, 0)
ZEND_ME(reflection_function, isDeprecated, arginfo_reflection__void, 0)
@ -6094,7 +6084,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionFunctionAbstract", reflection_function_abstract_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_function_abstract_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
reflection_register_implement(reflection_function_abstract_ptr, reflector_ptr TSRMLS_CC);
zend_class_implements(reflection_function_abstract_ptr TSRMLS_CC, 1, reflector_ptr);
zend_declare_property_string(reflection_function_abstract_ptr, "name", sizeof("name")-1, "", ZEND_ACC_ABSTRACT TSRMLS_CC);
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionFunction", reflection_function_functions);
@ -6107,7 +6097,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionParameter", reflection_parameter_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_parameter_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
reflection_register_implement(reflection_parameter_ptr, reflector_ptr TSRMLS_CC);
zend_class_implements(reflection_parameter_ptr TSRMLS_CC, 1, reflector_ptr);
zend_declare_property_string(reflection_parameter_ptr, "name", sizeof("name")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionMethod", reflection_method_functions);
@ -6126,7 +6116,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionClass", reflection_class_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_class_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
reflection_register_implement(reflection_class_ptr, reflector_ptr TSRMLS_CC);
zend_class_implements(reflection_class_ptr TSRMLS_CC, 1, reflector_ptr);
zend_declare_property_string(reflection_class_ptr, "name", sizeof("name")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
REGISTER_REFLECTION_CLASS_CONST_LONG(class, "IS_IMPLICIT_ABSTRACT", ZEND_ACC_IMPLICIT_ABSTRACT_CLASS);
@ -6140,7 +6130,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionProperty", reflection_property_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_property_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
reflection_register_implement(reflection_property_ptr, reflector_ptr TSRMLS_CC);
zend_class_implements(reflection_property_ptr TSRMLS_CC, 1, reflector_ptr);
zend_declare_property_string(reflection_property_ptr, "name", sizeof("name")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
zend_declare_property_string(reflection_property_ptr, "class", sizeof("class")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
@ -6152,13 +6142,13 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionExtension", reflection_extension_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_extension_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
reflection_register_implement(reflection_extension_ptr, reflector_ptr TSRMLS_CC);
zend_class_implements(reflection_extension_ptr TSRMLS_CC, 1, reflector_ptr);
zend_declare_property_string(reflection_extension_ptr, "name", sizeof("name")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
INIT_CLASS_ENTRY(_reflection_entry, "ReflectionZendExtension", reflection_zend_extension_functions);
_reflection_entry.create_object = reflection_objects_new;
reflection_zend_extension_ptr = zend_register_internal_class(&_reflection_entry TSRMLS_CC);
reflection_register_implement(reflection_zend_extension_ptr, reflector_ptr TSRMLS_CC);
zend_class_implements(reflection_zend_extension_ptr TSRMLS_CC, 1, reflector_ptr);
zend_declare_property_string(reflection_zend_extension_ptr, "name", sizeof("name")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
return SUCCESS;

4
ext/reflection/tests/ReflectionClass_toString_001.phpt
View File

@ -21,7 +21,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
}
- Static methods [1] {
Method [ <internal:Reflection> static public method export ] {
Method [ <internal:Reflection, prototype Reflector> static public method export ] {
- Parameters [2] {
Parameter #0 [ <required> $argument ]
@ -48,7 +48,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
}
}
Method [ <internal:Reflection> public method __toString ] {
Method [ <internal:Reflection, prototype Reflector> public method __toString ] {
- Parameters [0] {
}

2
ext/soap/interop/client_round2_interop.php
View File

@ -373,7 +373,7 @@ class Interop_Client
}
$soap =& $endpoint_info['client'];
# XXX how do we determine a failure on retreiving/parsing wsdl?
# XXX how do we determine a failure on retrieving/parsing wsdl?
if ($soap->wsdl->fault) {
$fault = $soap->wsdl->fault;
$soap_test->setResult(0,'WSDL',

2
ext/spl/php_spl.c
View File

@ -315,7 +315,7 @@ PHP_FUNCTION(spl_autoload)
RETURN_FALSE;
}
if (file_exts == NULL) { /* autoload_extensions is not intialzed, set to defaults */
if (file_exts == NULL) { /* autoload_extensions is not initialized, set to defaults */
pos = SPL_DEFAULT_FILE_EXTENSIONS;
pos_len = sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1;
} else {

2
ext/standard/tests/strings/dirname_basic.phpt
View File

@ -1,5 +1,5 @@
--TEST--
Test dirname() function : basic funtionality
Test dirname() function : basic functionality
--FILE--
<?php
/* Prototype: string dirname ( string $path );

2
ext/standard/url.c
View File

@ -266,7 +266,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
p = s;
} else {
/* memrchr is a GNU specific extension
Emulate for wide compatability */
Emulate for wide compatibility */
for(p = e; p >= s && *p != ':'; p--);
}

4
sapi/phpdbg/phpdbg_help.c
View File

@ -362,7 +362,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
" **-c** **-c**/my/php.ini Set php.ini file to load" CR
" **-d** **-d**memory_limit=4G Set a php.ini directive" CR
" **-n** Disable default php.ini" CR
" **-q** Supress welcome banner" CR
" **-q** Suppress welcome banner" CR
" **-v** Enable oplog output" CR
" **-s** Enable stepping" CR
" **-b** Disable colour" CR
@ -545,7 +545,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
" $P break ZEND_ADD" CR
" $P b ZEND_ADD" CR
" Break on any occurence of the opcode ZEND_ADD" CR CR
" Break on any occurrence of the opcode ZEND_ADD" CR CR
" $P break del 2" CR
" $P b ~ 2" CR

2
scripts/dev/find_tested.php
View File

@ -88,7 +88,7 @@ function mark_methods_as_tested($method_info, $phpt_files) {
foreach($tested_functions as $tested_function) {
// go through method info array marking this funtion as tested
// go through method info array marking this function as tested
foreach($method_info as &$current_method_record) {
if (strcasecmp($tested_function, $current_method_record[METHOD_NAME]) == 0) {
// matched the method name

2
server-tests-config.php
View File

@ -52,7 +52,7 @@ $conf = array(
/* file extension of pages requested via http
this allows for php to be configured to parse
extensions other than php, usefull for multiple
extensions other than php, useful for multiple
configurations under a single webserver */
'TEST_WEB_EXT' => 'php',

2
win32/build/confutils.js
View File

@ -1521,7 +1521,7 @@ function output_as_table(header, ar_out)
{
var l = header.length;
var cols = 80;
var fixedlenght = "";
var fixedlength = "";
var t = 0;
var i,j,k,m;
var out = "| ";

2
win32/sendmail.h
View File

@ -5,7 +5,7 @@
#endif
#define HOST_NAME_LEN 256
#define MAX_APPNAME_LENGHT 100
#define MAX_APPNAME_LENGTH 100
#define MAIL_BUFFER_SIZE (1024*4) /* 4k buffer */
/* Return values */
#define MIN_ERROR_INDEX 0 /* Always 0 like SUCCESS */