revoke and simplifying the grouping logic

Author: 7snovic

ext/standard/array.c

@@ -4301,7 +4301,7 @@ PHP_FUNCTION(array_column)
 	if (!group_is_null && group_bool && !index_is_null) {
 
 		zval *group_entry;
-		zval ft;
+		zval fpal;
 
 		ZEND_HASH_FOREACH_VAL(input, data) {
 			ZVAL_DEREF(data);
@@ -4316,22 +4316,25 @@ PHP_FUNCTION(array_column)
 			zval rv;
 			zval *keyval = array_column_fetch_prop(data, index_str, index_long, cache_slot_index, &rv);
 
-			convert_to_string(keyval);
-			group_entry = zend_symtable_find(Z_ARRVAL_P(return_value), Z_STR_P(keyval));
+			if (keyval) {
+				convert_to_string(keyval);
+				group_entry = zend_symtable_find(Z_ARRVAL_P(return_value), Z_STR_P(keyval));
 
-			if (group_entry != NULL) {
-				ZVAL_COPY_VALUE(&ft, group_entry);
-			} else {
-				array_init(&ft);
-				zend_symtable_update(Z_ARRVAL_P(return_value), Z_STR_P(keyval), &ft);
-			}
+				if (group_entry != NULL) {
+					ZVAL_COPY_VALUE(&fpal, group_entry);
+				} else {
+					array_init(&fpal);
+					zend_symtable_update(Z_ARRVAL_P(return_value), Z_STR_P(keyval), &fpal);
+				}
 
-			zend_hash_next_index_insert_new(Z_ARRVAL_P(&ft), colval);
+				zend_hash_next_index_insert_new(Z_ARRVAL_P(&fpal), colval);
 
-			if (keyval) {
 				zval_ptr_dtor(keyval);
+			} else {
+				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), colval);
 			}
 
+
 		} ZEND_HASH_FOREACH_END();
 
 	} else {

ext/standard/tests/array/array_column_group_001.phpt

@@ -12,89 +12,103 @@ $ar = [
     ['id' => 6, 'name' => 'wael', 'score' => 'D', 's' => '1'],
 ];
 
-print_r(array_column($ar, null, 'id', true));
+var_dump(array_column($ar, null, 'id', true));
 ?>
 --EXPECT--
-Array
-(
-    [1] => Array
-        (
-            [0] => Array
-                (
-                    [id] => 1
-                    [name] => hassan
-                    [score] => A
-                    [s] => 1
-                )
-
-        )
-
-    [2] => Array
-        (
-            [0] => Array
-                (
-                    [id] => 2
-                    [name] => hassan
-                    [score] => B
-                    [s] => 2
-                )
-
-        )
-
-    [3] => Array
-        (
-            [0] => Array
-                (
-                    [id] => 3
-                    [name] => ahmed
-                    [score] => C
-                    [s] => 1
-                )
-
-        )
-
-    [4] => Array
-        (
-            [0] => Array
-                (
-                    [id] => 4
-                    [name] => moustafa
-                    [score] => D
-                    [s] => 2
-                )
-
-        )
-
-    [5] => Array
-        (
-            [0] => Array
-                (
-                    [id] => 5
-                    [name] => hassan
-                    [score] => A
-                    [s] => 3
-                )
-
-        )
-
-    [6] => Array
-        (
-            [0] => Array
-                (
-                    [id] => 6
-                    [name] => wael
-                    [score] => A
-                    [s] => 3
-                )
-
-            [1] => Array
-                (
-                    [id] => 6
-                    [name] => wael
-                    [score] => D
-                    [s] => 1
-                )
-
-        )
-
-)
+array(6) {
+  [1]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["id"]=>
+      string(1) "1"
+      ["name"]=>
+      string(6) "hassan"
+      ["score"]=>
+      string(1) "A"
+      ["s"]=>
+      string(1) "1"
+    }
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["id"]=>
+      string(1) "2"
+      ["name"]=>
+      string(6) "hassan"
+      ["score"]=>
+      string(1) "B"
+      ["s"]=>
+      string(1) "2"
+    }
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["id"]=>
+      string(1) "3"
+      ["name"]=>
+      string(5) "ahmed"
+      ["score"]=>
+      string(1) "C"
+      ["s"]=>
+      string(1) "1"
+    }
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["id"]=>
+      string(1) "4"
+      ["name"]=>
+      string(8) "moustafa"
+      ["score"]=>
+      string(1) "D"
+      ["s"]=>
+      string(1) "2"
+    }
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    array(4) {
+      ["id"]=>
+      string(1) "5"
+      ["name"]=>
+      string(6) "hassan"
+      ["score"]=>
+      string(1) "A"
+      ["s"]=>
+      string(1) "3"
+    }
+  }
+  [6]=>
+  array(2) {
+    [0]=>
+    array(4) {
+      ["id"]=>
+      string(1) "6"
+      ["name"]=>
+      string(4) "wael"
+      ["score"]=>
+      string(1) "A"
+      ["s"]=>
+      string(1) "3"
+    }
+    [1]=>
+    array(4) {
+      ["id"]=>
+      string(1) "6"
+      ["name"]=>
+      string(4) "wael"
+      ["score"]=>
+      string(1) "D"
+      ["s"]=>
+      string(1) "1"
+    }
+  }
+}