Bug #20746. Renamed aggregation_info() to aggregate_info() per naming conventions...

diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c
index 63f40630150c40f1b0316e086a7f2d74c950b343..e13343378509ebce18531a360c7e97527a9faa3d 100644 (file)
--- a/ext/standard/aggregation.c
+++ b/ext/standard/aggregation.c
@@ -536,7 +536,7 @@ PHP_FUNCTION(aggregate_properties_by_regexp)
 
 /* {{{ proto array aggregation_info(object obj)
  */
-PHP_FUNCTION(aggregation_info)
+PHP_FUNCTION(aggregate_info)
 {
        zval *obj;
        aggregation_info *aggr_info;

diff --git a/ext/standard/aggregation.h b/ext/standard/aggregation.h
index 551782fdfe54b59d0412ae711809839f962f6e80..96000dee6fd866c1bf64a72d78c4faa82b4a02ee 100644 (file)
--- a/ext/standard/aggregation.h
+++ b/ext/standard/aggregation.h
@@ -46,6 +46,6 @@ PHP_FUNCTION(aggregate_properties_by_list);
 PHP_FUNCTION(aggregate_properties_by_regexp);
 PHP_FUNCTION(aggregate);
 PHP_FUNCTION(deaggregate);
-PHP_FUNCTION(aggregation_info);
+PHP_FUNCTION(aggregate_info);
 
 #endif /* AGGREGATION_H */

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index d5fbe42742291997611b57acec15e738a115ed7e..daa02cfda5d303afe8ab8e6e3ff242e26a44b410 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -871,7 +871,8 @@ function_entry basic_functions[] = {
        PHP_FE(aggregate_properties_by_regexp,  first_arg_force_ref)
 #endif
        PHP_FE(deaggregate,                                             first_arg_force_ref)
-       PHP_FE(aggregation_info,                                first_arg_force_ref)
+       PHP_FE(aggregate_info,                          first_arg_force_ref)
+       PHP_FALIAS(aggregation_info,                    aggregate_info,                         first_arg_force_ref)
 
        PHP_FE(output_add_rewrite_var,                                                                                  NULL)
        PHP_FE(output_reset_rewrite_vars,                                                                               NULL)