[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Jun 15 01:33:04 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1502r2=1.1503diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1502 ZendEngine2/ChangeLog:1.1503 --- ZendEngine2/ChangeLog:1.1502Sat Jun 13 01:33:03 2009 +++ ZendEngine2/ChangeLog Mon Jun 15 01:33:03 2009 @@ -1,3 +1,47 @@ +2009-06-14 andy wharmby whar...@uk.ibm.com + +* (PHP_5_2) + tests/function_exists_basic.phpt + tests/function_exists_error.phpt + tests/function_exists_variation1.phpt + tests/get_defined_functions_basic.phpt + tests/get_defined_functions_error.phpt: + Basic tests for function_exists() and get_defined_functions(). Tested on + Windows, Linux and Linux 64 bit. + +* tests/function_exists_basic.phpt + tests/function_exists_basic.phpt + tests/function_exists_error.phpt + tests/function_exists_error.phpt + tests/function_exists_variation1.phpt + tests/function_exists_variation1.phpt + tests/get_defined_functions_basic.phpt + tests/get_defined_functions_basic.phpt + tests/get_defined_functions_error.phpt + tests/get_defined_functions_error.phpt: + + Basic tests for function_exists() and get_defined_functions(). Tested on + Windows, Linux and Linux 64 bit. + +* tests/function_exists_basic.phpt + tests/function_exists_basic.phpt + tests/function_exists_error.phpt + tests/function_exists_error.phpt + tests/function_exists_variation1.phpt + tests/function_exists_variation1.phpt + tests/get_defined_functions_basic.phpt + tests/get_defined_functions_basic.phpt + tests/get_defined_functions_error.phpt + tests/get_defined_functions_error.phpt: + + file function_exists_basic.phpt was initially added on branch PHP_5_3. + +2009-06-14 Pierre-Alain Joye pierre@gmail.com + +* zend_execute.h + zend_execute.h: + - MF53: fix build (void alarm) + 2009-06-12 Felipe Pena felipe...@gmail.com * zend_object_handlers.c @@ -29122,7 +29166,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1502 2009/06/13 01:33:03 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1503 2009/06/15 01:33:03 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -30846,7 +30890,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1502 2009/06/13 01:33:03 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1503 2009/06/15 01:33:03 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: phpruntests /tests/configuration rtIniAsCommandLineArgsTest.php
zoe Sun Jun 14 10:38:30 2009 UTC Modified files: /phpruntests/tests/configurationrtIniAsCommandLineArgsTest.php Log: fix to allow double equals in ini setting http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php?r1=1.2r2=1.3diff_format=u Index: phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php diff -u phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php:1.2 phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php:1.3 --- phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php:1.2 Mon Apr 20 20:50:39 2009 +++ phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php Sun Jun 14 10:38:30 2009 @@ -63,5 +63,15 @@ $iniSet-setBase(); $addStr = $iniSet-settingsToArguments(array('af=be=blah'), $iniSet-getBasePhpDArgs()); } + +public function testValidDoubleEquals() +{ +$iniSet = new rtIniAsCommandLineArgs(); +$iniSet-setBase(); +$addStr = $iniSet-settingsToArguments(array('af=='), $iniSet-getBasePhpDArgs()); +$last3= addslashes(substr($addStr, -3)); + +$this-assertEquals('==\', $last3); +} } ? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration rtIniAsCommandLineArgs.php
zoe Sun Jun 14 10:39:02 2009 UTC Modified files: /phpruntests/src/configuration rtIniAsCommandLineArgs.php Log: fix to allow double equals in ini setting http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtIniAsCommandLineArgs.php?r1=1.4r2=1.5diff_format=u Index: phpruntests/src/configuration/rtIniAsCommandLineArgs.php diff -u phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.4 phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.5 --- phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.4Mon May 25 08:56:23 2009 +++ phpruntests/src/configuration/rtIniAsCommandLineArgs.phpSun Jun 14 10:39:02 2009 @@ -90,9 +90,9 @@ return false; } -//test for == +//test for ==, which is allowed if (strncmp($parts[1], '=', 1) === 0) { -return false; +return true; } //test for a=b=c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json/tests json_decode_basic.phpt json_decode_error.phpt json_encode_basic.phpt json_encode_basic_utf8.phpt json_encode_error.phpt
wharmby Sun Jun 14 12:08:26 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/json/tests json_decode_error.phpt json_encode_error.phpt json_encode_basic_utf8.phpt json_decode_basic.phpt json_encode_basic.phpt Log: New json extension tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_decode_error.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_decode_error.phpt +++ php-src/ext/json/tests/json_decode_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_error.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_encode_error.phpt +++ php-src/ext/json/tests/json_encode_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_basic_utf8.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_encode_basic_utf8.phpt +++ php-src/ext/json/tests/json_encode_basic_utf8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_decode_basic.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_decode_basic.phpt +++ php-src/ext/json/tests/json_decode_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_basic.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_encode_basic.phpt +++ php-src/ext/json/tests/json_encode_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json/tests json_decode_basic.phpt json_decode_error.phpt json_encode_basic.phpt json_encode_basic_utf8.phpt json_encode_error.phpt
wharmby Sun Jun 14 12:08:28 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/json/tests json_encode_basic.phpt json_encode_error.phpt json_decode_basic.phpt json_encode_basic_utf8.phpt json_decode_error.phpt Log: New json extension tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_basic.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_encode_basic.phpt +++ php-src/ext/json/tests/json_encode_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_error.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_encode_error.phpt +++ php-src/ext/json/tests/json_encode_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_decode_basic.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_decode_basic.phpt +++ php-src/ext/json/tests/json_decode_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_basic_utf8.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_encode_basic_utf8.phpt +++ php-src/ext/json/tests/json_encode_basic_utf8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_decode_error.phpt?view=markuprev=1.1 Index: php-src/ext/json/tests/json_decode_error.phpt +++ php-src/ext/json/tests/json_decode_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json/tests json_decode_basic.phpt json_decode_error.phpt json_encode_basic.phpt json_encode_basic_utf8.phpt json_encode_error.phpt
wharmby Sun Jun 14 12:08:30 2009 UTC Modified files: /php-src/ext/json/tests json_encode_basic_utf8.phpt json_decode_basic.phpt json_encode_basic.phpt json_encode_error.phpt json_decode_error.phpt Log: New json extension tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_encode_basic_utf8.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/json/tests/json_encode_basic_utf8.phpt diff -u /dev/null php-src/ext/json/tests/json_encode_basic_utf8.phpt:1.2 --- /dev/null Sun Jun 14 12:08:30 2009 +++ php-src/ext/json/tests/json_encode_basic_utf8.phpt Sun Jun 14 12:08:30 2009 @@ -0,0 +1,26 @@ +--TEST-- +Test json_encode() function : basic functionality with UTF8 string input +--SKIPIF-- +?php +if (!extension_loaded(json)) { + die('skip JSON extension not available in this build'); +} +? +--FILE-- +?php +/* Prototype : string json_encode ( mixed $value ) + * Description: Returns the JSON representation of a value + * Source code: ext/json/php_json.c + * Alias to functions: + */ +echo *** Testing json_encode() : basic functionality with UTF-8 input***\n; + +$utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); +var_dump(json_encode($utf8_string)); + +? +===Done=== +--EXPECTF-- +*** Testing json_encode() : basic functionality with UTF-8 input*** +string(103) \u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002 +===Done=== http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/json_decode_basic.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/json/tests/json_decode_basic.phpt diff -u /dev/null php-src/ext/json/tests/json_decode_basic.phpt:1.2 --- /dev/null Sun Jun 14 12:08:30 2009 +++ php-src/ext/json/tests/json_decode_basic.phpt Sun Jun 14 12:08:30 2009 @@ -0,0 +1,187 @@ +--TEST-- +Test json_decode() function : basic functionality +--SKIPIF-- +?php +if (!extension_loaded(json)) { + die('skip JSON extension not available in this build'); +} +? +--FILE-- +?php +/* Prototype : mixed json_decode ( string $json [, bool $assoc ] ) + * Description: Decodes a JSON string + * Source code: ext/json/php_json.c + * Alias to functions: + */ +echo *** Testing json_decode() : basic functionality ***\n; + +// array with different values for $string +$inputs = array ( + '0', + '123', + '-123', + '2147483647', + '-2147483648', + '123.456', + '1230', + '-1230', + 'true', + 'false', + 'null', + 'abc', + 'Hello World\r\n', + '[]', + '[1,2,3,4,5]', + '{myInt:99,myFloat:123.45,myNull:null,myBool:true,myString:Hello World}', + '{Jan:31,Feb:29,Mar:31,April:30,May:31,June:30}', + '', + '{}' +); + +// loop through with each element of the $inputs array to test json_decode() function +$count = 1; +foreach($inputs as $input) { + echo -- Iteration $count --\n; + var_dump(json_decode($input)); + var_dump(json_decode($input, TRUE)); + $count ++; +} + +? +===DONE=== +--EXPECTF-- +*** Testing json_decode() : basic functionality *** +-- Iteration 1 -- +int(0) +int(0) +-- Iteration 2 -- +int(123) +int(123) +-- Iteration 3 -- +int(-123) +int(-123) +-- Iteration 4 -- +int(2147483647) +int(2147483647) +-- Iteration 5 -- +int(-2147483648) +int(-2147483648) +-- Iteration 6 -- +float(123.456) +float(123.456) +-- Iteration 7 -- +int(1230) +int(1230) +-- Iteration 8 -- +int(-1230) +int(-1230) +-- Iteration 9 -- +bool(true) +bool(true) +-- Iteration 10 -- +bool(false) +bool(false) +-- Iteration 11 -- +NULL +NULL +-- Iteration 12 -- +unicode(3) abc +unicode(3) abc +-- Iteration 13 -- +unicode(13) Hello World + +unicode(13) Hello World + +-- Iteration 14 -- +array(0) { +} +array(0) { +} +-- Iteration 15 -- +array(5) { + [0]= + int(1) + [1]= + int(2) + [2]= + int(3) + [3]= + int(4) + [4]= + int(5) +} +array(5) { + [0]= + int(1) + [1]= + int(2) + [2]= + int(3) + [3]= + int(4) + [4]= + int(5) +} +-- Iteration 16 -- +object(stdClass)#%d (5) { + [umyInt]= + int(99) + [umyFloat]= + float(123.45) + [umyNull]= + NULL + [umyBool]= + bool(true) + [umyString]= + unicode(11) Hello World +} +array(5) { + [umyInt]= + int(99) + [umyFloat]= + float(123.45) + [umyNull]= + NULL + [umyBool]= + bool(true) + [umyString]= + unicode(11) Hello World +} +-- Iteration 17 -- +object(stdClass)#%d (6) { + [uJan]= + int(31) + [uFeb]= + int(29) + [uMar]= + int(31) + [uApril]= + int(30) + [uMay]= + int(31) + [uJune]= + int(30) +} +array(6) { + [uJan]= + int(31) + [uFeb]= + int(29) +
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom document.c
iliaa Sun Jun 14 13:13:35 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/domdocument.c Log: MFB: Fixed bug #48512 (DOMDocument::validate() fails with both a E_NOTICE and E_WARN if no DTD) http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5.2.16r2=1.68.2.3.2.5.2.17diff_format=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.68.2.3.2.5.2.16 php-src/ext/dom/document.c:1.68.2.3.2.5.2.17 --- php-src/ext/dom/document.c:1.68.2.3.2.5.2.16Tue Apr 7 15:32:12 2009 +++ php-src/ext/dom/document.c Sun Jun 14 13:13:35 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: document.c,v 1.68.2.3.2.5.2.16 2009/04/07 15:32:12 rrichards Exp $ */ +/* $Id: document.c,v 1.68.2.3.2.5.2.17 2009/06/14 13:13:35 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1936,11 +1936,7 @@ } DOM_GET_OBJ(docp, id, xmlDocPtr, intern); - - if (docp-intSubset == NULL) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, No DTD given in XML-Document); - } - + cvp = xmlNewValidCtxt(); cvp-userData = NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testgroup rtPhpTestGroup.php
zoe Sun Jun 14 13:52:21 2009 UTC Modified files: /phpruntests/src/testgroup rtPhpTestGroup.php Log: remove debug echo http://cvs.php.net/viewvc.cgi/phpruntests/src/testgroup/rtPhpTestGroup.php?r1=1.8r2=1.9diff_format=u Index: phpruntests/src/testgroup/rtPhpTestGroup.php diff -u phpruntests/src/testgroup/rtPhpTestGroup.php:1.8 phpruntests/src/testgroup/rtPhpTestGroup.php:1.9 --- phpruntests/src/testgroup/rtPhpTestGroup.php:1.8Sun Jun 7 11:06:51 2009 +++ phpruntests/src/testgroup/rtPhpTestGroup.phpSun Jun 14 13:52:21 2009 @@ -45,7 +45,6 @@ //The test name is the full path to the test file name without the .phpt $testStatus = new rtTestStatus($testFile-getTestName()); - echo $testFile-getTestName() . \n; if ($testFile-arePreconditionsMet() ) { // Create a new test case -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang foreachLoopObjects.001.phpt foreachLoopObjects.002.phpt foreachLoopObjects.003.phpt foreachLoopObjects.004.phpt foreachLoopObjects.005.phpt foreachLoopObjects.006.ph
wharmby Sun Jun 14 14:17:46 2009 UTC Added files: /php-src/tests/lang foreachLoopObjects.001.phpt foreachLoopObjects.006.phpt foreachLoopObjects.003.phpt foreachLoopObjects.002.phpt foreachLoopObjects.005.phpt foreachLoopObjects.004.phpt Log: New foreach tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/tests/lang/foreachLoopObjects.001.phpt?view=markuprev=1.1 Index: php-src/tests/lang/foreachLoopObjects.001.phpt +++ php-src/tests/lang/foreachLoopObjects.001.phpt --TEST-- Foreach loop on objects - basic loop with just value and key = value. --FILE-- ?php class C { public $a = Original a; public $b = Original b; public $c = Original c; protected $d = Original d; private $e = Original e; } echo \n\nSimple loop.\n; $obj = new C; foreach ($obj as $v) { var_dump($v); } foreach ($obj as $k = $v) { var_dump($k, $v); } echo \nCheck key and value after the loop.\n; var_dump($k, $v); echo \n\nObject instantiated inside loop.\n; foreach (new C as $v) { var_dump($v); } foreach (new C as $k = $v) { var_dump($k, $v); } echo \nCheck key and value after the loop.\n; var_dump($k, $v); ? --EXPECTF-- Simple loop. unicode(10) Original a unicode(10) Original b unicode(10) Original c unicode(1) a unicode(10) Original a unicode(1) b unicode(10) Original b unicode(1) c unicode(10) Original c Check key and value after the loop. unicode(1) c unicode(10) Original c Object instantiated inside loop. unicode(10) Original a unicode(10) Original b unicode(10) Original c unicode(1) a unicode(10) Original a unicode(1) b unicode(10) Original b unicode(1) c unicode(10) Original c Check key and value after the loop. unicode(1) c unicode(10) Original c http://cvs.php.net/viewvc.cgi/php-src/tests/lang/foreachLoopObjects.006.phpt?view=markuprev=1.1 Index: php-src/tests/lang/foreachLoopObjects.006.phpt +++ php-src/tests/lang/foreachLoopObjects.006.phpt --TEST-- Foreach loop tests - substituting the entire iterated entity during the loop. --FILE-- ?php class C { public $a = Original a; public $b = Original b; public $c = Original c; public $d = Original d; public $e = Original e; } echo \nSubstituting the iterated object for a different object.\n; $obj = new C; $obj2 = new stdclass; $obj2-a = new a; $obj2-b = new b; $obj2-c = new c; $obj2-d = new d; $obj2-e = new e; $obj2-f = new f; $ref = $obj; $count=0; foreach ($obj as $v) { var_dump($v); if ($v==$obj-b) { $ref=$obj2; } if (++$count10) { echo Loop detected.\n; break; } } var_dump($obj); echo \nSubstituting the iterated object for an array.\n; $obj = new C; $a = array(1,2,3,4,5,6,7,8); $ref = $obj; $count=0; foreach ($obj as $v) { var_dump($v); if ($v===Original b) { $ref=$a; } if (++$count10) { echo Loop detected.\n; break; } } var_dump($obj); echo \nSubstituting the iterated array for an object.\n; $a = array(1,2,3,4,5,6,7,8); $obj = new C; $ref = $a; $count=0; foreach ($a as $v) { var_dump($v); if ($v===2) { $ref=$obj; } if (++$count10) { echo Loop detected.\n; break; } } var_dump($obj); ? ===DONE=== --EXPECTF-- Substituting the iterated object for a different object. unicode(10) Original a unicode(10) Original b unicode(5) new a unicode(5) new b unicode(5) new c unicode(5) new d unicode(5) new e unicode(5) new f object(stdClass)#%d (6) { [ua]= unicode(5) new a [ub]= unicode(5) new b [uc]= unicode(5) new c [ud]= unicode(5) new d [ue]= unicode(5) new e [uf]= unicode(5) new f } Substituting the iterated object for an array. unicode(10) Original a unicode(10) Original b int(1) int(2) int(3) int(4) int(5) int(6) int(7) int(8) array(8) { [0]= int(1) [1]= int(2) [2]= int(3) [3]= int(4) [4]= int(5) [5]= int(6) [6]= int(7) [7]= int(8) } Substituting the iterated array for an object. int(1) int(2) unicode(10) Original a unicode(10) Original b unicode(10) Original c unicode(10) Original d unicode(10) Original e object(C)#1 (5) { [ua]= unicode(10) Original a [ub]= unicode(10) Original b [uc]= unicode(10) Original c [ud]= unicode(10) Original d [ue]= unicode(10) Original e } ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/lang/foreachLoopObjects.003.phpt?view=markuprev=1.1 Index: php-src/tests/lang/foreachLoopObjects.003.phpt +++ php-src/tests/lang/foreachLoopObjects.003.phpt --TEST-- Foreach loop tests - modifying the object during the loop. --FILE-- ?php class C { public $a = Original a; public $b = Original b;
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/lang foreachLoopObjects.001.phpt foreachLoopObjects.002.phpt foreachLoopObjects.003.phpt foreachLoopObjects.004.phpt foreachLoopObjects.005.phpt foreachLoopObjec
wharmby Sun Jun 14 14:17:48 2009 UTC Added files: (Branch: PHP_5_2) /php-src/tests/lang foreachLoopObjects.005.phpt foreachLoopObjects.002.phpt foreachLoopObjects.006.phpt foreachLoopObjects.001.phpt foreachLoopObjects.004.phpt foreachLoopObjects.003.phpt Log: New foreach tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/tests/lang/foreachLoopObjects.005.phpt?view=markuprev=1.1 Index: php-src/tests/lang/foreachLoopObjects.005.phpt +++ php-src/tests/lang/foreachLoopObjects.005.phpt --TEST-- Foreach loop tests - removing properties before and after the current property during the loop. --FILE-- ?php class C { public $a = Original a; public $b = Original b; public $c = Original c; public $d = Original d; public $e = Original e; } echo \nRemoving properties before the current element from an iterated object.\n; $obj = new C; $count=0; foreach ($obj as $v) { if ($v==$obj-a) { unset($obj-c); } var_dump($v); if (++$count10) { echo Loop detected.\n; break; } } var_dump($obj); echo \nRemoving properties before the current element from an iterated object.\n; $obj = new C; foreach ($obj as $v) { if ($v==$obj-b) { unset($obj-a); } var_dump($v); if (++$count10) { echo Loop detected.\n; break; } } var_dump($obj); ? ===DONE=== --EXPECTF-- Removing properties before the current element from an iterated object. unicode(10) Original a unicode(10) Original b unicode(10) Original d unicode(10) Original e object(C)#%d (4) { [ua]= unicode(10) Original a [ub]= unicode(10) Original b [ud]= unicode(10) Original d [ue]= unicode(10) Original e } Removing properties before the current element from an iterated object. unicode(10) Original a unicode(10) Original b unicode(10) Original c unicode(10) Original d unicode(10) Original e object(C)#%d (4) { [ub]= unicode(10) Original b [uc]= unicode(10) Original c [ud]= unicode(10) Original d [ue]= unicode(10) Original e } ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/lang/foreachLoopObjects.002.phpt?view=markuprev=1.1 Index: php-src/tests/lang/foreachLoopObjects.002.phpt +++ php-src/tests/lang/foreachLoopObjects.002.phpt --TEST-- Foreach loop tests - visibility. --FILE-- ?php class C { public $a = Original a; public $b = Original b; public $c = Original c; protected $d = Original d; private $e = Original e; function doForEachC() { echo in C::doForEachC\n; foreach ($this as $k=$v) { var_dump($v); $v=changed.$k; } } static function doForEach($obj) { echo in C::doForEach\n; foreach ($obj as $k=$v) { var_dump($v); $v=changed.$k; } } function doForEachOnThis() { echo in C::doForEachOnThis\n; foreach ($this as $k=$v) { var_dump($v); $v=changed.$k; } } } class D extends C { private $f = Original f; protected $g = Original g; static function doForEach($obj) { echo in D::doForEach\n; foreach ($obj as $k=$v) { var_dump($v); $v=changed.$k; } } function doForEachOnThis() { echo in D::doForEachOnThis\n; foreach ($this as $k=$v) { var_dump($v); $v=changed.$k; } } } class E extends D { public $a = Overridden a; public $b = Overridden b; public $c = Overridden c; protected $d = Overridden d; private $e = Overridden e; static function doForEach($obj) { echo in E::doForEach\n; foreach ($obj as $k=$v) { var_dump($v); $v=changed.$k; } } function doForEachOnThis() { echo in E::doForEachOnThis\n; foreach ($this as $k=$v) { var_dump($v); $v=changed.$k; } } } echo \n\nIterate over various generations from within overridden methods:\n; echo \n-- Using instance of C:\n; $myC = new C; $myC-doForEachOnThis(); var_dump($myC); echo \n-- Using instance of D:\n; $myD = new D; $myD-doForEachOnThis();
[PHP-CVS] cvs: phpruntests /src/configuration rtIniAsCommandLineArgs.php
zoe Sun Jun 14 14:28:12 2009 UTC Modified files: /phpruntests/src/configuration rtIniAsCommandLineArgs.php Log: another bug fix http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtIniAsCommandLineArgs.php?r1=1.5r2=1.6diff_format=u Index: phpruntests/src/configuration/rtIniAsCommandLineArgs.php diff -u phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.5 phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.6 --- phpruntests/src/configuration/rtIniAsCommandLineArgs.php:1.5Sun Jun 14 10:39:02 2009 +++ phpruntests/src/configuration/rtIniAsCommandLineArgs.phpSun Jun 14 14:28:12 2009 @@ -89,22 +89,11 @@ if ($parts[0] === $string) { return false; } - -//test for ==, which is allowed -if (strncmp($parts[1], '=', 1) === 0) { -return true; -} - -//test for a=b=c -if (strstr($parts[1], '=') == false) { -return true; -} else { -return false; -} +return true; } /** - * Removes spaces from ini settings, a = b is retirned as a=b + * Removes spaces from ini settings, a = b is returned as a=b * * @param string - ini setting * @return string - ini setting with any spaces removed -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/configuration rtIniAsCommandLineArgsTest.php
zoe Sun Jun 14 14:28:29 2009 UTC Modified files: /phpruntests/tests/configurationrtIniAsCommandLineArgsTest.php Log: another bug fix http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php?r1=1.3r2=1.4diff_format=u Index: phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php diff -u phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php:1.3 phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php:1.4 --- phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php:1.3 Sun Jun 14 10:38:30 2009 +++ phpruntests/tests/configuration/rtIniAsCommandLineArgsTest.php Sun Jun 14 14:28:28 2009 @@ -54,24 +54,29 @@ $addStr = $iniSet-settingsToArguments(array('af'), $iniSet-getBasePhpDArgs()); } -/** - * @expectedException rtUnknownIniSettingException - */ -public function testInvalidArg2() + +public function testValidDoubleEquals() { $iniSet = new rtIniAsCommandLineArgs(); $iniSet-setBase(); -$addStr = $iniSet-settingsToArguments(array('af=be=blah'), $iniSet-getBasePhpDArgs()); +$addStr = $iniSet-settingsToArguments(array('af=='), $iniSet-getBasePhpDArgs()); +$last3= addslashes(substr($addStr, -3)); + +$this-assertEquals('==\', $last3); } -public function testValidDoubleEquals() +public function testValidComplex() { $iniSet = new rtIniAsCommandLineArgs(); $iniSet-setBase(); -$addStr = $iniSet-settingsToArguments(array('af=='), $iniSet-getBasePhpDArgs()); +$addStr = $iniSet-settingsToArguments(array('pdo.dsn.mysql=mysql:dbname=phptest;socket=/tmp/mysql.sock +'), $iniSet-getBasePhpDArgs()); + $last3= addslashes(substr($addStr, -3)); -$this-assertEquals('==\', $last3); +$this-assertEquals('k\\', $last3); } + + } ? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/func foreachLoopObjects.001.phpt foreachLoopObjects.002.phpt foreachLoopObjects.003.phpt foreachLoopObjects.004.phpt foreachLoopObjects.005.phpt foreachLoopObjec
wharmby Sun Jun 14 14:17:44 2009 UTC Added files: (Branch: PHP_5_3) /php-src/tests/func foreachLoopObjects.002.phpt foreachLoopObjects.001.phpt foreachLoopObjects.003.phpt foreachLoopObjects.005.phpt foreachLoopObjects.004.phpt foreachLoopObjects.006.phpt Log: New foreach tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/tests/func/foreachLoopObjects.002.phpt?view=markuprev=1.1 Index: php-src/tests/func/foreachLoopObjects.002.phpt +++ php-src/tests/func/foreachLoopObjects.002.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/func/foreachLoopObjects.001.phpt?view=markuprev=1.1 Index: php-src/tests/func/foreachLoopObjects.001.phpt +++ php-src/tests/func/foreachLoopObjects.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/func/foreachLoopObjects.003.phpt?view=markuprev=1.1 Index: php-src/tests/func/foreachLoopObjects.003.phpt +++ php-src/tests/func/foreachLoopObjects.003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/func/foreachLoopObjects.005.phpt?view=markuprev=1.1 Index: php-src/tests/func/foreachLoopObjects.005.phpt +++ php-src/tests/func/foreachLoopObjects.005.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/func/foreachLoopObjects.004.phpt?view=markuprev=1.1 Index: php-src/tests/func/foreachLoopObjects.004.phpt +++ php-src/tests/func/foreachLoopObjects.004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/func/foreachLoopObjects.006.phpt?view=markuprev=1.1 Index: php-src/tests/func/foreachLoopObjects.006.phpt +++ php-src/tests/func/foreachLoopObjects.006.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/output ob_001.phpt ob_002.phpt ob_003.phpt ob_004.phpt ob_005.phpt ob_006.phpt ob_007.phpt ob_008.phpt ob_009.phpt ob_010.phpt
wharmby Sun Jun 14 16:47:11 2009 UTC Added files: (Branch: PHP_5_3) /php-src/tests/output ob_008.phpt ob_006.phpt ob_005.phpt ob_001.phpt ob_002.phpt ob_010.phpt ob_009.phpt ob_007.phpt ob_004.phpt ob_003.phpt Log: Backport ob test to php 5.2 and 53. http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_008.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_008.phpt +++ php-src/tests/output/ob_008.phpt --TEST-- output buffering - ob_get_contents --FILE-- ?php ob_start(); echo foo\n; echo ob_get_contents(); ? --EXPECT-- foo foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_006.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_006.phpt +++ php-src/tests/output/ob_006.phpt --TEST-- output buffering - ob_end_flush --FILE-- ?php ob_start(); echo foo\n; ob_end_flush(); var_dump(ob_get_level()); ? --EXPECT-- foo int(0) http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_005.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_005.phpt +++ php-src/tests/output/ob_005.phpt --TEST-- output buffering - ob_end_clean --FILE-- ?php ob_start(); echo foo\n; ob_start(); echo bar\n; ob_end_clean(); echo baz\n; ? --EXPECT-- foo baz http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_001.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_001.phpt +++ php-src/tests/output/ob_001.phpt --TEST-- output buffering - nothing --FILE-- ?php echo foo\n; ? --EXPECTF-- foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_002.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_002.phpt +++ php-src/tests/output/ob_002.phpt --TEST-- output buffering - ob_start --FILE-- ?php ob_start(); echo foo\n; ? --EXPECT-- foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_010.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_010.phpt +++ php-src/tests/output/ob_010.phpt --TEST-- output buffering - fatalism --FILE-- ?php function obh($s) { print_r($s, 1); } ob_start(obh); echo foo\n; ? --EXPECTF-- Fatal error: print_r(): Cannot use output buffering in output buffering display handlers in %s/ob_010.php on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_009.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_009.phpt +++ php-src/tests/output/ob_009.phpt --TEST-- output buffering - ob_get_flush --FILE-- ?php ob_start(); echo foo\n; var_dump(ob_get_flush()); ? --EXPECT-- foo string(4) foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_007.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_007.phpt +++ php-src/tests/output/ob_007.phpt --TEST-- output buffering - ob_get_clean --FILE-- ?php ob_start(); echo foo\n; var_dump(ob_get_clean()); ? --EXPECT-- string(4) foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_004.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_004.phpt +++ php-src/tests/output/ob_004.phpt --TEST-- output buffering - ob_clean --FILE-- ?php ob_start(); echo foo\n; ob_clean(); echo bar\n; ? --EXPECT-- bar http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_003.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_003.phpt +++ php-src/tests/output/ob_003.phpt --TEST-- output buffering - ob_flush --FILE-- ?php ob_start(); echo foo\n; ob_flush(); echo bar\n; ob_flush(); ? --EXPECT-- foo bar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/output ob_001.phpt ob_002.phpt ob_003.phpt ob_004.phpt ob_005.phpt ob_006.phpt ob_007.phpt ob_008.phpt ob_009.phpt ob_010.phpt
wharmby Sun Jun 14 16:47:13 2009 UTC Added files: (Branch: PHP_5_2) /php-src/tests/output ob_006.phpt ob_007.phpt ob_003.phpt ob_004.phpt ob_001.phpt ob_010.phpt ob_005.phpt ob_002.phpt ob_009.phpt ob_008.phpt Log: Backport ob test to php 5.2 and 53. http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_006.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_006.phpt +++ php-src/tests/output/ob_006.phpt --TEST-- output buffering - ob_end_flush --FILE-- ?php ob_start(); echo foo\n; ob_end_flush(); var_dump(ob_get_level()); ? --EXPECT-- foo int(0) http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_007.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_007.phpt +++ php-src/tests/output/ob_007.phpt --TEST-- output buffering - ob_get_clean --FILE-- ?php ob_start(); echo foo\n; var_dump(ob_get_clean()); ? --EXPECT-- string(4) foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_003.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_003.phpt +++ php-src/tests/output/ob_003.phpt --TEST-- output buffering - ob_flush --FILE-- ?php ob_start(); echo foo\n; ob_flush(); echo bar\n; ob_flush(); ? --EXPECT-- foo bar http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_004.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_004.phpt +++ php-src/tests/output/ob_004.phpt --TEST-- output buffering - ob_clean --FILE-- ?php ob_start(); echo foo\n; ob_clean(); echo bar\n; ? --EXPECT-- bar http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_001.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_001.phpt +++ php-src/tests/output/ob_001.phpt --TEST-- output buffering - nothing --FILE-- ?php echo foo\n; ? --EXPECTF-- foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_010.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_010.phpt +++ php-src/tests/output/ob_010.phpt --TEST-- output buffering - fatalism --FILE-- ?php function obh($s) { print_r($s, 1); } ob_start(obh); echo foo\n; ? --EXPECTF-- Fatal error: print_r(): Cannot use output buffering in output buffering display handlers in %s/ob_010.php on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_005.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_005.phpt +++ php-src/tests/output/ob_005.phpt --TEST-- output buffering - ob_end_clean --FILE-- ?php ob_start(); echo foo\n; ob_start(); echo bar\n; ob_end_clean(); echo baz\n; ? --EXPECT-- foo baz http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_002.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_002.phpt +++ php-src/tests/output/ob_002.phpt --TEST-- output buffering - ob_start --FILE-- ?php ob_start(); echo foo\n; ? --EXPECT-- foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_009.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_009.phpt +++ php-src/tests/output/ob_009.phpt --TEST-- output buffering - ob_get_flush --FILE-- ?php ob_start(); echo foo\n; var_dump(ob_get_flush()); ? --EXPECT-- foo string(4) foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_008.phpt?view=markuprev=1.1 Index: php-src/tests/output/ob_008.phpt +++ php-src/tests/output/ob_008.phpt --TEST-- output buffering - ob_get_contents --FILE-- ?php ob_start(); echo foo\n; echo ob_get_contents(); ? --EXPECT-- foo foo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / README.UPDATE_5_2
philip Sun Jun 14 17:56:07 2009 UTC Removed files: (Branch: PHP_5_3) /php-srcREADME.UPDATE_5_2 Log: Remove unused file (see file UPGRADING for the 5.2-5.3 guide) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
philip Sun Jun 14 19:15:57 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Synced with the wiki http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.9r2=1.1.2.3.2.1.2.10diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.9 php-src/UPGRADING:1.1.2.3.2.1.2.10 --- php-src/UPGRADING:1.1.2.3.2.1.2.9 Fri May 22 03:32:20 2009 +++ php-src/UPGRADING Sun Jun 14 19:15:57 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.9 2009/05/22 03:32:20 kalle Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.10 2009/06/14 19:15:57 philip Exp $ UPGRADE NOTES - PHP 5.3 @@ -50,6 +50,8 @@ - clearstatcache() no longer clears the realpath cache by default. +- call_user_func() now propagates $this even if the callee is the parent class. + - The filesystem functions opendir(), scandir() and dir() now use the default context if no context is passed as an argument to them. @@ -76,12 +78,18 @@ copy(): context. fgetcsv(): escape. ini_get_all(): details. + json_encode(): options. nl2br(): is_xhtml. parse_ini_file(): scanner_mode. round(): mode. stream_context_create(): params. strstr(), stristr(): before_needle. +- The new mysqlnd library necessitates using MySQL's newer 41 byte password format. + Continued use of the old 16 byte passwords will cause mysql_connect() to produce + the following error message: mysqlnd cannot connect to MySQL 4.1+ using old + authentication + === 3. Changes made to existing methods === @@ -117,7 +125,8 @@ - define_syslog_variables() is deprecated. -- All ereg functions are deprecated. Use PCRE (preg_*()) instead. +- All ereg functions are deprecated and emit E_DEPRECATED errors. + Use PCRE (preg_*()) instead. - The following ini directives will now emit an E_DEPRECATED warning upon startup if they are activated: @@ -194,6 +203,9 @@ 9. Changes in INI directives +- zend_extension_debug and zend_extension_ts have been removed. + Instead use the zend_extension directive to load all Zend Extensions. + - zend.ze1_compatibility_mode has been removed. If this ini directive is set to on, then an E_ERROR is emitted at startup. @@ -236,6 +248,11 @@ var_dump(0 ?: 'Hello!'); +- Namespaces were added: + + namespace my\name; + $obj = new \my\name\MyClass; + === 11. Windows support === @@ -251,7 +268,20 @@ symlink(), link(), fnmatch(), stream_socket_pair(), time_nanosleep(), time_sleep_until() and socket_create_pair(). -- Its now possible to use hardlinks on Windows using the link() function, +- Improved portability of stat(), touch(), filemtime(), filesize() and related + functions (100% portable for the available data) + +- The PDO_OCI php_pdo_oci8.dll library (for use with Oracle version 8 client + libraries) is no longer being built. Instead, use php_pdo_oci.dll (note no '8') + with Oracle 10 or 11 client libraries. Connection to other database versions + is supported. + +- For the OCI8 extension, a new library php_oci8_11g.dll is available in addition to + php_oci8.dll. Only one can be enabled at any time. Use php_oci8.dll with Oracle 10.2 + client libraries. Use php_oci8_11g.dll with Oracle 11 client libraries. Connection + to other database versions is supported. + +- It's now possible to use hardlinks on Windows using the link() function, and symbolic links via the symlink() function. Hardlinks are available as of Windows 2000 and symbolic links as of Windows Vista. @@ -298,6 +328,7 @@ date_parse_from_format() date_create_from_format() date_get_last_errors() + timezone_version_get() - INI: parse_ini_string() - GMP: gmp_testbit() - Hash:hash_copy() @@ -307,6 +338,7 @@ mysqli_poll() mysqli_reap_async_query() - Network: gethostname() + header_remove() - OpenSSL: openssl_random_pseudo_bytes() - PCNTL: pcntl_signal_dispatch() pcntl_sigprocmask() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /phpt-tests sample_postraw.phpt
zoe Sun Jun 14 20:14:04 2009 UTC Modified files: /phpruntests/phpt-tests sample_postraw.phpt Log: fixing test http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_postraw.phpt?r1=1.1r2=1.2diff_format=u Index: phpruntests/phpt-tests/sample_postraw.phpt diff -u phpruntests/phpt-tests/sample_postraw.phpt:1.1 phpruntests/phpt-tests/sample_postraw.phpt:1.2 --- phpruntests/phpt-tests/sample_postraw.phpt:1.1 Thu Apr 23 12:40:33 2009 +++ phpruntests/phpt-tests/sample_postraw.phpt Sun Jun 14 20:14:04 2009 @@ -39,4 +39,4 @@ int(15) } } -string(15) abcdef123456789 +string(%d) abcdef123456789 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php