Remove dot notation

Author: carlos-granados

ext/standard/array.c

@@ -6915,8 +6915,8 @@ PHP_FUNCTION(array_key_exists)
 }
 /* }}} */
 
-/* {{{ Helper function to get a nested value from array using an array of segments */
-static zval* array_get_nested_from_hash(HashTable *ht, HashTable *segments)
+/* {{{ Helper function to get a nested value from array using an array of path segments */
+static zval* array_get_nested(HashTable *ht, HashTable *path)
 {
 	zval *segment_val;
 	zval *current;
@@ -6925,12 +6925,12 @@ static zval* array_get_nested_from_hash(HashTable *ht, HashTable *segments)
 	uint32_t num_segments;
 
 	current_ht = ht;
-	num_segments = zend_hash_num_elements(segments);
+	num_segments = zend_hash_num_elements(path);
 
-	/* Iterate through each segment in the array */
+	/* 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(segments, idx);
+		segment_val = zend_hash_index_find(path, idx);
 
 		if (segment_val == NULL) {
 			/* Missing segment in array */
@@ -6961,160 +6961,54 @@ static zval* array_get_nested_from_hash(HashTable *ht, HashTable *segments)
 		current_ht = Z_ARRVAL_P(current);
 	}
 
-	/* Empty segments array */
+	/* Empty path array */
 	return NULL;
 }
 /* }}} */
 
