php · smalyshev · Oct 22, 2014 · Oct 22, 2014 · Oct 27, 2014
diff --git a/Zend/tests/hashkey/001.phpt b/Zend/tests/hashkey/001.phpt
@@ -0,0 +1,24 @@
+--TEST--
+testing hash returns string
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return __CLASS__;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  ["Foo"]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/002.phpt b/Zend/tests/hashkey/002.phpt
@@ -0,0 +1,26 @@
+--TEST--
+testing hash inheritance
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return static::class;
+    }
+}
+
+class Bar extends Foo {}
+
+$bar = new Bar();
+$test = [
+    $bar => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  ["Bar"]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/003.phpt b/Zend/tests/hashkey/003.phpt
@@ -0,0 +1,24 @@
+--TEST--
+testing hash returns true
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return true;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  [1]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/004.phpt b/Zend/tests/hashkey/004.phpt
@@ -0,0 +1,24 @@
+--TEST--
+testing hash returns false
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return false;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  [0]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/005.phpt b/Zend/tests/hashkey/005.phpt
@@ -0,0 +1,24 @@
+--TEST--
+testing hash returns null
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return null;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  [""]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/006.phpt b/Zend/tests/hashkey/006.phpt
@@ -0,0 +1,23 @@
+--TEST--
+testing hash returns object
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return new stdClass();
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECTF--	
+Warning: Illegal offset type in %s on line %d
+array(0) {
+}
+
+
diff --git a/Zend/tests/hashkey/007.phpt b/Zend/tests/hashkey/007.phpt
@@ -0,0 +1,23 @@
+--TEST--
+testing hash returns array
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return [];
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECTF--	
+Warning: Illegal offset type in %s on line %d
+array(0) {
+}
+
+
diff --git a/Zend/tests/hashkey/008.phpt b/Zend/tests/hashkey/008.phpt
@@ -0,0 +1,24 @@
+--TEST--
+testing hash returns double
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return 10.1;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  [10]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/009.phpt b/Zend/tests/hashkey/009.phpt
@@ -0,0 +1,24 @@
+--TEST--
+testing hash returns long
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return 10;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECT--	
+array(1) {
+  [10]=>
+  bool(true)
+}
+
+
diff --git a/Zend/tests/hashkey/010.phpt b/Zend/tests/hashkey/010.phpt
@@ -0,0 +1,23 @@
+--TEST--
+testing hash returns resource
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return fopen("php://stdin", "r");
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true
+];
+
+var_dump($test);
+?>
+--EXPECTF--	
+Warning: Illegal offset type in %s on line 11
+array(0) {
+}
+
+
diff --git a/Zend/tests/hashkey/011.phpt b/Zend/tests/hashkey/011.phpt
@@ -0,0 +1,48 @@
+--TEST--
+testing hash returns string, different ops
+--FILE--
+<?php
+class Foo {
+    public function __hash() {
+        return __CLASS__;
+    }
+}
+
+$foo = new Foo();
+$test = [
+    $foo => true,
+    "bar" => false,
+];
+
+var_dump($test);
+var_dump($test[$foo]);
+var_dump(isset($test[$foo]));
+unset($test[$foo]);
+var_dump($test);
+var_dump(empty($test[$foo]));
+$test[$foo] = 42;
+$test[$foo]++;
+var_dump($test);
+?>
+--EXPECT--	
+array(2) {
+  ["Foo"]=>
+  bool(true)
+  ["bar"]=>
+  bool(false)
+}
+bool(true)
+bool(true)
+array(1) {
+  ["bar"]=>
+  bool(false)
+}
+bool(true)
+array(2) {
+  ["bar"]=>
+  bool(false)
+  ["Foo"]=>
+  int(43)
+}
+
+
@@ -135,10 +135,11 @@ struct _zend_class_entry {
 	union _zend_function *__call;
 	union _zend_function *__callstatic;
 	union _zend_function *__tostring;
+	union _zend_function *__hash;
 	union _zend_function *__debugInfo;
 	union _zend_function *serialize_func;
 	union _zend_function *unserialize_func;
-
+    
 	zend_class_iterator_funcs iterator_funcs;
 
 	/* handlers */

@@ -1655,6 +1655,15 @@ ZEND_API zval *add_get_index_stringl(zval *arg, zend_ulong index, const char *st
 ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value TSRMLS_DC) /* {{{ */
 {
 	zval *result;
+	zval obj_key;
+	int free_key = 0;
+
+	if (UNEXPECTED(Z_TYPE_P(key) == IS_OBJECT && Z_OBJCE_P(key)->__hash)) {
+		if (zend_object_offset(key, &obj_key TSRMLS_CC) == SUCCESS) {
+			free_key = 1;
+			key = &obj_key;
+		}
+	}
 
 	switch (Z_TYPE_P(key)) {
 		case IS_STRING:
@@ -1684,6 +1693,10 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value TSRMLS_DC)
 			result = NULL;
 	}
 
+	if(free_key) {
+		zval_dtor(&obj_key);
+	}
+
 	if (result) {
 		if (Z_REFCOUNTED_P(result)) {
 			Z_ADDREF_P(result);

@@ -193,6 +193,7 @@ typedef struct _zend_fcall_info_cache {
 		class_container.__set = handle_propset;					\
 		class_container.__unset = handle_propunset;				\
 		class_container.__isset = handle_propisset;				\
+		class_container.__hash = NULL;						\
 		class_container.__debugInfo = NULL;					\
 		class_container.serialize_func = NULL;					\
 		class_container.unserialize_func = NULL;				\

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -1405,6 +1405,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
 		ce->__call = NULL;
 		ce->__callstatic = NULL;
 		ce->__tostring = NULL;
+		ce->__hash = NULL;
 		ce->create_object = NULL;
 		ce->get_iterator = NULL;
 		ce->iterator_funcs.funcs = NULL;
@@ -4066,6 +4067,12 @@ void zend_begin_method_decl(zend_op_array *op_array, zend_string *name, zend_boo
 					"public visibility and cannot be static");
 			}
 			ce->__tostring = (zend_function *) op_array;
+		} else if (zend_string_equals_literal(lcname, ZEND_HASH_FUNC_NAME)) {
+			if (!is_public || is_static) {
+				zend_error(E_WARNING, "The magic method __hash() must have "
+					"public visibility and cannot be static");
+			}
+			ce->__hash = (zend_function *) op_array;
 		} else if (zend_string_equals_literal(lcname, ZEND_INVOKE_FUNC_NAME)) {
 			if (!is_public || is_static) {
 				zend_error(E_WARNING, "The magic method __invoke() must have "

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -883,6 +883,7 @@ END_EXTERN_C()
 #define ZEND_CALL_FUNC_NAME         "__call"
 #define ZEND_CALLSTATIC_FUNC_NAME   "__callstatic"
 #define ZEND_TOSTRING_FUNC_NAME     "__tostring"
+#define ZEND_HASH_FUNC_NAME         "__hash"
 #define ZEND_AUTOLOAD_FUNC_NAME     "__autoload"
 #define ZEND_INVOKE_FUNC_NAME       "__invoke"
 #define ZEND_DEBUGINFO_FUNC_NAME    "__debuginfo"