Reverted fix for bug #34934. The bug marked as bogus.

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4727659c0721a0ee034661c557f9b6c8807d3d68..a5ec285b85127000f99002f181049b13ea309552 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -4658,17 +4658,6 @@ PHP_FUNCTION(array_key_exists)
                RETURN_FALSE;
        }
 
-       if (Z_TYPE_PP(array) == IS_OBJECT &&
-           Z_OBJ_HT_PP(array)->has_dimension &&
-           (Z_OBJ_HT_PP(array)->has_dimension != std_object_handlers.has_dimension ||
-            instanceof_function_ex(Z_OBJCE_PP(array), U_CLASS_ENTRY(zend_ce_arrayaccess), 1 TSRMLS_CC))) {
-               if (Z_OBJ_HT_PP(array)->has_dimension(*array, *key, 0 TSRMLS_CC)) {
-                       RETURN_TRUE;
-               } else {
-                       RETURN_FALSE;
-               }
-       }
-
        switch (Z_TYPE_PP(key)) {
                case IS_STRING:
                case IS_UNICODE:

diff --git a/ext/standard/tests/array/bug34934.phpt b/ext/standard/tests/array/bug34934.phpt
deleted file mode 100755 (executable)
index 1f5d161..0000000
--- a/ext/standard/tests/array/bug34934.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Bug #34934 (offsetExists is not called from array_key_exists)
---FILE--
-<?php
-class MyArray extends ArrayObject {
-  function offsetExists($mKey) { 
-       echo __METHOD__ . "($mKey)\n";
-       return true;
-  }
-}
-
-$a = new MyArray();
-
-var_dump(array_key_exists("test", $a));
-?>
---EXPECT--
-MyArray::offsetExists(test)
-bool(true)