-/* {{{ Helper function to get a nested value from array using dot notation string */
-static zval* array_get_nested_from_string(HashTable *ht, const char *key, size_t key_len)
-{
-	const char *segment_start;
-	const char *dot;
-	size_t segment_len;
-	size_t remaining_len;
-	zval *current;
-	HashTable *current_ht;
-	zend_string *segment;
-
-	current_ht = ht;
-	segment_start = key;
-	remaining_len = key_len;
-
-	/* Iterate through each dot-separated segment */
-	while (remaining_len > 0) {
-		/* Find the next dot */
-		dot = memchr(segment_start, '.', remaining_len);
-
-		if (dot == NULL) {
-			/* Last segment */
-			segment_len = remaining_len;
-		} else {
-			segment_len = dot - segment_start;
-		}
-
-		/* Look up the current segment */
-		segment = zend_string_init(segment_start, segment_len, 0);
-		current = zend_symtable_find(current_ht, segment);
-		zend_string_release(segment);
-
-		/* If this is the last segment, return the result */
-		if (dot == NULL) {
-			return current;
-		}
-
-		/* Check if the segment exists and is an array for next iteration */
-		if (current == NULL || Z_TYPE_P(current) != IS_ARRAY) {
-			return NULL;
-		}
-
-		/* Move to the next segment */
-		current_ht = Z_ARRVAL_P(current);
-		segment_start = dot + 1;
-		remaining_len = remaining_len - segment_len - 1;
-	}
-
-	return NULL;
-}
-/* }}} */
-
-/* {{{ Retrieves a value from a deeply nested array using "dot" notation */
+/* {{{ Retrieves a value from a deeply nested array using an array path */
 PHP_FUNCTION(array_get)
 {
 	zval *array;
-	zval *key = NULL;
+	zval *path;
 	zval *default_value = NULL;
 	zval *result;
-	HashTable *ht;
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
 		Z_PARAM_ARRAY(array)
-		Z_PARAM_ZVAL_OR_NULL(key)
+		Z_PARAM_ARRAY(path)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(default_value)
 	ZEND_PARSE_PARAMETERS_END();
 
-	/* If key is null, return the whole array */
-	if (key == NULL || Z_TYPE_P(key) == IS_NULL) {
-		RETURN_COPY(array);
-	}
-
-	ht = Z_ARRVAL_P(array);
-
-	switch (Z_TYPE_P(key)) {
-		case IS_ARRAY:
-			/* Handle array keys (array of segments) */
-			result = array_get_nested_from_hash(ht, Z_ARRVAL_P(key));
-
-			if (result != NULL) {
-				RETURN_COPY_DEREF(result);
-			}
-			break;
-
-		case IS_STRING:
-			/* Handle string keys with dot notation */
-			result = array_get_nested_from_string(ht, Z_STRVAL_P(key), Z_STRLEN_P(key));
-
-			if (result != NULL) {
-				RETURN_COPY_DEREF(result);
-			}
-			break;
-
-		case IS_LONG:
-			/* Handle integer keys (simple lookup) */
-			result = zend_hash_index_find(ht, Z_LVAL_P(key));
-
-			if (result != NULL) {
-				RETURN_COPY_DEREF(result);
-			}
-			break;
+	result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
 
-		default:
-			zend_argument_type_error(2, "must be of type string|int|array, %s given", zend_zval_value_name(key));
-			RETURN_THROWS();
+	if (result != NULL) {
+		RETURN_COPY_DEREF(result);
 	}
 
-	/* Key not found, return default value */
+	/* Path not found, return default value */
 	if (default_value != NULL) {
 		RETURN_COPY_DEREF(default_value);
 	}
 }
 /* }}} */
 
-/* {{{ Checks whether a given item exists in an array using "dot" notation */
+/* {{{ Checks whether a given item exists in an array using an array path */
 PHP_FUNCTION(array_has)
 {
 	zval *array;
-	zval *key;
+	zval *path;
 	zval *result;
-	HashTable *ht;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(array)
-		Z_PARAM_ZVAL(key)
+		Z_PARAM_ARRAY(path)
 	ZEND_PARSE_PARAMETERS_END();
 
-	ht = Z_ARRVAL_P(array);
-
-	switch (Z_TYPE_P(key)) {
-		case IS_ARRAY:
-			/* Handle array keys (array of segments) */
-			result = array_get_nested_from_hash(ht, Z_ARRVAL_P(key));
-			RETURN_BOOL(result != NULL);
-
-		case IS_STRING:
-			/* Handle string keys with dot notation */
-			result = array_get_nested_from_string(ht, Z_STRVAL_P(key), Z_STRLEN_P(key));
-			RETURN_BOOL(result != NULL);
-
-		case IS_LONG:
-			/* Handle integer keys (simple lookup) */
-			RETURN_BOOL(zend_hash_index_exists(ht, Z_LVAL_P(key)));
+	result = array_get_nested(Z_ARRVAL_P(array), Z_ARRVAL_P(path));
 
-		default:
-			zend_argument_type_error(2, "must be of type string|int|array, %s given", zend_zval_value_name(key));
-			RETURN_THROWS();
-	}
+	RETURN_BOOL(result != NULL);
 }
 /* }}} */
 

ext/standard/basic_functions.stub.php

@@ -1906,12 +1906,12 @@ function key_exists($key, array $array): bool {}
 /**
  * @compile-time-eval
  */
-function array_get(array $array, string|int|array|null $key = null, mixed $default = null): mixed {}
+function array_get(array $array, array $path, mixed $default = null): mixed {}
 
 /**
  * @compile-time-eval
  */
-function array_has(array $array, string|int|array $key): bool {}
+function array_has(array $array, array $path): bool {}
 
 /**
  * @compile-time-eval

ext/standard/basic_functions_arginfo.h

@@ -2,67 +2,48 @@
 Test array_get() function
 --FILE--
 <?php
-/*
- * Test functionality of array_get()
- */
-
 echo "*** Testing array_get() ***\n";
 
-// Basic array access
+// Basic nested array access
 $array = ['products' => ['desk' => ['price' => 100]]];
 
-// Test nested access with dot notation
-var_dump(array_get($array, 'products.desk.price'));
+// Test nested access with array path
+var_dump(array_get($array, ['products', 'desk', 'price']));
 
-// Test with default value when key doesn't exist
-var_dump(array_get($array, 'products.desk.discount', 0));
+// Test with default value when path doesn't exist
+var_dump(array_get($array, ['products', 'desk', 'discount'], 5));
 
-// Test simple key access
+// Test simple path with single level
 $simple = ['name' => 'John', 'age' => 30];
-var_dump(array_get($simple, 'name'));
-var_dump(array_get($simple, 'missing', 'default'));
-
-// Test with integer key
-$indexed = ['a', 'b', 'c'];
-var_dump(array_get($indexed, 0));
-var_dump(array_get($indexed, 5, 'not found'));
-
-// Test with null key (returns whole array)
-$test = ['foo' => 'bar'];
-var_dump(array_get($test, null));
-
-// Test nested with missing intermediate key
-var_dump(array_get($array, 'products.chair.price', 50));
+var_dump(array_get($simple, ['name']));
+var_dump(array_get($simple, ['missing'], 'default'));
 
 // Test single level key that doesn't exist
-var_dump(array_get($array, 'missing'));
+var_dump(array_get($array, ['missing']));
 
-// Test with numeric string in path (like users.0.name)
+// Test with integer key in path
 $users = ['users' => [['name' => 'Alice'], ['name' => 'Bob']]];
-var_dump(array_get($users, 'users.0.name'));
-var_dump(array_get($users, 'users.1.age', 70));
-
-// Test with array key (equivalent to dot notation)
-var_dump(array_get($array, ['products', 'desk', 'price']));
-var_dump(array_get($simple, ['name']));
 var_dump(array_get($users, ['users', 0, 'name']));
+var_dump(array_get($users, ['users', 1, 'name']));
+
+// Test nested with missing intermediate key
 var_dump(array_get($array, ['products', 'chair', 'price'], 75));
 
-// Test with invalid segment type in array key
+// Test with invalid segment type in array path
 var_dump(array_get($array, ['products', new stdClass(), 'price'], 'invalid'));
 
 // Test with references - ensure returned value is a copy, not a reference
 $ref_array = ['data' => ['value' => 'original']];
 $ref =& $ref_array['data']['value'];
-$result = array_get($ref_array, 'data.value');
+$result = array_get($ref_array, ['data', 'value']);
 var_dump($result);
 $ref = 'modified';
 var_dump($result); // Should still be 'original' (not affected by reference change)
 
 // Test with default value being a reference
 $default_value = 'default';
 $default_ref =& $default_value;
-$result_with_ref_default = array_get($ref_array, 'missing.key', $default_ref);
+$result_with_ref_default = array_get($ref_array, ['missing', 'key'], $default_ref);
 var_dump($result_with_ref_default);
 $default_value = 'changed';
 var_dump($result_with_ref_default); // Should still be 'default' (not affected by reference change)
@@ -72,22 +53,12 @@ echo "Done";
 --EXPECT--
 *** Testing array_get() ***
 int(100)
-int(0)
+int(5)
 string(4) "John"
 string(7) "default"
-string(1) "a"
-string(9) "not found"
-array(1) {
-  ["foo"]=>
-  string(3) "bar"
-}
-int(50)
 NULL
 string(5) "Alice"
-int(70)
-int(100)
-string(4) "John"
-string(5) "Alice"
+string(3) "Bob"
 int(75)
 string(7) "invalid"
 string(8) "original"