stas            Tue Nov 25 22:13:45 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/array   array_key_exists.phpt 
                                        array_key_exists_object1.phpt 
                                        array_key_exists_object2.phpt 
                                        array_key_exists_variation2.phpt 
                                        array_walk_object1.phpt 
                                        array_walk_objects.phpt 
                                        array_walk_rec_objects.phpt 
                                        array_walk_recursive_object1.phpt 
                                        current_variation1.phpt 
                                        end_variation1.phpt 
                                        key_variation1.phpt 
                                        next_variation1.phpt 
                                        prev_variation1.phpt 
                                        reset_variation1.phpt 
  Log:
  fix tests for array/object BC
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_key_exists.phpt
diff -u php-src/ext/standard/tests/array/array_key_exists.phpt:1.1.2.3.2.2 
php-src/ext/standard/tests/array/array_key_exists.phpt:1.1.2.3.2.3
--- php-src/ext/standard/tests/array/array_key_exists.phpt:1.1.2.3.2.2  Fri Aug 
29 03:05:43 2008
+++ php-src/ext/standard/tests/array/array_key_exists.phpt      Tue Nov 25 
22:13:44 2008
@@ -280,23 +280,13 @@
 bool(false)
 
 *** Testing operation on objects ***
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(false)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
 bool(true)
 
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+Warning: array_key_exists(): The first argument should be either a string or 
an integer in %s on line %d
+bool(false)
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_object1.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_key_exists_object1.phpt
diff -u php-src/ext/standard/tests/array/array_key_exists_object1.phpt:1.1.4.3 
php-src/ext/standard/tests/array/array_key_exists_object1.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/array_key_exists_object1.phpt:1.1.4.3      
Fri Aug 29 03:05:43 2008
+++ php-src/ext/standard/tests/array/array_key_exists_object1.phpt      Tue Nov 
25 22:13:44 2008
@@ -52,15 +52,11 @@
 
 -- Do not assign a value to $class1->var3 --
 $key = var1:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(true)
 $key = var3:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(true)
 $class1:
-object(myClass)#%d (3) {
+object(myClass)#1 (3) {
   ["var1"]=>
   string(1) "a"
   ["var2"]=>
@@ -71,11 +67,9 @@
 
 -- Assign a value to $class2->var3 --
 $key = var3:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(true)
 $class2:
