stas Thu, 13 Aug 2009 06:44:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287198
Log:
standardise and clean up string functions parameter parsing
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/php_string.h
U php/php-src/branches/PHP_5_3/ext/standard/string.c
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation3.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation2.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation10.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation11.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation2.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation2.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strpos.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrchr_variation10.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrpos_variation10.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strstr.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/php_string.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/php_string.h 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_string.h 2009-08-13 06:44:50 UTC (rev 287198)
@@ -127,7 +127,7 @@
PHPAPI void php_stripcslashes(char *str, int *len);
PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len TSRMLS_DC);
PHPAPI size_t php_dirname(char *str, size_t len);
-PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len);
+PHPAPI char *php_stristr(char *s, char *t, size_t s_len, size_t t_len);
PHPAPI char *php_str_to_str_ex(char *haystack, int length, char *needle,
int needle_len, char *str, int str_len, int *_new_length, int case_sensitivity, int *replace_count);
PHPAPI char *php_str_to_str(char *haystack, int length, char *needle,
Modified: php/php-src/branches/PHP_5_3/ext/standard/string.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/string.c 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/string.c 2009-08-13 06:44:50 UTC (rev 287198)
@@ -120,7 +120,7 @@
register unsigned char *result = NULL;
size_t i, j;
- result = (char *) safe_emalloc(oldlen * 2, sizeof(char), 1);
+ result = (unsigned char *) safe_emalloc(oldlen * 2, sizeof(char), 1);
for (i = j = 0; i < oldlen; i++) {
result[j++] = hexconvtab[old[i] >> 4];
@@ -131,7 +131,7 @@
if (newlen)
*newlen = oldlen * 2 * sizeof(char);
- return result;
+ return (char *)result;
}
/* }}} */
@@ -193,7 +193,7 @@
return;
}
- result = php_bin2hex(data, datalen, &newlen);
+ result = php_bin2hex((unsigned char *)data, datalen, &newlen);
if (!result) {
RETURN_FALSE;
@@ -711,9 +711,9 @@
char mask[256];
if (what) {
- php_charmask(what, what_len, mask TSRMLS_CC);
+ php_charmask((unsigned char*)what, what_len, mask TSRMLS_CC);
} else {
- php_charmask(" \n\r\t\v\0", 6, mask TSRMLS_CC);
+ php_charmask((unsigned char*)" \n\r\t\v\0", 6, mask TSRMLS_CC);
}
if (mode & 1) {
@@ -1001,36 +1001,37 @@
Splits a string on string separator and return array of components. If limit is positive only limit number of components is returned. If limit is negative all components except the last abs(limit) are returned. */
PHP_FUNCTION(explode)
{
- zval **str, **delim;
+ char *str, *delim;
+ int str_len = 0, delim_len = 0;
long limit = LONG_MAX; /* No limit */
+ zval zdelim, zstr;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ|l", &delim, &str, &limit) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", &delim, &delim_len, &str, &str_len, &limit) == FAILURE) {
return;
}
- convert_to_string_ex(str);
- convert_to_string_ex(delim);
-
- if (! Z_STRLEN_PP(delim)) {
+ if (delim_len == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
RETURN_FALSE;
}
array_init(return_value);
- if (! Z_STRLEN_PP(str)) {
+ if (str_len == 0) {
if (limit >= 0) {
add_next_index_stringl(return_value, "", sizeof("") - 1, 1);
}
return;
}
+ ZVAL_STRINGL(&zstr, str, str_len, 0);
+ ZVAL_STRINGL(&zdelim, delim, delim_len, 0);
if (limit > 1) {
- php_explode(*delim, *str, return_value, limit);
+ php_explode(&zdelim, &zstr, return_value, limit);
} else if (limit < 0) {
- php_explode_negative_limit(*delim, *str, return_value, limit);
+ php_explode_negative_limit(&zdelim, &zstr, return_value, limit);
} else {
- add_index_stringl(return_value, 0, Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);
+ add_index_stringl(return_value, 0, str, str_len, 1);
}
}
/* }}} */
@@ -1262,8 +1263,8 @@
{
unsigned char *c, *e;
- c = s;
- e = c+len;
+ c = (unsigned char *)s;
+ e = (unsigned char *)c+len;
while (c < e) {
*c = toupper(*c);
@@ -1296,7 +1297,7 @@
{
unsigned char *c, *e;
- c = s;
+ c = (unsigned char *)s;
e = c+len;
while (c < e) {
@@ -1528,7 +1529,7 @@
/* {{{ php_stristr
case insensitve strstr */
-PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len)
+PHPAPI char *php_stristr(char *s, char *t, size_t s_len, size_t t_len)
{
php_strtolower(s, s_len);
php_strtolower(t, t_len);
@@ -1574,57 +1575,91 @@
}
/* }}} */
+/* {{{ php_needle_char
+ */
+static int php_needle_char(zval *needle, char *target)
+{
+ switch (Z_TYPE_P(needle)) {
+ case IS_LONG:
+ case IS_BOOL:
+ *target = (char)Z_LVAL_P(needle);
+ return SUCCESS;
+ case IS_NULL:
+ *target = '\0';
+ return SUCCESS;
+ case IS_DOUBLE:
+ *target = (char)(int)Z_DVAL_P(needle);
+ return SUCCESS;
+ case IS_OBJECT:
+ {
+ zval holder = *needle;
+ zval_copy_ctor(&(holder));
+ convert_to_long(&(holder));
+ if(Z_TYPE(holder) != IS_LONG) {
+ return FAILURE;
+ }
+ *target = (char)Z_LVAL(holder);
+ return SUCCESS;
+ }
+ default: {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "needle is not a string or an integer");
+ return FAILURE;
+ }
+ }
+}
+/* }}} */
+
/* {{{ proto string stristr(string haystack, string needle[, bool part])
Finds first occurrence of a string within another, case insensitive */
PHP_FUNCTION(stristr)
{
- zval **haystack, **needle;
+ zval *needle;
+ char *haystack;
+ int haystack_len;
char *found = NULL;
int found_offset;
- char *haystack_orig;
+ char *haystack_dup;
char needle_char[2];
zend_bool part = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ|b", &haystack, &needle, &part) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &haystack, &haystack_len, &needle, &part) == FAILURE) {
return;
}
- SEPARATE_ZVAL(haystack);
- convert_to_string(*haystack);
+ haystack_dup = estrndup(haystack, haystack_len);
- haystack_orig = estrndup(Z_STRVAL_PP(haystack), Z_STRLEN_PP(haystack));
-
- if (Z_TYPE_PP(needle) == IS_STRING) {
+ if (Z_TYPE_P(needle) == IS_STRING) {
char *orig_needle;
- if (!Z_STRLEN_PP(needle)) {
+ if (!Z_STRLEN_P(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
- efree(haystack_orig);
+ efree(haystack_dup);
RETURN_FALSE;
}
- orig_needle = estrndup(Z_STRVAL_PP(needle), Z_STRLEN_PP(needle));
- found = php_stristr(Z_STRVAL_PP(haystack), orig_needle, Z_STRLEN_PP(haystack), Z_STRLEN_PP(needle));
+ orig_needle = estrndup(Z_STRVAL_P(needle), Z_STRLEN_P(needle));
+ found = php_stristr(haystack_dup, orig_needle, haystack_len, Z_STRLEN_P(needle));
efree(orig_needle);
} else {
- SEPARATE_ZVAL(needle);
- convert_to_long(*needle);
- needle_char[0] = (char) Z_LVAL_PP(needle);
+ if(php_needle_char(needle, needle_char) != SUCCESS) {
+ efree(haystack_dup);
+ RETURN_FALSE;
+ }
needle_char[1] = 0;
- found = php_stristr(Z_STRVAL_PP(haystack), needle_char, Z_STRLEN_PP(haystack), 1);
+ found = php_stristr(haystack_dup, needle_char, haystack_len, 1);
}
if (found) {
- found_offset = found - Z_STRVAL_PP(haystack);
+ found_offset = found - haystack_dup;
if (part) {
- RETVAL_STRINGL(haystack_orig, found_offset, 1);
+ RETVAL_STRINGL(haystack, found_offset, 1);
} else {
- RETVAL_STRINGL(haystack_orig + found_offset, Z_STRLEN_PP(haystack) - found_offset, 1);
+ RETVAL_STRINGL(haystack + found_offset, haystack_len - found_offset, 1);
}
} else {
RETVAL_FALSE;
}
- efree(haystack_orig);
+ efree(haystack_dup);
}
/* }}} */
@@ -1632,41 +1667,40 @@
Finds first occurrence of a string within another */
PHP_FUNCTION(strstr)
{
- zval **haystack, **needle;
+ zval *needle;
+ char *haystack;
+ int haystack_len;
char *found = NULL;
char needle_char[2];
long found_offset;
zend_bool part = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ|b", &haystack, &needle, &part) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &haystack, &haystack_len, &needle, &part) == FAILURE) {
return;
}
- SEPARATE_ZVAL(haystack);
- convert_to_string(*haystack);
-
- if (Z_TYPE_PP(needle) == IS_STRING) {
- if (!Z_STRLEN_PP(needle)) {
+ if (Z_TYPE_P(needle) == IS_STRING) {
+ if (!Z_STRLEN_P(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
RETURN_FALSE;
}
- found = php_memnstr(Z_STRVAL_PP(haystack), Z_STRVAL_PP(needle), Z_STRLEN_PP(needle), Z_STRVAL_PP(haystack) + Z_STRLEN_PP(haystack));
+ found = php_memnstr(haystack, Z_STRVAL_P(needle), Z_STRLEN_P(needle), haystack + haystack_len);
} else {
- SEPARATE_ZVAL(needle);
- convert_to_long(*needle);
- needle_char[0] = (char) Z_LVAL_PP(needle);
+ if(php_needle_char(needle, needle_char) != SUCCESS) {
+ RETURN_FALSE;
+ }
needle_char[1] = 0;
- found = php_memnstr(Z_STRVAL_PP(haystack), needle_char, 1, Z_STRVAL_PP(haystack) + Z_STRLEN_PP(haystack));
+ found = php_memnstr(haystack, needle_char, 1, haystack + haystack_len);
}
if (found) {
- found_offset = found - Z_STRVAL_PP(haystack);
+ found_offset = found - haystack;
if (part) {
- RETURN_STRINGL(Z_STRVAL_PP(haystack), found_offset, 1);
+ RETURN_STRINGL(haystack, found_offset, 1);
} else {
- RETURN_STRINGL(found, Z_STRLEN_PP(haystack) - found_offset, 1);
+ RETURN_STRINGL(found, haystack_len - found_offset, 1);
}
}
RETURN_FALSE;
@@ -1681,14 +1715,14 @@
Finds position of first occurrence of a string within another */
PHP_FUNCTION(strpos)
{
- zval **needle;
+ zval *needle;
char *haystack;
char *found = NULL;
char needle_char[2];
long offset = 0;
int haystack_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ|l", &haystack, &haystack_len, &needle, &offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &needle, &offset) == FAILURE) {
return;
}
@@ -1697,19 +1731,20 @@
RETURN_FALSE;
}
- if (Z_TYPE_PP(needle) == IS_STRING) {
- if (!Z_STRLEN_PP(needle)) {
+ if (Z_TYPE_P(needle) == IS_STRING) {
+ if (!Z_STRLEN_P(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
RETURN_FALSE;
}
found = php_memnstr(haystack + offset,
- Z_STRVAL_PP(needle),
- Z_STRLEN_PP(needle),
+ Z_STRVAL_P(needle),
+ Z_STRLEN_P(needle),
haystack + haystack_len);
} else {
- convert_to_long_ex(needle);
- needle_char[0] = (char) Z_LVAL_PP(needle);
+ if(php_needle_char(needle, needle_char) != SUCCESS) {
+ RETURN_FALSE;
+ }
needle_char[1] = 0;
found = php_memnstr(haystack + offset,
@@ -1764,21 +1799,11 @@
php_strtolower(needle_dup, Z_STRLEN_P(needle));
found = php_memnstr(haystack_dup + offset, needle_dup, Z_STRLEN_P(needle), haystack_dup + haystack_len);
} else {
- switch (Z_TYPE_P(needle)) {
- case IS_LONG:
- case IS_BOOL:
- needle_char[0] = tolower((char) Z_LVAL_P(needle));
- break;
- case IS_DOUBLE:
- needle_char[0] = tolower((char) Z_DVAL_P(needle));
- break;
- default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "needle is not a string or an integer");
- efree(haystack_dup);
- RETURN_FALSE;
- break;
-
+ if(php_needle_char(needle, needle_char) != SUCCESS) {
+ efree(haystack_dup);
+ RETURN_FALSE;
}
+ needle_char[0] = tolower(needle_char[0]);
needle_char[1] = '\0';
found = php_memnstr(haystack_dup + offset,
needle_char,
@@ -1803,22 +1828,23 @@
Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strrpos)
{
- zval **zneedle;
+ zval *zneedle;
char *needle, *haystack;
int needle_len, haystack_len;
long offset = 0;
char *p, *e, ord_needle[2];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ|l", &haystack, &haystack_len, &zneedle, &offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &zneedle, &offset) == FAILURE) {
RETURN_FALSE;
}
- if (Z_TYPE_PP(zneedle) == IS_STRING) {
- needle = Z_STRVAL_PP(zneedle);
- needle_len = Z_STRLEN_PP(zneedle);
+ if (Z_TYPE_P(zneedle) == IS_STRING) {
+ needle = Z_STRVAL_P(zneedle);
+ needle_len = Z_STRLEN_P(zneedle);
} else {
- convert_to_long_ex(zneedle);
- ord_needle[0] = (char)(Z_LVAL_PP(zneedle) & 0xFF);
+ if(php_needle_char(zneedle, ord_needle) != SUCCESS) {
+ RETURN_FALSE;
+ }
ord_needle[1] = '\0';
needle = ord_needle;
needle_len = 1;
@@ -1875,23 +1901,24 @@
Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strripos)
{
- zval **zneedle;
+ zval *zneedle;
char *needle, *haystack;
int needle_len, haystack_len;
long offset = 0;
char *p, *e, ord_needle[2];
char *needle_dup, *haystack_dup;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ|l", &haystack, &haystack_len, &zneedle, &offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &haystack, &haystack_len, &zneedle, &offset) == FAILURE) {
RETURN_FALSE;
}
- if (Z_TYPE_PP(zneedle) == IS_STRING) {
- needle = Z_STRVAL_PP(zneedle);
- needle_len = Z_STRLEN_PP(zneedle);
+ if (Z_TYPE_P(zneedle) == IS_STRING) {
+ needle = Z_STRVAL_P(zneedle);
+ needle_len = Z_STRLEN_P(zneedle);
} else {
- convert_to_long_ex(zneedle);
- ord_needle[0] = (char)(Z_LVAL_PP(zneedle) & 0xFF);
+ if(php_needle_char(zneedle, ord_needle) != SUCCESS) {
+ RETURN_FALSE;
+ }
ord_needle[1] = '\0';
needle = ord_needle;
needle_len = 1;
@@ -1978,21 +2005,25 @@
Finds the last occurrence of a character in a string within another */
PHP_FUNCTION(strrchr)
{
- zval **needle;
+ zval *needle;
char *haystack;
char *found = NULL;
long found_offset;
int haystack_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sZ", &haystack, &haystack_len, &needle) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &haystack, &haystack_len, &needle) == FAILURE) {
return;
}
- if (Z_TYPE_PP(needle) == IS_STRING) {
- found = zend_memrchr(haystack, *Z_STRVAL_PP(needle), haystack_len);
+ if (Z_TYPE_P(needle) == IS_STRING) {
+ found = zend_memrchr(haystack, *Z_STRVAL_P(needle), haystack_len);
} else {
- convert_to_long_ex(needle);
- found = zend_memrchr(haystack, (char) Z_LVAL_PP(needle), haystack_len);
+ char needle_chr;
+ if(php_needle_char(needle, &needle_chr) != SUCCESS) {
+ RETURN_FALSE;
+ }
+
+ found = zend_memrchr(haystack, needle_chr, haystack_len);
}
if (found) {
@@ -2060,31 +2091,18 @@
Returns split line */
PHP_FUNCTION(chunk_split)
{
- zval **p_chunklen = NULL, **p_ending = NULL;
char *str;
char *result;
char *end = "\r\n";
int endlen = 2;
long chunklen = 76;
int result_len;
- int argc = ZEND_NUM_ARGS();
int str_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ZZ", &str, &str_len, &p_chunklen, &p_ending) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len, &chunklen, &end, &endlen) == FAILURE) {
return;
}
- if (argc > 1) {
- convert_to_long_ex(p_chunklen);
- chunklen = Z_LVAL_PP(p_chunklen);
- }
-
- if (argc > 2) {
- convert_to_string_ex(p_ending);
- end = Z_STRVAL_PP(p_ending);
- endlen = Z_STRLEN_PP(p_ending);
- }
-
if (chunklen <= 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length should be greater than zero");
RETURN_FALSE;
@@ -3110,7 +3128,7 @@
wlength = strlen(what);
}
- php_charmask(what, wlength, flags TSRMLS_CC);
+ php_charmask((unsigned char *)what, wlength, flags TSRMLS_CC);
for (source = str, end = source + length, target = new_str; source < end; source++) {
c = *source;
@@ -4104,11 +4122,11 @@
PHP_FUNCTION(parse_str)
{
char *arg;
- zval **arrayArg = NULL;
+ zval *arrayArg = NULL;
char *res = NULL;
int arglen;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Z", &arg, &arglen, &arrayArg) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &arg, &arglen, &arrayArg) == FAILURE) {
return;
}
@@ -4124,10 +4142,10 @@
sapi_module.treat_data(PARSE_STRING, res, &tmp TSRMLS_CC);
} else {
/* Clear out the array that was passed in. */
- zval_dtor(*arrayArg);
- array_init(*arrayArg);
+ zval_dtor(arrayArg);
+ array_init(arrayArg);
- sapi_module.treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC);
+ sapi_module.treat_data(PARSE_STRING, res, arrayArg TSRMLS_CC);
}
}
/* }}} */
@@ -4995,7 +5013,7 @@
}
if (char_list) {
- php_charmask(char_list, char_list_len, ch TSRMLS_CC);
+ php_charmask((unsigned char *)char_list, char_list_len, ch TSRMLS_CC);
}
p = str;
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -110,16 +110,24 @@
bool(false)
-- Iteration 6 --
-Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
-bool(false)
+Warning: chunk_split() expects parameter 2 to be long, array given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 7 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+
+Warning: chunk_split() expects parameter 2 to be long, array given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 8 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+
+Warning: chunk_split() expects parameter 2 to be long, array given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 9 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+
+Warning: chunk_split() expects parameter 2 to be long, array given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 10 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+
+Warning: chunk_split() expects parameter 2 to be long, array given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 11 --
Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
@@ -142,24 +150,24 @@
bool(false)
-- Iteration 17 --
-Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
-bool(false)
+Warning: chunk_split() expects parameter 2 to be long, string given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 18 --
-Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
-bool(false)
+Warning: chunk_split() expects parameter 2 to be long, string given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 19 --
-Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
-bool(false)
+Warning: chunk_split() expects parameter 2 to be long, string given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 20 --
-Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
-bool(false)
+Warning: chunk_split() expects parameter 2 to be long, string given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 21 --
-Notice: Object of class MyClass could not be converted to int in %schunk_split_variation2.php on line %d
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+Warning: chunk_split() expects parameter 2 to be long, object given in %schunk_split_variation2.php on line %d
+NULL
-- Iteration 22 --
Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
@@ -169,5 +177,7 @@
Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d
bool(false)
-- Iteration 24 --
-string(%d) "%s"
+
+Warning: chunk_split() expects parameter 2 to be long, resource given in %schunk_split_variation2.php on line %d
+NULL
===DONE===
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation3.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation3.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -113,24 +113,24 @@
string(40) "This0.5 is 0.5simp0.5le s0.5trin0.5g.0.5"
-- Iteration 10 --
-Notice: Array to string conversion in %s on line %d
-string(52) "ThisArray is ArraysimpArrayle sArraytrinArrayg.Array"
+Warning: chunk_split() expects parameter 3 to be string, array given in %s on line %d
+NULL
-- Iteration 11 --
-Notice: Array to string conversion in %s on line %d
-string(52) "ThisArray is ArraysimpArrayle sArraytrinArrayg.Array"
+Warning: chunk_split() expects parameter 3 to be string, array given in %s on line %d
+NULL
-- Iteration 12 --
-Notice: Array to string conversion in %s on line %d
-string(52) "ThisArray is ArraysimpArrayle sArraytrinArrayg.Array"
+Warning: chunk_split() expects parameter 3 to be string, array given in %s on line %d
+NULL
-- Iteration 13 --
-Notice: Array to string conversion in %s on line %d
-string(52) "ThisArray is ArraysimpArrayle sArraytrinArrayg.Array"
+Warning: chunk_split() expects parameter 3 to be string, array given in %s on line %d
+NULL
-- Iteration 14 --
-Notice: Array to string conversion in %s on line %d
-string(52) "ThisArray is ArraysimpArrayle sArraytrinArrayg.Array"
+Warning: chunk_split() expects parameter 3 to be string, array given in %s on line %d
+NULL
-- Iteration 15 --
string(22) "This is simple string."
-- Iteration 16 --
@@ -154,5 +154,7 @@
-- Iteration 25 --
string(22) "This is simple string."
-- Iteration 26 --
-string(%d) "ThisResource id #%d is Resource id #%dsimpResource id #%dle sResource id #%dtrinResource id #%dg.Resource id #%d"
+
+Warning: chunk_split() expects parameter 3 to be string, resource given in %s on line %d
+NULL
Done
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation1.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation1.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -133,25 +133,16 @@
}
-- Iteration 10 --
-Notice: Array to string conversion in %s on line %d
-array(1) {
- [0]=>
- string(41) "piece1 piece2 piece3 piece4 piece5 piece6"
-}
+Warning: explode() expects parameter 1 to be string, array given in %s on line %d
+NULL
-- Iteration 11 --
-Notice: Array to string conversion in %s on line %d
-array(1) {
- [0]=>
- string(41) "piece1 piece2 piece3 piece4 piece5 piece6"
-}
+Warning: explode() expects parameter 1 to be string, array given in %s on line %d
+NULL
-- Iteration 12 --
-Notice: Array to string conversion in %s on line %d
-array(1) {
- [0]=>
- string(41) "piece1 piece2 piece3 piece4 piece5 piece6"
-}
+Warning: explode() expects parameter 1 to be string, array given in %s on line %d
+NULL
-- Iteration 13 --
array(2) {
[0]=>
@@ -188,10 +179,9 @@
string(41) "piece1 piece2 piece3 piece4 piece5 piece6"
}
-- Iteration 20 --
-array(1) {
- [0]=>
- string(%d) "%s"
-}
+
+Warning: explode() expects parameter 1 to be string, resource given in %s on line %d
+NULL
-- Iteration 21 --
Warning: explode(): Empty delimiter in %s on line %d
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation2.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/explode_variation2.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -131,25 +131,16 @@
}
-- Iteration 10 --
-Notice: Array to string conversion in %s on line %d
-array(1) {
- [0]=>
- string(5) "Array"
-}
+Warning: explode() expects parameter 2 to be string, array given in %s on line %d
+NULL
-- Iteration 11 --
-Notice: Array to string conversion in %s on line %d
-array(1) {
- [0]=>
- string(5) "Array"
-}
+Warning: explode() expects parameter 2 to be string, array given in %s on line %d
+NULL
-- Iteration 12 --
-Notice: Array to string conversion in %s on line %d
-array(1) {
- [0]=>
- string(5) "Array"
-}
+Warning: explode() expects parameter 2 to be string, array given in %s on line %d
+NULL
-- Iteration 13 --
array(1) {
[0]=>
@@ -188,14 +179,9 @@
string(6) "object"
}
-- Iteration 20 --
-array(3) {
- [0]=>
- string(8) "Resource"
- [1]=>
- string(2) "id"
- [2]=>
- string(%d) "#%d"
-}
+
+Warning: explode() expects parameter 2 to be string, resource given in %s on line %d
+NULL
-- Iteration 21 --
array(1) {
[0]=>
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation1.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation1.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -117,19 +117,11 @@
int(8)
bool(false)
-- Iteration 12 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
+int(8)
bool(false)
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
-bool(false)
-- Iteration 13 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
+int(8)
bool(false)
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
-bool(false)
-- Iteration 14 --
int(8)
bool(false)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation10.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation10.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation10.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -160,7 +160,7 @@
-- Iteration 19 --
-Warning: stripos(): needle is not a string or an integer in %s on line %d
+Notice: Object of class sample could not be converted to int in %s on line %d
bool(false)
-- Iteration 20 --
@@ -170,13 +170,9 @@
bool(false)
-- Iteration 22 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 23 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 24 --
@@ -185,12 +181,8 @@
%s
-- Iteration 25 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 26 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
*** Done ***
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation11.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation11.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation11.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -170,10 +170,10 @@
bool(false)
-- Iteration 19 --
-Warning: stripos(): needle is not a string or an integer in %s on line %d
+Notice: Object of class sample could not be converted to int in %s on line %d
bool(false)
-Warning: stripos(): needle is not a string or an integer in %s on line %d
+Notice: Object of class sample could not be converted to int in %s on line %d
bool(false)
-- Iteration 20 --
bool(false)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation2.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stripos_variation2.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -119,18 +119,10 @@
int(10)
int(10)
-- Iteration 12 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 13 --
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-
-Warning: stripos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 14 --
bool(false)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -22,14 +22,14 @@
Warning: stristr() expects at least 2 parameters, 0 given in %s on line %d
NULL
-Notice: Array to string conversion in %s on line %d
+Warning: stristr() expects parameter 1 to be string, array given in %s on line %d
+NULL
-Warning: stristr(): Empty delimiter in %s on line %d
+Warning: stristr(): needle is not a string or an integer in %s on line %d
bool(false)
-bool(false)
-Notice: Array to string conversion in %s on line %d
-bool(false)
+Warning: stristr() expects parameter 1 to be string, array given in %s on line %d
+NULL
string(11) "tEsT sTrInG"
string(6) "sTrInG"
string(6) "sTrInG"
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation1.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation1.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -98,16 +98,16 @@
bool(false)
-- Iteration 8 --
-Notice: Array to string conversion in %s on line %d2
-bool(false)
+Warning: stristr() expects parameter 1 to be string, array given in %s on line %d2
+NULL
-- Iteration 9 --
-Notice: Array to string conversion in %s on line %d2
-bool(false)
+Warning: stristr() expects parameter 1 to be string, array given in %s on line %d2
+NULL
-- Iteration 10 --
-Notice: Array to string conversion in %s on line %d2
-bool(false)
+Warning: stristr() expects parameter 1 to be string, array given in %s on line %d2
+NULL
-- Iteration 11 --
bool(false)
-- Iteration 12 --
@@ -123,7 +123,9 @@
-- Iteration 17 --
string(7) " object"
-- Iteration 18 --
-string(%d) " id #%d"
+
+Warning: stristr() expects parameter 1 to be string, resource given in %s on line %d2
+NULL
-- Iteration 19 --
bool(false)
-- Iteration 20 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation2.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/stristr_variation2.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -97,10 +97,16 @@
-- Iteration 7 --
bool(false)
-- Iteration 8 --
+
+Warning: stristr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 9 --
+
+Warning: stristr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 10 --
+
+Warning: stristr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 11 --
bool(false)
@@ -119,7 +125,9 @@
Notice: Object of class sample could not be converted to int in %s on line %d
bool(false)
-- Iteration 18 --
-%s
+
+Warning: stristr(): needle is not a string or an integer in %s on line %d
+bool(false)
-- Iteration 19 --
bool(false)
-- Iteration 20 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strpos.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strpos.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strpos.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -23,7 +23,7 @@
var_dump( @strpos("\\\\a", "\\a") );
-echo "\n*** Testing stropos() to find various needles and a long string ***\n";
+echo "\n*** Testing strpos() to find various needles and a long string ***\n";
$string =
"Hello world,012033 -3.3445 NULL TRUE FALSE\0 abcd\xxyz \x000 octal\n
abcd$:Hello world";
@@ -214,7 +214,7 @@
bool(false)
int(1)
-*** Testing stropos() to find various needles and a long string ***
+*** Testing strpos() to find various needles and a long string ***
Position of 'Hello world' is => int(0)
Position of 'WORLD' is => bool(false)
Position of ' ' is => int(46)
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrchr_variation10.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrchr_variation10.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrchr_variation10.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -150,14 +150,24 @@
-- Iteration 9 --
bool(false)
-- Iteration 10 --
+
+Warning: strrchr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 11 --
+
+Warning: strrchr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 12 --
+
+Warning: strrchr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 13 --
+
+Warning: strrchr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 14 --
+
+Warning: strrchr(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 15 --
bool(false)
@@ -180,7 +190,9 @@
-- Iteration 23 --
bool(false)
-- Iteration 24 --
-%s
+
+Warning: strrchr(): needle is not a string or an integer in %s on line %d
+bool(false)
-- Iteration 25 --
bool(false)
-- Iteration 26 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrpos_variation10.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrpos_variation10.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strrpos_variation10.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -112,14 +112,24 @@
-- Iteration 9 --
bool(false)
-- Iteration 10 --
+
+Warning: strrpos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 11 --
+
+Warning: strrpos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 12 --
+
+Warning: strrpos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 13 --
+
+Warning: strrpos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 14 --
+
+Warning: strrpos(): needle is not a string or an integer in %s on line %d
bool(false)
-- Iteration 15 --
bool(false)
@@ -142,7 +152,9 @@
-- Iteration 23 --
bool(false)
-- Iteration 24 --
-%s
+
+Warning: strrpos(): needle is not a string or an integer in %s on line %d
+bool(false)
-- Iteration 25 --
bool(false)
-- Iteration 26 --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strstr.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strstr.phpt 2009-08-13 05:02:25 UTC (rev 287197)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/strstr.phpt 2009-08-13 06:44:50 UTC (rev 287198)
@@ -330,15 +330,19 @@
-- passing an array as string and needle --
-Notice: Array to string conversion in %s on line %d
-bool(false)
+Warning: strstr() expects parameter 1 to be string, array given in %s on line %d
+NULL
string(27) "?world,!$%**()%**[][[[&@#~!"
string(20) "!$%**()%**[][[[&@#~!"
-- passing Resources as string and needle --
-%s
-%s
+Warning: strstr() expects parameter 1 to be string, resource given in %s on line %d
+NULL
+
+Warning: strstr() expects parameter 1 to be string, resource given in %s on line %d
+NULL
+
-- Posiibilities with null --
bool(false)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
