Skip to content

Use php_info_print_table_header for actual column headers only #9485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2022
Merged

Use php_info_print_table_header for actual column headers only #9485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ext/com_dotnet/com_extension.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ PHP_MINFO_FUNCTION(com_dotnet)
{
php_info_print_table_start();

php_info_print_table_header(2, "COM support", "enabled");
php_info_print_table_header(2, "DCOM support", COMG(allow_dcom) ? "enabled" : "disabled");
php_info_print_table_row(2, "COM support", "enabled");
php_info_print_table_row(2, "DCOM support", COMG(allow_dcom) ? "enabled" : "disabled");

#if HAVE_MSCOREE_H
php_info_print_table_header(2, ".Net support", "enabled");
php_info_print_table_row(2, ".Net support", "enabled");
#else
php_info_print_table_header(2, ".Net support", "not present in this build");
php_info_print_table_row(2, ".Net support", "not present in this build");
#endif

php_info_print_table_end();
Expand Down
2 changes: 1 addition & 1 deletion ext/dl_test/dl_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ PHP_RINIT_FUNCTION(dl_test)
PHP_MINFO_FUNCTION(dl_test)
{
php_info_print_table_start();
php_info_print_table_header(2, "dl_test support", "enabled");
php_info_print_table_row(2, "dl_test support", "enabled");
php_info_print_table_end();

DISPLAY_INI_ENTRIES();
Expand Down
2 changes: 1 addition & 1 deletion ext/ffi/ffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5465,7 +5465,7 @@ ZEND_RSHUTDOWN_FUNCTION(ffi)
ZEND_MINFO_FUNCTION(ffi)
{
php_info_print_table_start();
php_info_print_table_header(2, "FFI support", "enabled");
php_info_print_table_row(2, "FFI support", "enabled");
php_info_print_table_end();

DISPLAY_INI_ENTRIES();
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/php_intl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ PHP_MINFO_FUNCTION( intl )
#endif

php_info_print_table_start();
php_info_print_table_header( 2, "Internationalization support", "enabled" );
php_info_print_table_row( 2, "Internationalization support", "enabled" );
php_info_print_table_row( 2, "ICU version", U_ICU_VERSION );
#ifdef U_ICU_DATA_VERSION
php_info_print_table_row( 2, "ICU Data version", U_ICU_DATA_VERSION );
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/mysqli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ PHP_MINFO_FUNCTION(mysqli)
char buf[32];

php_info_print_table_start();
php_info_print_table_header(2, "MysqlI Support", "enabled");
php_info_print_table_row(2, "MysqlI Support", "enabled");
php_info_print_table_row(2, "Client API library version", mysql_get_client_info());
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_active_persistent));
php_info_print_table_row(2, "Active Persistent Links", buf);
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqlnd/php_mysqlnd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ PHP_MINFO_FUNCTION(mysqlnd)
char buf[32];

php_info_print_table_start();
php_info_print_table_header(2, "mysqlnd", "enabled");
php_info_print_table_row(2, "mysqlnd", "enabled");
php_info_print_table_row(2, "Version", mysqlnd_get_client_info());
php_info_print_table_row(2, "Compression",
#ifdef MYSQLND_COMPRESSION_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion ext/odbc/php_odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ PHP_MINFO_FUNCTION(odbc)
char buf[32];

php_info_print_table_start();
php_info_print_table_header(2, "ODBC Support", "enabled");
php_info_print_table_row(2, "ODBC Support", "enabled");
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ODBCG(num_persistent));
php_info_print_table_row(2, "Active Persistent Links", buf);
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ODBCG(num_links));
Expand Down
2 changes: 1 addition & 1 deletion ext/pcntl/pcntl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ PHP_RSHUTDOWN_FUNCTION(pcntl)
PHP_MINFO_FUNCTION(pcntl)
{
php_info_print_table_start();
php_info_print_table_header(2, "pcntl support", "enabled");
php_info_print_table_row(2, "pcntl support", "enabled");
php_info_print_table_end();
}

Expand Down
2 changes: 1 addition & 1 deletion ext/pdo/pdo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ PHP_MINFO_FUNCTION(pdo)
pdo_driver_t *pdriver;

php_info_print_table_start();
php_info_print_table_header(2, "PDO support", "enabled");
php_info_print_table_row(2, "PDO support", "enabled");

