[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Oct 27 01:31:21 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2850r2=1.2851diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2850 php-src/ChangeLog:1.2851 --- php-src/ChangeLog:1.2850Fri Oct 26 01:31:24 2007 +++ php-src/ChangeLog Sat Oct 27 01:31:21 2007 @@ -1,3 +1,169 @@ +2007-10-26 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + add attribution + +2007-10-26 Robert Nicholson [EMAIL PROTECTED] + +* ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation3.phpt + ext/standard/tests/array/array_splice_variation3.phpt + ext/standard/tests/array/array_splice_variation3.phpt + ext/standard/tests/array/array_splice_variation4.phpt + ext/standard/tests/array/array_splice_variation4.phpt + ext/standard/tests/array/array_splice_variation4.phpt + ext/standard/tests/array/max_basic.phpt + ext/standard/tests/array/max_basic.phpt + ext/standard/tests/array/max_basic.phpt + ext/standard/tests/array/max_error.phpt + ext/standard/tests/array/max_error.phpt + ext/standard/tests/array/max_error.phpt + ext/standard/tests/array/max_variation1.phpt + ext/standard/tests/array/max_variation1.phpt + ext/standard/tests/array/max_variation1.phpt + ext/standard/tests/array/max_variation2.phpt + ext/standard/tests/array/max_variation2.phpt + ext/standard/tests/array/max_variation2.phpt + ext/standard/tests/array/min_basic.phpt + ext/standard/tests/array/min_basic.phpt + ext/standard/tests/array/min_basic.phpt + ext/standard/tests/array/min_error.phpt + ext/standard/tests/array/min_error.phpt + ext/standard/tests/array/min_error.phpt + ext/standard/tests/array/min_variation1.phpt + ext/standard/tests/array/min_variation1.phpt + ext/standard/tests/array/min_variation1.phpt + ext/standard/tests/array/min_variation2.phpt + ext/standard/tests/array/min_variation2.phpt + ext/standard/tests/array/min_variation2.phpt: + Remove unneeded INI sections + +2007-10-26 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/array/array_unshift_object.phpt + ext/standard/tests/array/array_unshift_object.phpt: + more testcases for array_unshift() function + +* ext/standard/tests/array/array_unshift_object.phpt + ext/standard/tests/array/array_unshift_object.phpt + ext/standard/tests/array/array_unshift_object.phpt: +1.1.4; + file array_unshift_object.phpt was initially added on branch PHP_5_2. + +2007-10-26 Robert Nicholson [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation3.phpt + ext/standard/tests/array/array_splice_variation3.phpt + ext/standard/tests/array/array_splice_variation4.phpt + ext/standard/tests/array/array_splice_variation4.phpt: + new testcases for array_splice + +* ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_basic.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_errors.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation1.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation2.phpt + ext/standard/tests/array/array_splice_variation3.phpt +
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
janiFri Oct 26 08:13:16 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.987r2=1.2027.2.547.2.988diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.987 php-src/NEWS:1.2027.2.547.2.988 --- php-src/NEWS:1.2027.2.547.2.987 Thu Oct 25 07:30:29 2007 +++ php-src/NEWSFri Oct 26 08:13:15 2007 @@ -14,7 +14,7 @@ array_udiff_assoc(). (Dmitry) - Fixed move_uploaded_file() to always set file permissions of resulting file - according to UMASK (Andrew Sitnikov) + according to UMASK. (Andrew Sitnikov) - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - Fixed regression in glob() when enforcing safe_mode/open_basedir checks on paths containing '*'. (Ilia) @@ -43,8 +43,8 @@ (Ilia) - Fixed bug #43020 (Warning message is missing with shuffle() and more than one argument). (Scott) -- Fixed bug #4294 (Move *timeout initialization from RINIT to connect time). - (Ilia) +- Fixed bug #42943 (ext/mssql: Move *timeout initialization from RINIT + to connect time). (Ilia) - Fixed bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode). (Ilia) - Fixed bug #42890 (Constant LIST defined by mysqlclient and c-client). -- 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/standard/tests/array max_basic.phpt max_error.phpt max_variation1.phpt max_variation2.phpt min_basic.phpt min_error.phpt min_variation1.phpt min_variation2.phpt
nicholsrFri Oct 26 11:02:04 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array min_error.phpt max_basic.phpt
min_variation2.phpt
min_basic.phpt
max_variation2.phpt
max_error.phpt
max_variation1.phpt
min_variation1.phpt
Log:
new testcases for max and min
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_error.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/min_error.phpt
+++ php-src/ext/standard/tests/array/min_error.phpt
--TEST--
Test wrong number of arguments for min()
--INI--
--FILE--
?php
/*
* proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
* Function is implemented in ext/standard/array.c
*/
echo \n*** Testing Error Conditions ***\n;
var_dump(min());
var_dump(min(1));
var_dump(min(array()));
var_dump(min(new stdclass));
?
--EXPECTF--
*** Testing Error Conditions ***
Warning: min(): At%seast one %s on line %d
NULL
Warning: Wrong parameter count for min() in %s on line %d
NULL
Warning: min(): Array must contain at%seast one element in %s on line %d
bool(false)
Warning: Wrong parameter count for min() in %s on line %d
NULL
--UEXPECTF--
*** Testing Error Conditions ***
Warning: min(): At%seast one %s on line %d
NULL
Warning: Wrong parameter count for min() in %s on line %d
NULL
Warning: min(): Array must contain at%seast one element in %s on line %d
bool(false)
Warning: Wrong parameter count for min() in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/max_basic.phpt
+++ php-src/ext/standard/tests/array/max_basic.phpt
--TEST--
Test return type and value for expected input max()
--INI--
--FILE--
?php
/*
* proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]])
* Function is implemented in ext/standard/array.c
*/
echo \n*** Testing sequences of numbers ***\n;
var_dump(max(2,1,2));
var_dump(max(-2,1,2));
var_dump(max(2.1,2.11,2.09));
var_dump(max(, t, b));
var_dump(max(false, true, false));
var_dump(max(true, false, true));
var_dump(max(1, true, false, true));
var_dump(max(0, true, false, true));
var_dump(max(0, 1, array(2,3)));
echo \nDone\n;
?
--EXPECT--
*** Testing sequences of numbers ***
int(2)
int(2)
float(2.11)
string(1) t
bool(true)
bool(true)
int(1)
bool(true)
array(2) {
[0]=
int(2)
[1]=
int(3)
}
Done
--UEXPECT--
*** Testing sequences of numbers ***
int(2)
int(2)
float(2.11)
unicode(1) t
bool(true)
bool(true)
int(1)
bool(true)
array(2) {
[0]=
int(2)
[1]=
int(3)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_variation2.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/min_variation2.phpt
+++ php-src/ext/standard/tests/array/min_variation2.phpt
--TEST--
Test variations in usage of min()
--INI--
--FILE--
?php
/*
* proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
* Function is implemented in ext/standard/array.c
*/
echo \n*** Testing arrays ***\n;
var_dump(min(array(2,1,2)));
var_dump(min(array(-2,1,2)));
var_dump(min(array(2.1,2.11,2.09)));
var_dump(min(array(, t, b)));
var_dump(min(array(false, true, false)));
var_dump(min(array(true, false, true)));
var_dump(min(array(1, true, false, true)));
var_dump(min(array(0, true, false, true)));
var_dump(min(array(0, 1, array(2,3;
var_dump(min(array(2147483645, 2147483646)));
var_dump(min(array(2147483647, 2147483648)));
var_dump(min(array(2147483646, 2147483648)));
var_dump(min(array(-2147483647, -2147483646)));
var_dump(min(array(-2147483648, -2147483647)));
var_dump(min(array(-2147483649, -2147483647)));
echo \nDone\n;
?
--EXPECT--
*** Testing arrays ***
int(1)
int(-2)
float(2.09)
string(0)
bool(false)
bool(false)
bool(false)
int(0)
int(0)
int(2147483645)
int(2147483647)
int(2147483646)
int(-2147483647)
float(-2147483648)
float(-2147483649)
Done
--UEXPECT--
*** Testing arrays ***
int(1)
int(-2)
float(2.09)
unicode(0)
bool(false)
bool(false)
bool(false)
int(0)
int(0)
int(2147483645)
int(2147483647)
int(2147483646)
int(-2147483647)
float(-2147483648)
float(-2147483649)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/min_basic.phpt
+++ php-src/ext/standard/tests/array/min_basic.phpt
--TEST--
Test return type and value for expected input min()
--INI--
--FILE--
?php
/*
* proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
* Function is implemented in ext/standard/array.c
*/
echo \n*** Testing sequences of numbers ***\n;
var_dump(min(2,1,2));
var_dump(min(-2,1,2));
var_dump(min(2.1,2.11,2.09));
var_dump(min(, t, b));
var_dump(min(false, true, false));
var_dump(min(true, false, true));
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_splice_va
nicholsrFri Oct 26 11:06:31 2007 UTC
Added files:
/php-src/ext/standard/tests/array array_splice_variation1.phpt
array_splice_variation2.phpt
array_splice_basic.phpt
array_splice_variation3.phpt
array_splice_errors.phpt
array_splice_variation4.phpt
Log:
new testcases for array_splice
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation1.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation1.phpt
--TEST--
Test array_splice() function : usage variations - references
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
echo test behaviour when input array is in a reference set\n;
$input_array=array (array(1,2));
$input_array[]=$input_array[0];
var_dump (array_splice ($input_array[0],1,1));
var_dump ($input_array);
echo Test behaviour of input arrays containing references \n;
/*
* There are three regions to test:, before cut, the cut and after the cut.
* For reach we check a plain value, a reference value with integer key and a
* reference value with a string key.
*/
$numbers=array(0,1,2,3,4,5,6,7,8,9,10,11,12);
$input_array=array(0,1,$numbers[2],three=$numbers[3],4,$numbers[5],six=$numbers[6],7,$numbers[8],nine=$numbers[9]);
var_dump (array_splice ($input_array,4,3));
var_dump ($input_array);
echo Test behaviour of replacement array containing references \n;
$three=3;
$four=4;
$input_array=array (0,1,2);
$b=array($three,fourkey=$four);
array_splice ($input_array,-1,1,$b);
var_dump ($input_array);
echo Test behaviour of replacement which is part of reference set \n;
$int=3;
$input_array=array (1,2);
$b=$int;
array_splice ($input_array,-1,1,$b);
var_dump ($input_array);
echo Done\n;
?
--EXPECT--
test behaviour when input array is in a reference set
array(1) {
[0]=
int(2)
}
array(2) {
[0]=
array(1) {
[0]=
int(1)
}
[1]=
array(1) {
[0]=
int(1)
}
}
Test behaviour of input arrays containing references
array(3) {
[0]=
int(4)
[1]=
int(5)
[six]=
int(6)
}
array(7) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
[three]=
int(3)
[3]=
int(7)
[4]=
int(8)
[nine]=
int(9)
}
Test behaviour of replacement array containing references
array(4) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(3)
[3]=
int(4)
}
Test behaviour of replacement which is part of reference set
array(2) {
[0]=
int(1)
[1]=
int(3)
}
Done
--UEXPECT--
test behaviour when input array is in a reference set
array(1) {
[0]=
int(2)
}
array(2) {
[0]=
array(1) {
[0]=
int(1)
}
[1]=
array(1) {
[0]=
int(1)
}
}
Test behaviour of input arrays containing references
array(3) {
[0]=
int(4)
[1]=
int(5)
[usix]=
int(6)
}
array(7) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
[uthree]=
int(3)
[3]=
int(7)
[4]=
int(8)
[unine]=
int(9)
}
Test behaviour of replacement array containing references
array(4) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(3)
[3]=
int(4)
}
Test behaviour of replacement which is part of reference set
array(2) {
[0]=
int(1)
[1]=
int(3)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation2.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation2.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation2.phpt
--TEST--
Test array_splice() function : usage variations - additional parameters
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
$array=array(0,1,2);
var_dump (array_splice($array,1,1,3,4,5,6,7,8,9));
var_dump ($array);
echo Done\n;
?
--EXPECTF--
Warning: array_splice() expects at most 4 parameters, 10 given in %s on line %d
NULL
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
Done
--UEXPECTF--
Warning: array_splice() expects at most 4 parameters, 10 given in %s on line %d
NULL
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_basic.phpt
+++ php-src/ext/standard/tests/array/array_splice_basic.phpt
--TEST--
Test array_splice(): basic functionality
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
echo *** Testing array_splice() basic operations ***\n;
echo test truncation \n;
$input =
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_
nicholsrFri Oct 26 11:07:13 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array array_splice_variation2.phpt
array_splice_variation4.phpt
array_splice_variation3.phpt
array_splice_variation1.phpt
array_splice_errors.phpt
array_splice_basic.phpt
Log:
new testcases for array_splice
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation2.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation2.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation2.phpt
--TEST--
Test array_splice() function : usage variations - additional parameters
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
$array=array(0,1,2);
var_dump (array_splice($array,1,1,3,4,5,6,7,8,9));
var_dump ($array);
echo Done\n;
?
--EXPECTF--
Warning: array_splice() expects at most 4 parameters, 10 given in %s on line %d
NULL
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
Done
--UEXPECTF--
Warning: array_splice() expects at most 4 parameters, 10 given in %s on line %d
NULL
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation4.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation4.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation4.phpt
--TEST--
Test array_splice() function : usage variations - non array replacement values
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
function test_splice ($replacement)
{
$input_array=array(0,1);
var_dump (array_splice ($input_array,2,0,$replacement));
var_dump ($input_array);
}
test_splice (2);
test_splice (2.1);
test_splice (true);
//file type resource
$file_handle = fopen(__FILE__, r);
test_splice ($file_handle);
echo Done\n;
?
--EXPECTF--
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
float(2.1)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
bool(true)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
resource(%d) of type (stream)
}
Done
--UEXPECTF--
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
float(2.1)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
bool(true)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
resource(%d) of type (stream)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation3.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation3.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation3.phpt
--TEST--
Test array_splice() function : usage variations - lengths and offsets
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
echo *** array_splice() function : usage variations - lengths and offsets\n;
function test_splice ($offset, $length)
{
echo - No replacement\n;
$input_array=array(0,1,2,3,4,5);
var_dump (array_splice ($input_array,$offset,$length));
var_dump ($input_array);
echo - With replacement\n;
$input_array=array(0,1,2,3,4,5);
var_dump (array_splice ($input_array,$offset,$length,array (A,B,C)));
var_dump ($input_array);
}
echo absolute offset - absolute length - cut from beginning\n;
test_splice (0,2);
echo absolute offset - absolute length - cut from middle\n;
test_splice (2,2);
echo absolute offset - absolute length - cut from end\n;
test_splice (4,2);
echo absolute offset - absolute length - attempt to cut past end\n;
test_splice (4,4);
echo absolute offset - absolute length - cut everything\n;
test_splice (0,7);
echo absolute offset - absolute length - cut nothing\n;
test_splice (3,0);
echo absolute offset - relative length - cut from beginning\n;
test_splice (0,-4);
echo absolute offset - relative length - cut from middle\n;
test_splice (2,-2);
echo absolute offset - relative length - attempt to cut form before beginning
\n;
test_splice (0,-7);
echo absolute offset - relative length - cut nothing\n;
test_splice (2,-7);
echo relative offset - absolute length - cut from beginning\n;
test_splice (-6,2);
echo relative offset - absolute length - cut from middle\n;
test_splice (-4,2);
echo relative
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_
nicholsrFri Oct 26 11:07:31 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array array_splice_variation4.phpt
array_splice_errors.phpt
array_splice_variation3.phpt
array_splice_basic.phpt
array_splice_variation1.phpt
array_splice_variation2.phpt
Log:
new testcases for array_splice
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation4.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation4.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation4.phpt
--TEST--
Test array_splice() function : usage variations - non array replacement values
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
function test_splice ($replacement)
{
$input_array=array(0,1);
var_dump (array_splice ($input_array,2,0,$replacement));
var_dump ($input_array);
}
test_splice (2);
test_splice (2.1);
test_splice (true);
//file type resource
$file_handle = fopen(__FILE__, r);
test_splice ($file_handle);
echo Done\n;
?
--EXPECTF--
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
float(2.1)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
bool(true)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
resource(%d) of type (stream)
}
Done
--UEXPECTF--
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
int(2)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
float(2.1)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
bool(true)
}
array(0) {
}
array(3) {
[0]=
int(0)
[1]=
int(1)
[2]=
resource(%d) of type (stream)
}
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_errors.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_errors.phpt
+++ php-src/ext/standard/tests/array/array_splice_errors.phpt
--TEST--
Test array_splice() function : error conditions
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
echo \n*** Testing error conditions of array_splice() ***\n;
$int=1;
$array=array(1,2);
var_dump (array_splice());
var_dump (array_splice($int));
var_dump (array_splice($array));
var_dump (array_splice($int,$int));
$obj= new stdclass;
var_dump (array_splice($obj,0,1));
echo Done\n;
?
--EXPECTF--
*** Testing error conditions of array_splice() ***
Warning: array_splice() expects at least 2 parameters, 0 given in %s on line %d
NULL
Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
NULL
Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
NULL
Warning: array_splice() expects parameter 1 to be array, integer given in %s on
line %d
NULL
Warning: array_splice() expects parameter 1 to be array, object given in %s on
line %d
NULL
Done
--UEXPECTF--
*** Testing error conditions of array_splice() ***
Warning: array_splice() expects at least 2 parameters, 0 given in %s on line %d
NULL
Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
NULL
Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
NULL
Warning: array_splice() expects parameter 1 to be array, integer given in %s on
line %d
NULL
Warning: array_splice() expects parameter 1 to be array, object given in %s on
line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation3.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/array_splice_variation3.phpt
+++ php-src/ext/standard/tests/array/array_splice_variation3.phpt
--TEST--
Test array_splice() function : usage variations - lengths and offsets
--INI--
--FILE--
?php
/*
* proto array array_splice(array input, int offset [, int length [, array
replacement]])
* Function is implemented in ext/standard/array.c
*/
echo *** array_splice() function : usage variations - lengths and offsets\n;
function test_splice ($offset, $length)
{
echo - No replacement\n;
$input_array=array(0,1,2,3,4,5);
var_dump (array_splice ($input_array,$offset,$length));
var_dump ($input_array);
echo - With replacement\n;
$input_array=array(0,1,2,3,4,5);
var_dump (array_splice ($input_array,$offset,$length,array (A,B,C)));
var_dump ($input_array);
}
echo absolute offset - absolute length - cut from beginning\n;
test_splice (0,2);
echo absolute offset - absolute length - cut from middle\n;
test_splice
[PHP-CVS] cvs: php-src /ext/standard/tests/array max_basic.phpt max_error.phpt max_variation1.phpt max_variation2.phpt min_basic.phpt min_error.phpt min_variation1.phpt min_variation2.phpt
nicholsrFri Oct 26 10:57:59 2007 UTC Added files: /php-src/ext/standard/tests/array max_variation1.phpt max_basic.phpt min_error.phpt min_variation2.phpt max_variation2.phpt max_error.phpt min_variation1.phpt min_basic.phpt Log: new testcases for max and min http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/max_variation1.phpt +++ php-src/ext/standard/tests/array/max_variation1.phpt --TEST-- Test variations in usage of max() --INI-- --FILE-- ?php /* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c */ echo \n*** Testing boundary conditions ***\n; var_dump(max(2147483645, 2147483646) ); var_dump(max(2147483647, 2147483648) ); var_dump(max(2147483646, 2147483648) ); var_dump(max(-2147483647, -2147483646) ); var_dump(max(-2147483648, -2147483647) ); var_dump(max(-2147483649, -2147483647) ); echo \n*** Testing large number of arguments ***\n; var_dump(max(0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14! , 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 1! 1, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0 , 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6! , 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 , 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,0, 1 ,
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_unshift_object.phpt
kraghubaFri Oct 26 11:52:59 2007 UTC
Modified files:
/php-src/ext/standard/tests/array array_unshift_object.phpt
Log:
more testcases for array_unshift() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unshift_object.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/array_unshift_object.phpt
diff -u /dev/null php-src/ext/standard/tests/array/array_unshift_object.phpt:1.2
--- /dev/null Fri Oct 26 11:52:59 2007
+++ php-src/ext/standard/tests/array/array_unshift_object.phpt Fri Oct 26
11:52:59 2007
@@ -0,0 +1,471 @@
+--TEST--
+Test array_unshift() function : passing object for 'var' argument
+--FILE--
+?php
+/* Prototype : int array_unshift(array $array, mixed $var [, mixed ...])
+ * Description: Pushes elements onto the beginning of the array
+ * Source code: ext/standard/array.c
+*/
+
+/*
+ * Testing the functionality of array_unshift() by passing
+ * an object to the $var argument
+*/
+
+echo *** Testing array_unshift() : Passing object to \$var argument ***\n;
+
+// simple class with a variable and method
+class SimpleClass
+{
+ public $var1 = 1;
+ public function fun1() {
+return $var1;
+ }
+}
+
+// class without members
+class EmptyClass
+{
+}
+
+// abstract class
+abstract class AbstractClass
+{
+ protected $var2 = 5;
+ abstract function emptyFunction();
+}
+
+// class deriving the above abstract class
+class ChildClass extends AbstractClass
+{
+ private $var3;
+ public function emptyFunction() {
+echo defined in child;
+ }
+}
+
+// class with final method
+class FinalClass
+{
+ private $var4;
+ final function finalMethod() {
+echo This function can't be overloaded;
+ }
+}
+
+// class with static members
+class StaticClass
+{
+ static $var5 = 2;
+ public static function staticMethod() {
+echo This is a static method;
+ }
+}
+
+// array to be passed to $array argument
+$array = array('f' = first, s = 'second', 1, 2.222);
+
+// array containing different types of objects as elements
+$vars = array(
+ new SimpleClass(),
+ new EmptyClass(),
+ new ChildClass(),
+ new FinalClass(),
+ new StaticClass()
+);
+
+// loop through the various elements of $arrays to check the functionality of
array_unshift
+$iterator = 1;
+foreach($vars as $var) {
+ echo -- Iteration $iterator --\n;
+
+ /* with default argument */
+ // returns element count in the resulting array after arguments are pushed to
+ // beginning of the given array
+ $temp_array = $array;
+ var_dump( array_unshift($temp_array, $var) );
+
+ // dump the resulting array
+ var_dump($temp_array);
+
+ /* with optional arguments */
+ // returns element count in the resulting array after arguments are pushed to
+ // beginning of the given array
+ $temp_array = $array;
+ var_dump( array_unshift($temp_array, $var, hello, 'world') );
+
+ // dump the resulting array
+ var_dump($temp_array);
+ $iterator++;
+}
+
+echo Done;
+?
+--EXPECTF--
+*** Testing array_unshift() : Passing object to $var argument ***
+-- Iteration 1 --
+int(5)
+array(5) {
+ [0]=
+ object(SimpleClass)#%d (1) {
+[var1]=
+int(1)
+ }
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [1]=
+ int(1)
+ [2]=
+ float(2.222)
+}
+int(7)
+array(7) {
+ [0]=
+ object(SimpleClass)#%d (1) {
+[var1]=
+int(1)
+ }
+ [1]=
+ string(5) hello
+ [2]=
+ string(5) world
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [3]=
+ int(1)
+ [4]=
+ float(2.222)
+}
+-- Iteration 2 --
+int(5)
+array(5) {
+ [0]=
+ object(EmptyClass)#%d (0) {
+ }
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [1]=
+ int(1)
+ [2]=
+ float(2.222)
+}
+int(7)
+array(7) {
+ [0]=
+ object(EmptyClass)#%d (0) {
+ }
+ [1]=
+ string(5) hello
+ [2]=
+ string(5) world
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [3]=
+ int(1)
+ [4]=
+ float(2.222)
+}
+-- Iteration 3 --
+int(5)
+array(5) {
+ [0]=
+ object(ChildClass)#%d (2) {
+[var3:ChildClass:private]=
+NULL
+[var2:protected]=
+int(5)
+ }
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [1]=
+ int(1)
+ [2]=
+ float(2.222)
+}
+int(7)
+array(7) {
+ [0]=
+ object(ChildClass)#%d (2) {
+[var3:ChildClass:private]=
+NULL
+[var2:protected]=
+int(5)
+ }
+ [1]=
+ string(5) hello
+ [2]=
+ string(5) world
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [3]=
+ int(1)
+ [4]=
+ float(2.222)
+}
+-- Iteration 4 --
+int(5)
+array(5) {
+ [0]=
+ object(FinalClass)#%d (1) {
+[var4:FinalClass:private]=
+NULL
+ }
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [1]=
+ int(1)
+ [2]=
+ float(2.222)
+}
+int(7)
+array(7) {
+ [0]=
+ object(FinalClass)#%d (1) {
+[var4:FinalClass:private]=
+NULL
+ }
+ [1]=
+ string(5) hello
+ [2]=
+ string(5) world
+ [f]=
+ string(5) first
+ [s]=
+ string(6) second
+ [3]=
+ int(1)
+ [4]=
+ float(2.222)
+}
+-- Iteration 5 --
+int(5)
+array(5) {
+ [0]=
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_unshift_object.phpt
kraghubaFri Oct 26 11:49:50 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_unshift_object.phpt Log: more testcases for array_unshift() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unshift_object.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_unshift_object.phpt +++ php-src/ext/standard/tests/array/array_unshift_object.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/standard/tests/array array_unshift_object.phpt
kraghubaFri Oct 26 11:47:49 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_unshift_object.phpt Log: more testcases for array_unshift() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_unshift_object.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_unshift_object.phpt +++ php-src/ext/standard/tests/array/array_unshift_object.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array max_basic.phpt max_error.phpt max_variation1.phpt max_variation2.phpt min_basic.phpt min_error.phpt min_variation1.phpt min_variation2.php
Hello Robert, thanks for providing new test cases! Friday, October 26, 2007, 1:02:04 PM, you wrote: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/min_error.phpt +++ php-src/ext/standard/tests/array/min_error.phpt --TEST-- Test wrong number of arguments for min() --INI-- --FILE-- ?php /* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c */ Personally i think it looks better if the *'s are all aligned. echo \n*** Testing Error Conditions ***\n; I mostly end the script with '?' then have a line starting and ending with '===' and then the text followed by a '/php' on the next line. The reason for this is that '===DONE===' already has a special meaning. So the dividers could look the same. var_dump(min()); var_dump(min(1)); var_dump(min(array())); var_dump(min(new stdclass)); ? --EXPECTF-- *** Testing Error Conditions *** Warning: min(): At%seast one %s on line %d NULL Warning: Wrong parameter count for min() in %s on line %d NULL Warning: min(): Array must contain at%seast one element in %s on line %d bool(false) Warning: Wrong parameter count for min() in %s on line %d NULL --UEXPECTF-- Please do not add --U* expectations in 5.*. I am not even sure that is allowed. *** Testing Error Conditions *** Warning: min(): At%seast one %s on line %d NULL Warning: Wrong parameter count for min() in %s on line %d NULL Warning: min(): Array must contain at%seast one element in %s on line %d bool(false) Warning: Wrong parameter count for min() in %s on line %d NULL thanks for the work anyway. Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_splic
Hello Robert, Friday, October 26, 2007, 1:06:31 PM, you wrote: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_splice_variation1.phpt +++ php-src/ext/standard/tests/array/array_splice_variation1.phpt --TEST-- Test array_splice() function : usage variations - references Do not add a blank line in --TEST--. That block must have exactly one line. --INI-- Do not provide empty blocls like this --INI-- one. --FILE-- ?php /* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c */ $input_array=array (array(1,2)); $input_array[]=$input_array[0]; var_dump (array_splice ($input_array[0],1,1)); var_dump ($input_array); Our normal coding style has no space between function and opening brace. But we do have spaces after commas and between operators. Sharing that style makes the code much more readable to all people that deal with tests. Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array max_basic.phpt max_error.phpt max_variation1.phpt max_variation2.phpt min_basic.phpt min_error.phpt min_variation1.phpt min_variation2.php
Hi Marcus, thanks for the feedback I will correct the formatting issues. I'd like to re-assure you that all the testcases I just checked in were tested against this morning's snapshots on 5.2 , 5.3 and 6.0 on both windows and linux (6 tests for each testcases.) I'm confused about your comment on checking in UEXPECTF into a PHP5 branch. I'm confident that what is in CVS is now correct but I think maybe the sequence of events I used is incorrect - please comment. I first checked a PHP6 testcase into HEAD. Then I checked the PHP5 testcase into the PHP5_2 and PHP5_3 branches. The resulting log looks like this: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_error.phpt?view=log I notice that this looks the same as the logs from new files checked in by others http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_fill_error.phpt?view=log Is there a better way? I want to make my checkins as painless for you watching the commits as possible. I know how tiresome that job is! Thanks again. Unless stated otherwise above: IBM United Kingdom Limited - Registered in England and Wales with number 741598. Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array max_basic.phpt max_error.phpt max_variation1.phpt max_variation2.phpt min_basic.phpt min_error.phpt min_variation1.phpt min_variation2.php
Hello Rob, Friday, October 26, 2007, 5:18:32 PM, you wrote: Hi Marcus, thanks for the feedback I will correct the formatting issues. I'd like to re-assure you that all the testcases I just checked in were tested against this morning's snapshots on 5.2 , 5.3 and 6.0 on both windows and linux (6 tests for each testcases.) I'm confused about your comment on checking in UEXPECTF into a PHP5 branch. I'm confident that what is in CVS is now correct but I think maybe the sequence of events I used is incorrect - please comment. Hmm, looks I read that wrong, because the check-in versions are all fine. and yes you do it perfectly correct. HEAD first then 5.3 and 5.2. Actually you can think of not doing it for 5.2 if your lazy. And if you want to be absolutely correct, then you'd prefix the 5.* commit messages with MFH: which stands for Merge From Head. If it were the other way round (checking in to the branch first), then you'd prefix with MFB or MFB5_3 which means Merge From Base. Btw, there's two more things which however you do not need for test commits. [DOC], triggers a mail to [EMAIL PROTECTED], so that documenters know there is a feature change. BFN means Bug Fixing News, it is followed by the bug description #12334 (test name) or several. Also when fixing one would use those lines. And last but not least when comitting to Zend then the commit has to be split into one for Zend and one for the rest. Best regards, Marcus p.s.: It is very nice to see how much IBM helps lately! -- 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/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_
nicholsrFri Oct 26 16:08:35 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array min_error.phpt array_splice_variation3.phpt max_basic.phpt min_variation2.phpt array_splice_variation1.phpt max_variation1.phpt array_splice_variation4.phpt array_splice_errors.phpt array_splice_basic.phpt min_basic.phpt max_variation2.phpt max_error.phpt array_splice_variation2.phpt min_variation1.phpt Log: Remove unneeded INI sections http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_error.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/min_error.phpt diff -u php-src/ext/standard/tests/array/min_error.phpt:1.1.4.2 php-src/ext/standard/tests/array/min_error.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/min_error.phpt:1.1.4.2 Fri Oct 26 11:02:04 2007 +++ php-src/ext/standard/tests/array/min_error.phpt Fri Oct 26 16:08:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for min() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation3.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation3.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1.4.2 Fri Oct 26 11:07:31 2007 +++ php-src/ext/standard/tests/array/array_splice_variation3.phpt Fri Oct 26 16:08:34 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - lengths and offsets - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_basic.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/max_basic.phpt diff -u php-src/ext/standard/tests/array/max_basic.phpt:1.1.4.2 php-src/ext/standard/tests/array/max_basic.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/max_basic.phpt:1.1.4.2 Fri Oct 26 11:02:04 2007 +++ php-src/ext/standard/tests/array/max_basic.phpt Fri Oct 26 16:08:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test return type and value for expected input max() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_variation2.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/min_variation2.phpt diff -u php-src/ext/standard/tests/array/min_variation2.phpt:1.1.4.2 php-src/ext/standard/tests/array/min_variation2.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/min_variation2.phpt:1.1.4.2Fri Oct 26 11:02:04 2007 +++ php-src/ext/standard/tests/array/min_variation2.phptFri Oct 26 16:08:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of min() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation1.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation1.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_splice_variation1.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_splice_variation1.phpt:1.1.4.2 Fri Oct 26 11:07:31 2007 +++ php-src/ext/standard/tests/array/array_splice_variation1.phpt Fri Oct 26 16:08:34 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - references - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_variation1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/max_variation1.phpt diff -u php-src/ext/standard/tests/array/max_variation1.phpt:1.1.4.2 php-src/ext/standard/tests/array/max_variation1.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/max_variation1.phpt:1.1.4.2Fri Oct 26 11:02:04 2007 +++ php-src/ext/standard/tests/array/max_variation1.phptFri Oct 26 16:08:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of max() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation4.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation4.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation4.phpt:1.1.4.2
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_splice_va
nicholsrFri Oct 26 16:10:17 2007 UTC Modified files: /php-src/ext/standard/tests/array array_splice_variation1.phpt max_variation1.phpt array_splice_variation2.phpt min_variation2.phpt max_variation2.phpt array_splice_variation3.phpt min_variation1.phpt array_splice_errors.phpt array_splice_variation4.phpt min_basic.phpt max_basic.phpt min_error.phpt array_splice_basic.phpt max_error.phpt Log: Remove unneeded INI sections http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation1.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation1.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation1.phpt:1.1 php-src/ext/standard/tests/array/array_splice_variation1.phpt:1.2 --- php-src/ext/standard/tests/array/array_splice_variation1.phpt:1.1 Fri Oct 26 11:06:31 2007 +++ php-src/ext/standard/tests/array/array_splice_variation1.phpt Fri Oct 26 16:10:16 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - references - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_variation1.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/max_variation1.phpt diff -u php-src/ext/standard/tests/array/max_variation1.phpt:1.1 php-src/ext/standard/tests/array/max_variation1.phpt:1.2 --- php-src/ext/standard/tests/array/max_variation1.phpt:1.1Fri Oct 26 10:57:59 2007 +++ php-src/ext/standard/tests/array/max_variation1.phptFri Oct 26 16:10:16 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of max() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation2.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation2.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation2.phpt:1.1 php-src/ext/standard/tests/array/array_splice_variation2.phpt:1.2 --- php-src/ext/standard/tests/array/array_splice_variation2.phpt:1.1 Fri Oct 26 11:06:31 2007 +++ php-src/ext/standard/tests/array/array_splice_variation2.phpt Fri Oct 26 16:10:16 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - additional parameters - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_variation2.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/min_variation2.phpt diff -u php-src/ext/standard/tests/array/min_variation2.phpt:1.1 php-src/ext/standard/tests/array/min_variation2.phpt:1.2 --- php-src/ext/standard/tests/array/min_variation2.phpt:1.1Fri Oct 26 10:57:59 2007 +++ php-src/ext/standard/tests/array/min_variation2.phptFri Oct 26 16:10:16 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of min() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_variation2.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/max_variation2.phpt diff -u php-src/ext/standard/tests/array/max_variation2.phpt:1.1 php-src/ext/standard/tests/array/max_variation2.phpt:1.2 --- php-src/ext/standard/tests/array/max_variation2.phpt:1.1Fri Oct 26 10:57:59 2007 +++ php-src/ext/standard/tests/array/max_variation2.phptFri Oct 26 16:10:16 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of max() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation3.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation3.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1 php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.2 --- php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1 Fri Oct 26 11:06:31 2007 +++ php-src/ext/standard/tests/array/array_splice_variation3.phpt Fri Oct 26 16:10:16 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - lengths and offsets - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_variation1.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/min_variation1.phpt diff -u php-src/ext/standard/tests/array/min_variation1.phpt:1.1 php-src/ext/standard/tests/array/min_variation1.phpt:1.2 --- php-src/ext/standard/tests/array/min_variation1.phpt:1.1Fri Oct 26 10:57:59 2007 +++
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_splic
Marcus Boerger wrote: $input_array=array (array(1,2)); $input_array[]=$input_array[0]; var_dump (array_splice ($input_array[0],1,1)); var_dump ($input_array); Rob - are you using the test case generator to help produce these? If so I should maybe modify the formatting to meet the guidelines? Also - an earlier version of the generator did add blank --INI-- sections - but I think I took that out (I certainly meant to). I'll check and fix if I forgot. Zoe Our normal coding style has no space between function and opening brace. But we do have spaces after commas and between operators. Sharing that style makes the code much more readable to all people that deal with tests. Best regards, Marcus -- 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/standard/tests/array array_splice_basic.phpt array_splice_errors.phpt array_splice_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt array_
nicholsrFri Oct 26 16:09:34 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array max_variation1.phpt array_splice_variation2.phpt array_splice_variation3.phpt max_basic.phpt array_splice_basic.phpt min_variation1.phpt max_variation2.phpt min_basic.phpt min_error.phpt array_splice_variation4.phpt array_splice_errors.phpt array_splice_variation1.phpt max_error.phpt min_variation2.phpt Log: Remove unneeded INI sections http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_variation1.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/max_variation1.phpt diff -u php-src/ext/standard/tests/array/max_variation1.phpt:1.1.2.2 php-src/ext/standard/tests/array/max_variation1.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/max_variation1.phpt:1.1.2.2Fri Oct 26 11:01:35 2007 +++ php-src/ext/standard/tests/array/max_variation1.phptFri Oct 26 16:09:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of max() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation2.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_splice_variation2.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_splice_variation2.phpt:1.1.2.2 Fri Oct 26 11:07:13 2007 +++ php-src/ext/standard/tests/array/array_splice_variation2.phpt Fri Oct 26 16:09:34 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - additional parameters - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_variation3.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/array_splice_variation3.phpt diff -u php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_splice_variation3.phpt:1.1.2.2 Fri Oct 26 11:07:13 2007 +++ php-src/ext/standard/tests/array/array_splice_variation3.phpt Fri Oct 26 16:09:34 2007 @@ -1,7 +1,5 @@ --TEST-- Test array_splice() function : usage variations - lengths and offsets - ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/max_basic.phpt diff -u php-src/ext/standard/tests/array/max_basic.phpt:1.1.2.2 php-src/ext/standard/tests/array/max_basic.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/max_basic.phpt:1.1.2.2 Fri Oct 26 11:01:35 2007 +++ php-src/ext/standard/tests/array/max_basic.phpt Fri Oct 26 16:09:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test return type and value for expected input max() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_splice_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/array_splice_basic.phpt diff -u php-src/ext/standard/tests/array/array_splice_basic.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_splice_basic.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_splice_basic.phpt:1.1.2.2Fri Oct 26 11:07:13 2007 +++ php-src/ext/standard/tests/array/array_splice_basic.phptFri Oct 26 16:09:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test array_splice(): basic functionality ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/min_variation1.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/min_variation1.phpt diff -u php-src/ext/standard/tests/array/min_variation1.phpt:1.1.2.2 php-src/ext/standard/tests/array/min_variation1.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/min_variation1.phpt:1.1.2.2Fri Oct 26 11:01:35 2007 +++ php-src/ext/standard/tests/array/min_variation1.phptFri Oct 26 16:09:34 2007 @@ -1,6 +1,5 @@ --TEST-- Test variations in usage of min() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/max_variation2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/max_variation2.phpt diff -u php-src/ext/standard/tests/array/max_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/array/max_variation2.phpt:1.1.2.3
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
stasFri Oct 26 17:45:26 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: add attribution http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.988r2=1.2027.2.547.2.989diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.988 php-src/NEWS:1.2027.2.547.2.989 --- php-src/NEWS:1.2027.2.547.2.988 Fri Oct 26 08:13:15 2007 +++ php-src/NEWSFri Oct 26 17:45:26 2007 @@ -26,15 +26,16 @@ - Fixed dl() to limit argument size to MAXPATHLEN (CVE-2007-4887). (Christian Hoffmann) - Fixed iconv_*() functions to limit argument sizes as workaround to libc - bug (CVE-2007-4783, CVE-2007-4840). (Christian Hoffmann, Stas) + bug (CVE-2007-4783, CVE-2007-4840 by Laurent Gaffie). + (Christian Hoffmann, Stas) - Fixed missing brackets leading to build warning and error in the log. - Win32 code). (Andrey) + Win32 code. (Andrey) - Fixed leaks with multiple connects on one mysqli object. (Andrey) - Fixed endianness detection on MacOS when building universal binary. (Uwe Schindler, Christian Speich, Tony) - Fixed possible triggering of buffer overflows inside glibc implementations of the fnmatch(), setlocale() and glob() functions. - Reported by Laurent gaffie. (Ilia) + Reported by Laurent Gaffie. (Ilia) - Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) - Fixed htmlentities/htmlspecialchars not to accept partial multibyte sequences. (Stas) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
