More changes after PR review

Author: carlos-granados

ext/standard/array.c

@@ -6919,23 +6919,17 @@ PHP_FUNCTION(array_key_exists)
 static zval* array_get_nested(HashTable *ht, HashTable *path)
 {
 	zval *segment_val;
-	zval *current;
-	HashTable *current_ht;
-	uint32_t idx;
-	uint32_t num_segments;
-
-	current_ht = ht;
-	num_segments = zend_hash_num_elements(path);
+	zval *current = NULL;
+	HashTable *current_ht = ht;
+	uint32_t num_segments = zend_hash_num_elements(path);
+	uint32_t segment_index = 0;
 
 	/* Iterate through each segment in the path array */
-	for (idx = 0; idx < num_segments; idx++) {
-		/* Get the segment at the current index */
-		segment_val = zend_hash_index_find(path, idx);
+	ZEND_HASH_FOREACH_VAL(path, segment_val) {
+		segment_index++;
 
-		if (segment_val == NULL) {
-			/* Missing segment in array */
-			return NULL;
-		}
+		/* Dereference segment if it's a reference */
+		ZVAL_DEREF(segment_val);
 
 		/* Segment must be a string or int */
 		if (Z_TYPE_P(segment_val) == IS_STRING) {
@@ -6947,22 +6941,27 @@ static zval* array_get_nested(HashTable *ht, HashTable *path)
 			return NULL;
 		}
 
-		/* If this is the last segment, return the result */
-		if (idx == num_segments - 1) {
-			return current;
+		/* If segment not found, return NULL */
+		if (current == NULL) {
+			return NULL;
 		}
 
-		/* Check if the segment exists and is an array for next iteration */
-		if (current == NULL || Z_TYPE_P(current) != IS_ARRAY) {
+		/* Dereference if it's a reference */
+		ZVAL_DEREF(current);
+
+		/* If current is not an array and we're not at the last segment,
+		 * we can't continue traversing the path */
+		if (Z_TYPE_P(current) != IS_ARRAY && segment_index < num_segments) {
 			return NULL;
 		}
 
-		/* Move to the next level */
-		current_ht = Z_ARRVAL_P(current);
-	}
+		/* Update current_ht for next iteration if it's an array */
+		if (Z_TYPE_P(current) == IS_ARRAY) {
+			current_ht = Z_ARRVAL_P(current);
+		}
+	} ZEND_HASH_FOREACH_END();
 
-	/* Empty path array */
-	return NULL;
+	return current;
 }
 /* }}} */
 
@@ -6972,7 +6971,6 @@ PHP_FUNCTION(array_get)
 	zval *array;
 	zval *path;
 	zval *default_value = NULL;
-	zval *result;
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
 		Z_PARAM_ARRAY(array)
@@ -6981,15 +6979,15 @@ PHP_FUNCTION(array_get)
 		Z_PARAM_ZVAL(default_value)
 	ZEND_PARSE_PARAMETERS_END();
 
-	result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
+	zval *result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
 
 	if (result != NULL) {
 		RETURN_COPY_DEREF(result);
 	}
 
 	/* Path not found, return default value */
 	if (default_value != NULL) {
-		RETURN_COPY_DEREF(default_value);
+		RETURN_COPY(default_value);
 	}
 }
 /* }}} */
@@ -6999,14 +6997,13 @@ PHP_FUNCTION(array_has)
 {
 	zval *array;
 	zval *path;
-	zval *result;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(array)
 		Z_PARAM_ARRAY(path)
 	ZEND_PARSE_PARAMETERS_END();
 
-	result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
+	zval *result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
 
 	RETURN_BOOL(result != NULL);
 }

ext/standard/tests/array/array_get.phpt

@@ -48,6 +48,17 @@ var_dump($result_with_ref_default);
 $default_value = 'changed';
 var_dump($result_with_ref_default); // Should still be 'default' (not affected by reference change)
 
+// Test with reference to an array in the path
+$array2 = ['world'];
+$array_with_ref = ['hello' => &$array2];
+var_dump(array_get($array_with_ref, ['hello', 0]));
+
+// Test with path segment that is a reference
+$key1 = 'products';
+$key2 = 'desk';
+$path_with_refs = [&$key1, &$key2, 'price'];
+var_dump(array_get($array, $path_with_refs));
+
 echo "Done";
 ?>
 --EXPECT--
@@ -65,4 +76,6 @@ string(8) "original"
 string(8) "original"
 string(7) "default"
 string(7) "default"
+string(5) "world"
+int(100)
 Done

ext/standard/tests/array/array_has.phpt

@@ -34,6 +34,17 @@ var_dump(array_has($withNull, ['key']));
 // Test with invalid segment type in array path
 var_dump(array_has($array, ['product', new stdClass()]));
 
+// Test with reference to an array in the path
+$array2 = ['world'];
+$array_with_ref = ['hello' => &$array2];
+var_dump(array_has($array_with_ref, ['hello', 0]));
+
+// Test with path segment that is a reference
+$key1 = 'product';
+$key2 = 'name';
+$path_with_refs = [&$key1, &$key2];
+var_dump(array_has($array, $path_with_refs));
+
 echo "Done";
 ?>
 --EXPECT--
@@ -48,4 +59,6 @@ bool(true)
 bool(false)
 bool(true)
 bool(false)
+bool(true)
+bool(true)
 Done