ZEND_HASH_MAP_FOREACH_PTR(&pdo_driver_hash, pdriver) {
spprintf(&drivers, 0, "%s, %s", ldrivers, pdriver->driver_name);
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_dblib/pdo_dblib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_dblib)
PHP_MINFO_FUNCTION(pdo_dblib)
{
php_info_print_table_start();
php_info_print_table_header(2, "PDO Driver for "
php_info_print_table_row(2, "PDO Driver for "
#ifdef PDO_DBLIB_IS_MSSQL
"MSSQL"
#elif defined(PHP_WIN32)
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_firebird/pdo_firebird.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ PHP_MINFO_FUNCTION(pdo_firebird) /* {{{ */
isc_get_client_version(version);

php_info_print_table_start();
php_info_print_table_header(2, "PDO Driver for Firebird", "enabled");
php_info_print_table_row(2, "PDO Driver for Firebird", "enabled");
php_info_print_table_row(2, "Client Library Version", version);
php_info_print_table_end();
}
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_mysql/pdo_mysql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static PHP_MINFO_FUNCTION(pdo_mysql)
{
php_info_print_table_start();

php_info_print_table_header(2, "PDO Driver for MySQL", "enabled");
php_info_print_table_row(2, "PDO Driver for MySQL", "enabled");
php_info_print_table_row(2, "Client API version", mysql_get_client_info());

php_info_print_table_end();
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_oci/pdo_oci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_oci)
PHP_MINFO_FUNCTION(pdo_oci)
{
php_info_print_table_start();
php_info_print_table_header(2, "PDO Driver for OCI 8 and later", "enabled");
php_info_print_table_row(2, "PDO Driver for OCI 8 and later", "enabled");
php_info_print_table_end();
}
/* }}} */
2 changes: 1 addition & 1 deletion ext/pdo_odbc/pdo_odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_odbc)
PHP_MINFO_FUNCTION(pdo_odbc)
{
php_info_print_table_start();
php_info_print_table_header(2, "PDO Driver for ODBC (" PDO_ODBC_TYPE ")" , "enabled");
php_info_print_table_row(2, "PDO Driver for ODBC (" PDO_ODBC_TYPE ")" , "enabled");
#ifdef SQL_ATTR_CONNECTION_POOLING
php_info_print_table_row(2, "ODBC Connection Pooling", pdo_odbc_pool_on == SQL_CP_OFF ?
"Disabled" : (pdo_odbc_pool_mode == SQL_CP_STRICT_MATCH ? "Enabled, strict matching" : "Enabled, relaxed matching"));
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_sqlite/pdo_sqlite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_sqlite)
PHP_MINFO_FUNCTION(pdo_sqlite)
{
php_info_print_table_start();
php_info_print_table_header(2, "PDO Driver for SQLite 3.x", "enabled");
php_info_print_table_row(2, "PDO Driver for SQLite 3.x", "enabled");
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
php_info_print_table_end();
}
Expand Down
2 changes: 1 addition & 1 deletion ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ PHP_MINFO_FUNCTION(pgsql)
char buf[256];

php_info_print_table_start();
php_info_print_table_header(2, "PostgreSQL Support", "enabled");
php_info_print_table_row(2, "PostgreSQL Support", "enabled");
php_info_print_table_row(2, "PostgreSQL (libpq) Version", pgsql_libpq_version);
#ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
php_info_print_table_row(2, "Multibyte character support", "enabled");
Expand Down
2 changes: 1 addition & 1 deletion ext/phar/phar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3565,7 +3565,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
{
phar_request_initialize();
php_info_print_table_start();
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
Expand Down
2 changes: 1 addition & 1 deletion ext/readline/readline_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ PHP_MSHUTDOWN_FUNCTION(cli_readline)
PHP_MINFO_FUNCTION(cli_readline)
{
php_info_print_table_start();
php_info_print_table_header(2, "Readline Support", "enabled");
php_info_print_table_row(2, "Readline Support", "enabled");
#ifdef PHP_WIN32
php_info_print_table_row(2, "Readline library", "WinEditLine");
#else
Expand Down
2 changes: 1 addition & 1 deletion ext/skeleton/skeleton.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ PHP_RINIT_FUNCTION(%EXTNAME%)
PHP_MINFO_FUNCTION(%EXTNAME%)
{
php_info_print_table_start();
php_info_print_table_header(2, "%EXTNAME% support", "enabled");
php_info_print_table_row(2, "%EXTNAME% support", "enabled");
php_info_print_table_end();
}
/* }}} */
Expand Down
2 changes: 1 addition & 1 deletion ext/sodium/libsodium.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ PHP_MSHUTDOWN_FUNCTION(sodium)
PHP_MINFO_FUNCTION(sodium)
{
php_info_print_table_start();
php_info_print_table_header(2, "sodium support", "enabled");
php_info_print_table_row(2, "sodium support", "enabled");
php_info_print_table_row(2, "libsodium headers version", SODIUM_VERSION_STRING);
php_info_print_table_row(2, "libsodium library version", sodium_version_string());
php_info_print_table_end();
Expand Down
2 changes: 1 addition & 1 deletion ext/spl/php_spl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ PHP_MINFO_FUNCTION(spl)
char *strg;

php_info_print_table_start();
php_info_print_table_header(2, "SPL support", "enabled");
php_info_print_table_row(2, "SPL support", "enabled");

array_init(&list);
SPL_LIST_CLASSES(&list, 0, 1, ZEND_ACC_INTERFACE)
Expand Down
2 changes: 1 addition & 1 deletion ext/sqlite3/sqlite3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2406,7 +2406,7 @@ PHP_MSHUTDOWN_FUNCTION(sqlite3)
PHP_MINFO_FUNCTION(sqlite3)
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite3 support", "enabled");
php_info_print_table_row(2, "SQLite3 support", "enabled");
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
php_info_print_table_end();

Expand Down
2 changes: 1 addition & 1 deletion ext/zend_test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ static PHP_GSHUTDOWN_FUNCTION(zend_test)
PHP_MINFO_FUNCTION(zend_test)
{
php_info_print_table_start();
php_info_print_table_header(2, "zend_test extension", "enabled");
php_info_print_table_row(2, "zend_test extension", "enabled");
php_info_print_table_end();

DISPLAY_INI_ENTRIES();
Expand Down
2 changes: 1 addition & 1 deletion ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,7 @@ static PHP_RSHUTDOWN_FUNCTION(zlib)
static PHP_MINFO_FUNCTION(zlib)
{
php_info_print_table_start();
php_info_print_table_header(2, "ZLib Support", "enabled");
php_info_print_table_row(2, "ZLib Support", "enabled");
php_info_print_table_row(2, "Stream Wrapper", "compress.zlib://");
php_info_print_table_row(2, "Stream Filter", "zlib.inflate, zlib.deflate");
php_info_print_table_row(2, "Compiled Version", ZLIB_VERSION);
Expand Down