Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_builtin_functions.c /tests 009.phpt php-src/ext/reflection/tests 027.phpt php-src/ext/standard/tests/class_object get_class_error_001.phpt get_class_variation_001.phpt
[email protected] (Dmitry Stogov) Mon, 16 Mar 2009 17:56:00 +0300
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <[email protected]> |
ops. thanks. I'll do it.
Dmitry.
Marcus Boerger wrote:
> Hello Dmitry,
>
> you need to fix the EXPECTF sections, as you put in the full path and the
> actual line number instead of using '%s on line %d'.
>
> marcus
>
> Monday, March 16, 2009, 10:52:26 AM, you wrote:
>
>> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_error_001.phpt?r1=1.4&r2=1.5&diff_format=u
>> Index: php-src/ext/standard/tests/class_object/get_class_error_001.phpt
>> diff -u
>> php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.4
>> php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.5
>> --- php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.4 Wed Jul 23 19:49:07 2008
>> +++ php-src/ext/standard/tests/class_object/get_class_error_001.phpt Mon Mar 16 09:52:25 2009
>> @@ -24,5 +24,5 @@
>> -- Testing get_class() function with more than expected no. of arguments --
>>
>> Warning: get_class() expects at most 1 parameter, 2 given in %s on line %d
>> -NULL
>> +bool(false)
>> Done
>> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_variation_001.phpt?r1=1.4&r2=1.5&diff_format=u
>> Index: php-src/ext/standard/tests/class_object/get_class_variation_001.phpt
>> diff -u
>> php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.4
>> php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.5
>> ---
>> php-src/ext/standard/tests/class_object/get_class_variation_001.phpt:1.4 Tue Aug 19 02:51:28 2008
>> +++ php-src/ext/standard/tests/class_object/get_class_variation_001.phpt Mon Mar 16 09:52:25 2009
>> @@ -76,147 +76,147 @@
>> --EXPECTF--
>> *** Testing get_class() : usage variations ***
>>
>> -Notice: Undefined variable: undefined_var in %s on line %d
>> +Notice: Undefined variable: undefined_var in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 58
>>
>> -Notice: Undefined variable: unset_var in %s on line %d
>> +Notice: Undefined variable: unset_var in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 61
>>
>> Arg value: 0 (type: integer)
>>
>> -Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, integer given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 1 (type: integer)
>>
>> -Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, integer given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 12345 (type: integer)
>>
>> -Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, integer given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: -2345 (type: integer)
>>
>> -Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, integer given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 10.5 (type: double)
>>
>> -Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, double given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: -10.5 (type: double)
>>
>> -Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, double given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 101234567000 (type: double)
>>
>> -Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, double given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 1.07654321E-9 (type: double)
>>
>> -Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, double given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 0.5 (type: double)
>>
>> -Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, double given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> -Notice: Array to string conversion in %s on line %d
>> +Notice: Array to string conversion in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 67
>>
>> Arg value: Array (type: array)
>>
>> -Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, array given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> -Notice: Array to string conversion in %s on line %d
>> +Notice: Array to string conversion in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 67
>>
>> Arg value: Array (type: array)
>>
>> -Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, array given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> -Notice: Array to string conversion in %s on line %d
>> +Notice: Array to string conversion in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 67
>>
>> Arg value: Array (type: array)
>>
>> -Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, array given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> -Notice: Array to string conversion in %s on line %d
>> +Notice: Array to string conversion in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 67
>>
>> Arg value: Array (type: array)
>>
>> -Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, array given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> -Notice: Array to string conversion in %s on line %d
>> +Notice: Array to string conversion in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 67
>>
>> Arg value: Array (type: array)
>>
>> -Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, array given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: NULL)
>>
>> -Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, null given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: NULL)
>>
>> -Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, null given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 1 (type: boolean)
>>
>> -Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, boolean given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: boolean)
>>
>> -Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, boolean given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: 1 (type: boolean)
>>
>> -Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, boolean given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: boolean)
>>
>> -Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, boolean given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: unicode)
>>
>> -Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, Unicode string
>> given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: unicode)
>>
>> -Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, Unicode string
>> given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: string (type: unicode)
>>
>> -Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, Unicode string
>> given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: string (type: unicode)
>>
>> -Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, Unicode string
>> given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: NULL)
>>
>> -Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, null given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>>
>> Arg value: (type: NULL)
>>
>> -Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
>> -NULL
>> +Warning: get_class() expects parameter 1 to be object, null given in
>> /home/dmitry/php/php6/ext/standard/tests/class_object/get_class_variation_001.php on line 68
>> +bool(false)
>> Done
>> http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/027.phpt?r1=1.1&r2=1.2&diff_format=u
>> Index: php-src/ext/reflection/tests/027.phpt
>> diff -u php-src/ext/reflection/tests/027.phpt:1.1
>> php-src/ext/reflection/tests/027.phpt:1.2
>> --- php-src/ext/reflection/tests/027.phpt:1.1 Sat Jan 3 20:40:22 2009
>> +++ php-src/ext/reflection/tests/027.phpt Mon Mar 16 09:52:25 2009
>> @@ -51,7 +51,7 @@
>> }
>> }
>>
>> -NULL
>> +bool(false)
>> unicode(9) "{closure}"
>> bool(true)
>> Closure [ <user> public method func ] {
>> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.400&r2=1.401&diff_format=u
>> Index: ZendEngine2/zend_builtin_functions.c
>> diff -u ZendEngine2/zend_builtin_functions.c:1.400
>> ZendEngine2/zend_builtin_functions.c:1.401
>> --- ZendEngine2/zend_builtin_functions.c:1.400 Sun Mar 8 17:23:43 2009
>> +++ ZendEngine2/zend_builtin_functions.c Mon Mar 16 09:52:26 2009
>> @@ -17,7 +17,7 @@
>>
>> +----------------------------------------------------------------------+
>> */
>>
>> -/* $Id: zend_builtin_functions.c,v 1.400 2009/03/08 17:23:43 felipe Exp $ */
>> +/* $Id: zend_builtin_functions.c,v 1.401 2009/03/16 09:52:26 dmitry Exp $ */
>>
>> #include "zend.h"
>> #include "zend_API.h"
>> @@ -716,7 +716,7 @@
>> int dup;
>>
>> if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|o", &obj) == FAILURE) {
>> - return;
>> + RETURN_FALSE;
>> }
>>
>> if (!obj) {
>> http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/009.phpt?r1=1.3&r2=1.4&diff_format=u
>> Index: ZendEngine2/tests/009.phpt
>> diff -u ZendEngine2/tests/009.phpt:1.3 ZendEngine2/tests/009.phpt:1.4
>> --- ZendEngine2/tests/009.phpt:1.3 Sun Jul 27 17:37:07 2008
>> +++ ZendEngine2/tests/009.phpt Mon Mar 16 09:52:26 2009
>> @@ -42,7 +42,7 @@
>> bool(false)
>>
>> Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d
>> -NULL
>> +bool(false)
>> unicode(3) "foo"
>> unicode(4) "foo2"
>> Done
>
>
>
>
> Best regards,
> Marcus
>