Throw TypeError exception if segment is not int or string

Author: carlos-granados

ext/standard/array.c

@@ -6935,7 +6935,8 @@ static zval* array_get_nested(HashTable *ht, HashTable *path)
 		} else if (Z_TYPE_P(segment_val) == IS_LONG) {
 			current = zend_hash_index_find(current_ht, Z_LVAL_P(segment_val));
 		} else {
-			/* Invalid segment type */
+			/* Invalid segment type - throw TypeError */
+			zend_type_error("Path segment must be of type string|int, %s given", zend_zval_value_name(segment_val));
 			return NULL;
 		}
 
@@ -6979,6 +6980,10 @@ PHP_FUNCTION(array_get)
 
 	zval *result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
 
+	if (EG(exception)) {
+		RETURN_THROWS();
+	}
+
 	if (result != NULL) {
 		RETURN_COPY_DEREF(result);
 	}
@@ -7003,6 +7008,10 @@ PHP_FUNCTION(array_has)
 
 	zval *result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
 
+	if (EG(exception)) {
+		RETURN_THROWS();
+	}
+
 	RETURN_BOOL(result != NULL);
 }
 /* }}} */

ext/standard/tests/array/array_get.phpt

@@ -30,7 +30,11 @@ var_dump(array_get($users, ['users', 1, 'name']));
 var_dump(array_get($array, ['products', 'chair', 'price'], 75));
 
 // Test with invalid segment type in array path
-var_dump(array_get($array, ['products', new stdClass(), 'price'], 'invalid'));
+try {
+	var_dump(array_get($array, ['products', new stdClass(), 'price'], 'invalid'));
+} catch (TypeError $e) {
+	echo $e->getMessage() . "\n";
+}
 
 // Test with references - ensure returned value is a copy, not a reference
 $ref_array = ['data' => ['value' => 'original']];
@@ -71,7 +75,7 @@ NULL
 string(5) "Alice"
 string(3) "Bob"
 int(75)
-string(7) "invalid"
+Path segment must be of type string|int, stdClass given
 string(8) "original"
 string(8) "original"
 string(7) "default"

ext/standard/tests/array/array_has.phpt

@@ -32,7 +32,11 @@ $withNull = ['key' => null];
 var_dump(array_has($withNull, ['key']));
 
 // Test with invalid segment type in array path
-var_dump(array_has($array, ['product', new stdClass()]));
+try {
+	var_dump(array_has($array, ['product', new stdClass()]));
+} catch (TypeError $e) {
+	echo $e->getMessage() . "\n";
+}
 
 // Test with reference to an array in the path
 $array2 = ['world'];
@@ -58,7 +62,7 @@ bool(true)
 bool(true)
 bool(false)
 bool(true)
-bool(false)
+Path segment must be of type string|int, stdClass given
 bool(true)
 bool(true)
 Done