correct phpinfo() output

diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c
index a133f2f588dfadf1b36b90ee5b48a49e696d7d8b..352c0674ddb6181c0740d1679eeea69e83af0aea 100644 (file)
--- a/ext/com/VARIANT.c
+++ b/ext/com/VARIANT.c
@@ -50,7 +50,9 @@ function_entry VARIANT_functions[] = {
 
 static PHP_MINFO_FUNCTION(VARIANT)
 {
-       DISPLAY_INI_ENTRIES();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "VARIANT support", "enabled");
+       php_info_print_table_end();
 }
 
 zend_module_entry VARIANT_module_entry = {

diff --git a/ext/dotnet/dotnet.cpp b/ext/dotnet/dotnet.cpp
index f20c1f46dd495c9bc640ea76f9ce1477b66e3239..b8e9d168acb44dfd1233b5103bb30ee0015b1f5f 100644 (file)
--- a/ext/dotnet/dotnet.cpp
+++ b/ext/dotnet/dotnet.cpp
@@ -37,7 +37,7 @@
 extern "C" {  /* this should be included in the includes itself !! */
 
 #include "php.h"
-#include "php_ini.h"
+#include "ext/standard/info.h"
 
 }
 
@@ -179,15 +179,13 @@ function_entry DOTNET_functions[] = {
        {NULL, NULL, NULL}
 };
 
-
 static PHP_MINFO_FUNCTION(DOTNET)
 {
-       DISPLAY_INI_ENTRIES();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "DOTNET support", "enabled");
+       php_info_print_table_end();
 }
 
-PHP_INI_BEGIN()
-PHP_INI_END()
-
 PHP_MINIT_FUNCTION(DOTNET)
 {
 
@@ -197,7 +195,6 @@ PHP_MINIT_FUNCTION(DOTNET)
        if (FAILED(hr)) return hr;
 
        php_register_DOTNET_class();
-       REGISTER_INI_ENTRIES();
        return SUCCESS;
 }
 
@@ -206,7 +203,6 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET)
 {
        dotnet_term();
        CoUninitialize();
-       UNREGISTER_INI_ENTRIES();
        return SUCCESS;
 }
 

diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index a133f2f588dfadf1b36b90ee5b48a49e696d7d8b..352c0674ddb6181c0740d1679eeea69e83af0aea 100644 (file)
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -50,7 +50,9 @@ function_entry VARIANT_functions[] = {
 
 static PHP_MINFO_FUNCTION(VARIANT)
 {
-       DISPLAY_INI_ENTRIES();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "VARIANT support", "enabled");
+       php_info_print_table_end();
 }
 
 zend_module_entry VARIANT_module_entry = {

diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp
index f20c1f46dd495c9bc640ea76f9ce1477b66e3239..b8e9d168acb44dfd1233b5103bb30ee0015b1f5f 100644 (file)
--- a/ext/rpc/dotnet/dotnet.cpp
+++ b/ext/rpc/dotnet/dotnet.cpp
@@ -37,7 +37,7 @@
 extern "C" {  /* this should be included in the includes itself !! */
 
 #include "php.h"
-#include "php_ini.h"
+#include "ext/standard/info.h"
 
 }
 
@@ -179,15 +179,13 @@ function_entry DOTNET_functions[] = {
        {NULL, NULL, NULL}
 };
 
-
 static PHP_MINFO_FUNCTION(DOTNET)
 {
-       DISPLAY_INI_ENTRIES();
+       php_info_print_table_start();
+       php_info_print_table_row(2, "DOTNET support", "enabled");
+       php_info_print_table_end();
 }
 
-PHP_INI_BEGIN()
-PHP_INI_END()
-
 PHP_MINIT_FUNCTION(DOTNET)
 {
 
@@ -197,7 +195,6 @@ PHP_MINIT_FUNCTION(DOTNET)
        if (FAILED(hr)) return hr;
 
        php_register_DOTNET_class();
-       REGISTER_INI_ENTRIES();
        return SUCCESS;
 }
 
@@ -206,7 +203,6 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET)
 {
        dotnet_term();
        CoUninitialize();
-       UNREGISTER_INI_ENTRIES();
        return SUCCESS;
 }