php · marcosmarcolin · Dec 16, 2022 · Dec 17, 2022 · Dec 19, 2022 · Dec 20, 2022
diff --git a/Zend/tests/036.phpt b/Zend/tests/036.phpt
@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-Illegal offset type
+Illegal offset type: cannot be of type object
diff --git a/Zend/tests/038.phpt b/Zend/tests/038.phpt
@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-Illegal offset type
+Illegal offset type: cannot be of type object
diff --git a/Zend/tests/assign_dim_obj_null_return.phpt b/Zend/tests/assign_dim_obj_null_return.phpt
@@ -72,12 +72,12 @@ test();
 ?>
 --EXPECT--
 Cannot add element to the array as the next element is already occupied
-Illegal offset type
-Illegal offset type
+Illegal offset type: cannot be of type array
+Illegal offset type: cannot be of type object
 Cannot use a scalar value as an array
 Cannot add element to the array as the next element is already occupied
-Illegal offset type
-Illegal offset type
+Illegal offset type: cannot be of type array
+Illegal offset type: cannot be of type object
 Cannot use a scalar value as an array
 Attempt to assign property "foo" on true
 Attempt to assign property "foo" on true
diff --git a/Zend/tests/bug79790.phpt b/Zend/tests/bug79790.phpt
@@ -8,7 +8,7 @@ function b($a = array()[array ()]) {
 }
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Illegal offset type in %s:%d
+Fatal error: Uncaught TypeError: Illegal offset type: cannot be of type array in %s:%d
 Stack trace:
 #0 %s(%d): b()
 #1 {main}

diff --git a/Zend/tests/bug79947.phpt b/Zend/tests/bug79947.phpt
@@ -12,6 +12,6 @@ try {
 var_dump($array);
 ?>
 --EXPECT--
-Illegal offset type
+Illegal offset type: cannot be of type array
 array(0) {
 }
diff --git a/Zend/tests/init_array_illegal_offset_type.phpt b/Zend/tests/init_array_illegal_offset_type.phpt
@@ -12,4 +12,4 @@ try {
 }
 ?>
 --EXPECT--
-Illegal offset type
+Illegal offset type: cannot be of type object
diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt
@@ -30,6 +30,14 @@ try {
     echo $e->getMessage(), "\n";
 }
 
+try{
+    $k = [];
+    $arr = ['foo'];
+    $arr[$k];
+}catch (Error $e){
+    echo $e->getMessage(), "\n";
+}
+
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -48,6 +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
-Illegal offset type
+Illegal offset type: cannot be of type object
+Illegal offset type: cannot be of type array
+Illegal offset type: cannot be of type array
 Done
@@ -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_get_type_by_const(Z_TYPE_P(offset)));
 }
 
 static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_illegal_string_offset(const zval *offset)
@@ -2314,7 +2314,7 @@ static zend_never_inline zend_uchar slow_index_convert(HashTable *ht, const zval
 			value->lval = 1;
 			return IS_LONG;
 		default:
-			zend_illegal_offset();
+			zend_illegal_offset(dim);
 			return IS_NULL;
 	}
 }
@@ -2388,7 +2388,7 @@ static zend_never_inline zend_uchar slow_index_convert_w(HashTable *ht, const zv
 			value->lval = 1;
 			return IS_LONG;
 		default:
-			zend_illegal_offset();
+			zend_illegal_offset(dim);
 			return IS_NULL;
 	}
 }
@@ -2970,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;
 	}
 }

@@ -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();

@@ -161,7 +161,7 @@ array(1) {
     int(1)
   }
 }
-Illegal offset type
+Illegal offset type: cannot be of type object
 array(1) {
   [0]=>
   array(2) {
@@ -198,7 +198,7 @@ array(1) {
 }
 
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
-Illegal offset type
+Illegal offset type: cannot be of type array
 
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
 int(1)
@@ -221,7 +221,7 @@ array(1) {
 }
 
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
-Illegal offset type
+Illegal offset type: cannot be of type array
 
 Warning: Undefined variable $undef in %s on line %d
 NULL
@@ -79,7 +79,7 @@ Warning: Undefined array key 2 in %s on line %d
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
 
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
-Illegal offset type
+Illegal offset type: cannot be of type array
 
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
 
@@ -104,5 +104,5 @@ array(1) {
 }
 
 Deprecated: Automatic conversion of false to array is deprecated in %s on line %d
-Illegal offset type
+Illegal offset type: cannot be of type array
 Unsupported operand types: null % string
@@ -18,7 +18,7 @@ Stack trace:
 #0 %sfetch_dim_rw_004.php(5): {closure}(2, 'Undefined varia...', '%s', 5)
 #1 {main}
 
-Next TypeError: Illegal offset type in %sfetch_dim_rw_004.php:5
+Next TypeError: Illegal offset type: cannot be of type array in %sfetch_dim_rw_004.php:5
 Stack trace:
 #0 {main}
   thrown in %sfetch_dim_rw_004.php on line 5
@@ -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
@@ -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

@@ -129,7 +129,7 @@ bool(false)
 bool(false)
 
 -- Iteration 13 --
-Illegal offset type
+Illegal offset type: cannot be of type array
 
 -- Iteration 14 --
 bool(true)
@@ -141,7 +141,7 @@ bool(true)
 bool(true)
 
 -- Iteration 17 --
-Illegal offset type
+Illegal offset type: cannot be of type object
 
 -- Iteration 18 --
 bool(false)

diff --git a/tests/classes/tostring_001.phpt b/tests/classes/tostring_001.phpt
@@ -118,7 +118,7 @@ test2::__toString()
 Converted
 ====test7====
 test2::__toString()
-Illegal offset type
+Illegal offset type: cannot be of type object
 ====test8====
 test2::__toString()
 string(9) "Converted"