-object(myClass)#%d (3) {
+object(myClass)#2 (3) {
   ["var1"]=>
   string(1) "x"
   ["var2"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_object2.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_key_exists_object2.phpt
diff -u php-src/ext/standard/tests/array/array_key_exists_object2.phpt:1.1.4.3 
php-src/ext/standard/tests/array/array_key_exists_object2.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/array_key_exists_object2.phpt:1.1.4.3      
Fri Aug 29 03:05:43 2008
+++ php-src/ext/standard/tests/array/array_key_exists_object2.phpt      Tue Nov 
25 22:13:44 2008
@@ -54,19 +54,13 @@
 
 -- Do not assign a value to $class1->var3 --
 $key = var1:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(true)
 $key = var2:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(false)
 $key = var3:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(false)
 $class1:
-object(myClass)#%d (3) {
+object(myClass)#1 (3) {
   ["var1"]=>
   string(1) "a"
   ["var2":protected]=>
@@ -77,11 +71,9 @@
 
 -- Assign a value to $class2->var3 --
 $key = var3:
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(false)
 $class2:
-object(myClass)#%d (3) {
+object(myClass)#2 (3) {
   ["var1"]=>
   string(1) "x"
   ["var2":protected]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_variation2.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_key_exists_variation2.phpt
diff -u 
php-src/ext/standard/tests/array/array_key_exists_variation2.phpt:1.1.4.3 
php-src/ext/standard/tests/array/array_key_exists_variation2.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/array_key_exists_variation2.phpt:1.1.4.3   
Fri Aug 29 03:05:43 2008
+++ php-src/ext/standard/tests/array/array_key_exists_variation2.phpt   Tue Nov 
25 22:13:44 2008
@@ -206,9 +206,7 @@
 NULL
 
 -- Iteration 22 --
-
-Warning: array_key_exists() expects parameter 2 to be array, object given in 
%s on line %d
-NULL
+bool(false)
 
 -- Iteration 23 --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_object1.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_object1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_objects.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_objects.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_rec_objects.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_rec_objects.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive_object1.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_recursive_object1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/current_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/current_variation1.phpt
diff -u php-src/ext/standard/tests/array/current_variation1.phpt:1.1.4.2 
php-src/ext/standard/tests/array/current_variation1.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/current_variation1.phpt:1.1.4.2    Wed Feb 
20 14:20:31 2008
+++ php-src/ext/standard/tests/array/current_variation1.phpt    Tue Nov 25 
22:13:44 2008
@@ -198,8 +198,6 @@
 NULL
 
 -- Iteration 21 --
-
-Warning: current() expects parameter 1 to be array, object given in %s on line 
%d
 NULL
 
 -- Iteration 22 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/end_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/end_variation1.phpt
diff -u php-src/ext/standard/tests/array/end_variation1.phpt:1.1.4.2 
php-src/ext/standard/tests/array/end_variation1.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/end_variation1.phpt:1.1.4.2        Thu Feb 
21 16:39:02 2008
+++ php-src/ext/standard/tests/array/end_variation1.phpt        Tue Nov 25 
22:13:44 2008
@@ -201,9 +201,7 @@
 NULL
 
 -- Iteration 22 --
-
-Warning: end() expects parameter 1 to be array, object given in %s on line %d
-NULL
+string(12) "hello, world"
 
 -- Iteration 23 --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/key_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/key_variation1.phpt
diff -u php-src/ext/standard/tests/array/key_variation1.phpt:1.1.4.2 
php-src/ext/standard/tests/array/key_variation1.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/key_variation1.phpt:1.1.4.2        Thu Feb 
21 14:34:41 2008
+++ php-src/ext/standard/tests/array/key_variation1.phpt        Tue Nov 25 
22:13:44 2008
@@ -201,9 +201,7 @@
 NULL
 
 -- Iteration 22 --
-
-Warning: key() expects parameter 1 to be array, object given in %s on line %d
-NULL
+string(4) "var1"
 
 -- Iteration 23 --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/next_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/next_variation1.phpt
diff -u php-src/ext/standard/tests/array/next_variation1.phpt:1.1.4.2 
php-src/ext/standard/tests/array/next_variation1.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/next_variation1.phpt:1.1.4.2       Thu Feb 
21 16:39:02 2008
+++ php-src/ext/standard/tests/array/next_variation1.phpt       Tue Nov 25 
22:13:44 2008
@@ -200,9 +200,7 @@
 NULL
 
 -- Iteration 22 --
-
-Warning: next() expects parameter 1 to be array, object given in %s on line %d
-NULL
+bool(false)
 
 -- Iteration 23 --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/prev_variation1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/prev_variation1.phpt
diff -u php-src/ext/standard/tests/array/prev_variation1.phpt:1.1.2.2 
php-src/ext/standard/tests/array/prev_variation1.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/prev_variation1.phpt:1.1.2.2       Thu Sep 
11 18:21:37 2008
+++ php-src/ext/standard/tests/array/prev_variation1.phpt       Tue Nov 25 
22:13:44 2008
@@ -200,9 +200,7 @@
 NULL
 
 -- Iteration 22 --
-
-Warning: prev() expects parameter 1 to be array, object given in %s on line %d
-NULL
+bool(false)
 
 -- Iteration 23 --
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/reset_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/array/reset_variation1.phpt
diff -u php-src/ext/standard/tests/array/reset_variation1.phpt:1.1.4.2 
php-src/ext/standard/tests/array/reset_variation1.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/reset_variation1.phpt:1.1.4.2      Fri Feb 
22 09:19:56 2008
+++ php-src/ext/standard/tests/array/reset_variation1.phpt      Tue Nov 25 
22:13:44 2008
@@ -200,9 +200,7 @@
 NULL
 
 -- Iteration 22 --
-
-Warning: reset() expects parameter 1 to be array, object given in %s on line %d
-NULL
+bool(false)
 
 -- Iteration 23 --
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to