inform the type in the array displacement error message.

Author: marcosmarcolin

Zend/tests/036.phpt

@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-Illegal offset type: cannot be of type object
+Illegal offset type: cannot be of type Closure

Zend/tests/038.phpt

@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-Illegal offset type
+Illegal offset type: cannot be of type Closure

Zend/tests/offset_array.phpt

@@ -56,7 +56,7 @@ int(1)
 
 Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
 int(%d)
-Illegal offset type: cannot be of type object
+Illegal offset type: cannot be of type stdClass
 Illegal offset type: cannot be of type array
 Illegal offset type: cannot be of type array
 Done

Zend/zend_execute.c

@@ -1440,9 +1440,9 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_object_as_array(v
 	zend_throw_error(NULL, "Cannot use object as array");
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_offset(void)
+static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_offset(const zval *offset)
 {
-	zend_type_error("Illegal offset type");
+	zend_type_error("Illegal offset type: cannot be of type %s", zend_zval_type_name(offset));
 }
 
 static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_string_offset(const zval *offset)
@@ -2313,14 +2313,8 @@ static zend_never_inline zend_uchar slow_index_convert(HashTable *ht, const zval
 		case IS_TRUE:
 			value->lval = 1;
 			return IS_LONG;
-		case IS_ARRAY:
-			zend_type_error("Illegal offset type: cannot be of type array");
-			return IS_ARRAY;
-		case IS_OBJECT:
-			 zend_type_error("Illegal offset type: cannot be of type object");
-			 return IS_OBJECT;
 		default:
-			zend_illegal_offset();
+			zend_illegal_offset(dim);
 			return IS_NULL;
 	}
 }
@@ -2393,14 +2387,8 @@ static zend_never_inline zend_uchar slow_index_convert_w(HashTable *ht, const zv
 		case IS_TRUE:
 			value->lval = 1;
 			return IS_LONG;
-		case IS_ARRAY:
-			zend_type_error("Illegal offset type: cannot be of type array");
-			return IS_ARRAY;
-		case IS_OBJECT:
-        	 zend_type_error("Illegal offset type: cannot be of type object");
-        	 return IS_OBJECT;
 		default:
-			zend_illegal_offset();
+			zend_illegal_offset(dim);
 			return IS_NULL;
 	}
 }
@@ -2982,7 +2970,7 @@ static zend_never_inline bool ZEND_FASTCALL zend_array_key_exists_fast(HashTable
 		str = ZSTR_EMPTY_ALLOC();
 		goto str_key;
 	} else {
-		zend_illegal_offset();
+		zend_illegal_offset(key);
 		return 0;
 	}
 }

Zend/zend_vm_def.h

@@ -6023,7 +6023,7 @@ ZEND_VM_C_LABEL(num_index):
 			str = ZSTR_EMPTY_ALLOC();
 			ZEND_VM_C_GOTO(str_index);
 		} else {
-			zend_illegal_offset();
+			zend_illegal_offset(offset);
 			zval_ptr_dtor_nogc(expr_ptr);
 		}
 		FREE_OP2();

Zend/zend_vm_execute.h

@@ -161,7 +161,7 @@ array(1) {
     int(1)
   }
 }
-Illegal offset type: cannot be of type object
+Illegal offset type: cannot be of type Closure
 array(1) {
   [0]=>
   array(2) {

ext/opcache/tests/jit/assign_dim_002.phpt

@@ -9,7 +9,7 @@ opcache.optimization_level=-1
 var_dump([[]=>&$x]);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Illegal offset type in %sinference_002.php:2
+Fatal error: Uncaught TypeError: Illegal offset type: cannot be of type array in %sinference_002.php:2
 Stack trace:
 #0 {main}
-  thrown in %sinference_002.php on line 2
+  thrown in %sinference_002.php on line 2

ext/opcache/tests/opt/inference_002.phpt

@@ -202,7 +202,7 @@ bool(false)
 bool(true)
 
 *** Testing error conditions ***
-Illegal offset type
+Illegal offset type: cannot be of type array
 
 *** Testing operation on objects ***
 array_key_exists(): Argument #2 ($array) must be of type array, key_check given