jani            Tue Nov  6 13:26:24 2007 UTC

  Modified files:              
    /php-src/ext/standard       array.c 
    /php-src/ext/standard/tests/array   array_intersect_assoc_error.phpt 
                                        array_intersect_assoc_variation1.phpt 
                                        array_intersect_assoc_variation2.phpt 
  Log:
  - Fixed bug #43196 (array_intersect_assoc() crashes with non-array input)
  # Note: Same problem was with array_diff_assoc()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.428&r2=1.429&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.428 php-src/ext/standard/array.c:1.429
--- php-src/ext/standard/array.c:1.428  Mon Nov  5 23:55:21 2007
+++ php-src/ext/standard/array.c        Tue Nov  6 13:26:24 2007
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.428 2007/11/05 23:55:21 iliaa Exp $ */
+/* $Id: array.c,v 1.429 2007/11/06 13:26:24 jani Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -2987,13 +2987,24 @@
                }
        }
 
+       if (Z_TYPE_PP(args[0]) != IS_ARRAY) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #1 is not 
an array");
+               RETVAL_NULL();
+               goto out;
+       }
+
        array_init(return_value);
 
        for (p = Z_ARRVAL_PP(args[0])->pListHead; p != NULL; p = p->pListNext) {
                if (p->nKeyLength == 0) {
                        ok = 1;
                        for (i = 1; i < argc; i++) {
-                               if (zend_hash_index_find(Z_ARRVAL_PP(args[i]), 
p->h, (void**)&data) == FAILURE ||
+                               if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+                                       php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Argument #%d is not an array", i + 1);
+                                       zval_dtor(return_value);
+                                       RETVAL_NULL();
+                                       goto out;
+                               } else if 
(zend_hash_index_find(Z_ARRVAL_PP(args[i]), p->h, (void**)&data) == FAILURE ||
                                        (intersect_data_compare_func &&
                                        
intersect_data_compare_func((zval**)p->pData, data TSRMLS_CC) != 0)
                                ) {
@@ -3008,7 +3019,12 @@
                } else {
                        ok = 1;
                        for (i = 1; i < argc; i++) {
-                               if 
(zend_u_hash_quick_find(Z_ARRVAL_PP(args[i]), p->key.type, 
ZSTR(p->key.arKey.s), p->nKeyLength, p->h, (void**)&data) == FAILURE ||
+                               if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+                                       php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Argument #%d is not an array", i + 1);
+                                       zval_dtor(return_value);
+                                       RETVAL_NULL();
+                                       goto out;
+                               } else if 
(zend_u_hash_quick_find(Z_ARRVAL_PP(args[i]), p->key.type, 
ZSTR(p->key.arKey.s), p->nKeyLength, p->h, (void**)&data) == FAILURE ||
                                        (intersect_data_compare_func &&
                                        
intersect_data_compare_func((zval**)p->pData, data TSRMLS_CC) != 0)
                                ) {
@@ -3022,6 +3038,7 @@
                        }
                }
        }
+out:
        efree(args);
 }
 /* }}} */
@@ -3388,13 +3405,24 @@
                }
        }
 
+       if (Z_TYPE_PP(args[0]) != IS_ARRAY) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #1 is not 
an array");
+               RETVAL_NULL();
+               goto out;
+       }
+
        array_init(return_value);
 
        for (p = Z_ARRVAL_PP(args[0])->pListHead; p != NULL; p = p->pListNext) {
                if (p->nKeyLength == 0) {
                        ok = 1;
                        for (i = 1; i < argc; i++) {
-                               if (zend_hash_index_find(Z_ARRVAL_PP(args[i]), 
p->h, (void**)&data) == SUCCESS &&
+                               if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+                                       php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Argument #%d is not an array", i + 1);
+                                       zval_dtor(return_value);
+                                       RETVAL_NULL();
+                                       goto out;
+                               } else if 
(zend_hash_index_find(Z_ARRVAL_PP(args[i]), p->h, (void**)&data) == SUCCESS &&
                                        (!diff_data_compare_func ||
                                        
diff_data_compare_func((zval**)p->pData, data TSRMLS_CC) == 0)
                                ) {
@@ -3409,7 +3437,12 @@
                } else {
                        ok = 1;
                        for (i = 1; i < argc; i++) {
-                               if 
(zend_u_hash_quick_find(Z_ARRVAL_PP(args[i]), p->key.type, 
ZSTR(p->key.arKey.s), p->nKeyLength, p->h, (void**)&data) == SUCCESS &&
+                               if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+                                       php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Argument #%d is not an array", i + 1);
+                                       zval_dtor(return_value);
+                                       RETVAL_NULL();
+                                       goto out;
+                               } else if 
(zend_u_hash_quick_find(Z_ARRVAL_PP(args[i]), p->key.type, 
ZSTR(p->key.arKey.s), p->nKeyLength, p->h, (void**)&data) == SUCCESS &&
                                        (!diff_data_compare_func ||
                                        
diff_data_compare_func((zval**)p->pData, data TSRMLS_CC) == 0)
                                ) {
@@ -3423,6 +3456,7 @@
                        }
                }
        }
+out:
        efree(args);
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt
diff -u php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt:1.1 
php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt:1.2
--- php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt:1.1       
Mon Nov  5 13:50:33 2007
+++ php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt   Tue Nov 
 6 13:26:24 2007
@@ -1,5 +1,5 @@
 --TEST--
-Test array_intersect_assoc() function : error conditions(Bug#43197)
+Test array_intersect_assoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array 
$...])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
diff -u 
php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt:1.2 
php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt:1.3
--- php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt:1.2  
Tue Nov  6 12:09:12 2007
+++ php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt      
Tue Nov  6 13:26:24 2007
@@ -1,5 +1,5 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - unexpected values 
for 'arr1' argument(Bug#43196)
+Test array_intersect_assoc() function : usage variations - unexpected values 
for 'arr1' argument
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array 
$...])
@@ -109,344 +109,173 @@
 echo "Done";
 ?>
 --EXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $arr1 
argument ***
 
--- Iterator 1 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 1 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 2 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 2 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 3 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 3 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 4 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 4 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 5 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 5 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 6 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 6 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 7 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 7 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 8 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 8 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 9 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 9 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 10 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 10 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 11 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 11 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 12 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 12 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 13 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 13 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 14 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 14 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 15 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 15 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 16 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 16 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 17 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 17 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 18 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 18 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 19 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 19 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 20 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 20 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 21 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 21 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 22 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 22 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 23 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 23 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
--- Iterator 24 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 24 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
-
--- Iterator 1 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 2 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 3 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 4 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 5 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 6 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 7 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 8 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 9 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 10 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 11 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 12 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 13 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 14 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 15 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 16 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 17 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 18 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 19 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 20 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 21 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 22 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 23 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 24 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
diff -u 
php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt:1.2 
php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt:1.3
--- php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt:1.2  
Tue Nov  6 12:09:12 2007
+++ php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt      
Tue Nov  6 13:26:24 2007
@@ -1,5 +1,5 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - unexpected values 
for 'arr2' argument(Bug#43196)
+Test array_intersect_assoc() function : usage variations - unexpected values 
for 'arr2' argument
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array 
$...])
@@ -110,344 +110,173 @@
 echo "Done";
 ?>
 --EXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $arr2 
argument ***
 
--- Iterator 1 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 1 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 2 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 2 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 3 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 3 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 4 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 4 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 5 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 5 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 6 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 6 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 7 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 7 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 8 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 8 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 9 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 9 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 10 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 10 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 11 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 11 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 12 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 12 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 13 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 13 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 14 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 14 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 15 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 15 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 16 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 16 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 17 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 17 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 18 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 18 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 19 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 19 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 20 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 20 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 21 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 21 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 22 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 22 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 23 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 23 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
--- Iterator 24 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 24 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
-
--- Iterator 1 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 2 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 3 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 4 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 5 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 6 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 7 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 8 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 9 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 10 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 11 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 12 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 13 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 14 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 15 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 16 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 17 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 18 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 19 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 20 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 21 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 22 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 23 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 24 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 Done

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

Reply via email to