Skip to content

Commit fa31348

Browse files
TimWollaTimWolla
committed
Use php_info_print_table_header for actual column headers only
Using php_info_print_table_header() for "Foo: bar" looks odd and out of place, because the whole line is colored. It is also questionable from a HTML semantics point of view, because it does not described the columns that follow. The use of this across extensions is inconsistent. It was part of the skeleton, but ext/date or ext/json already use a regular row.
1 parent 14f22e9 commit fa31348

File tree

24 files changed

+27
-27
lines changed

24 files changed

+27
-27
lines changed

‎ext/com_dotnet/com_extension.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ PHP_MINFO_FUNCTION(com_dotnet)
256256
{
257257
php_info_print_table_start();
258258

259-
php_info_print_table_header(2, "COM support", "enabled");
260-
php_info_print_table_header(2, "DCOM support", COMG(allow_dcom) ? "enabled" : "disabled");
259+
php_info_print_table_row(2, "COM support", "enabled");
260+
php_info_print_table_row(2, "DCOM support", COMG(allow_dcom) ? "enabled" : "disabled");
261261

262262
#if HAVE_MSCOREE_H
263-
php_info_print_table_header(2, ".Net support", "enabled");
263+
php_info_print_table_row(2, ".Net support", "enabled");
264264
#else
265-
php_info_print_table_header(2, ".Net support", "not present in this build");
265+
php_info_print_table_row(2, ".Net support", "not present in this build");
266266
#endif
267267

268268
php_info_print_table_end();

‎ext/dl_test/dl_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ PHP_RINIT_FUNCTION(dl_test)
123123
PHP_MINFO_FUNCTION(dl_test)
124124
{
125125
php_info_print_table_start();
126-
php_info_print_table_header(2, "dl_test support", "enabled");
126+
php_info_print_table_row(2, "dl_test support", "enabled");
127127
php_info_print_table_end();
128128

129129
DISPLAY_INI_ENTRIES();

‎ext/ffi/ffi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5465,7 +5465,7 @@ ZEND_RSHUTDOWN_FUNCTION(ffi)
54655465
ZEND_MINFO_FUNCTION(ffi)
54665466
{
54675467
php_info_print_table_start();
5468-
php_info_print_table_header(2, "FFI support", "enabled");
5468+
php_info_print_table_row(2, "FFI support", "enabled");
54695469
php_info_print_table_end();
54705470

54715471
DISPLAY_INI_ENTRIES();

‎ext/intl/php_intl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ PHP_MINFO_FUNCTION( intl )
257257
#endif
258258

259259
php_info_print_table_start();
260-
php_info_print_table_header( 2, "Internationalization support", "enabled" );
260+
php_info_print_table_row( 2, "Internationalization support", "enabled" );
261261
php_info_print_table_row( 2, "ICU version", U_ICU_VERSION );
262262
#ifdef U_ICU_DATA_VERSION
263263
php_info_print_table_row( 2, "ICU Data version", U_ICU_DATA_VERSION );

‎ext/mysqli/mysqli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ PHP_MINFO_FUNCTION(mysqli)
588588
char buf[32];
589589

590590
php_info_print_table_start();
591-
php_info_print_table_header(2, "MysqlI Support", "enabled");
591+
php_info_print_table_row(2, "MysqlI Support", "enabled");
592592
php_info_print_table_row(2, "Client API library version", mysql_get_client_info());
593593
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MyG(num_active_persistent));
594594
php_info_print_table_row(2, "Active Persistent Links", buf);

‎ext/mysqlnd/php_mysqlnd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ PHP_MINFO_FUNCTION(mysqlnd)
7979
char buf[32];
8080

8181
php_info_print_table_start();
82-
php_info_print_table_header(2, "mysqlnd", "enabled");
82+
php_info_print_table_row(2, "mysqlnd", "enabled");
8383
php_info_print_table_row(2, "Version", mysqlnd_get_client_info());
8484
php_info_print_table_row(2, "Compression",
8585
#ifdef MYSQLND_COMPRESSION_ENABLED

‎ext/odbc/php_odbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ PHP_MINFO_FUNCTION(odbc)
438438
char buf[32];
439439

440440
php_info_print_table_start();
441-
php_info_print_table_header(2, "ODBC Support", "enabled");
441+
php_info_print_table_row(2, "ODBC Support", "enabled");
442442
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ODBCG(num_persistent));
443443
php_info_print_table_row(2, "Active Persistent Links", buf);
444444
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ODBCG(num_links));

‎ext/pcntl/pcntl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ PHP_RSHUTDOWN_FUNCTION(pcntl)
160160
PHP_MINFO_FUNCTION(pcntl)
161161
{
162162
php_info_print_table_start();
163-
php_info_print_table_header(2, "pcntl support", "enabled");
163+
php_info_print_table_row(2, "pcntl support", "enabled");
164164
php_info_print_table_end();
165165
}
166166

‎ext/pdo/pdo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ PHP_MINFO_FUNCTION(pdo)
275275
pdo_driver_t *pdriver;
276276

277277
php_info_print_table_start();
278-
php_info_print_table_header(2, "PDO support", "enabled");
278+
php_info_print_table_row(2, "PDO support", "enabled");
279279

280280
ZEND_HASH_MAP_FOREACH_PTR(&pdo_driver_hash, pdriver) {
281281
spprintf(&drivers, 0, "%s, %s", ldrivers, pdriver->driver_name);

‎ext/pdo_dblib/pdo_dblib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_dblib)
223223
PHP_MINFO_FUNCTION(pdo_dblib)
224224
{
225225
php_info_print_table_start();
226-
php_info_print_table_header(2, "PDO Driver for "
226+
php_info_print_table_row(2, "PDO Driver for "
227227
#ifdef PDO_DBLIB_IS_MSSQL
228228
"MSSQL"
229229
#elif defined(PHP_WIN32)

‎ext/pdo_firebird/pdo_firebird.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ PHP_MINFO_FUNCTION(pdo_firebird) /* {{{ */
8585
isc_get_client_version(version);
8686

8787
php_info_print_table_start();
88-
php_info_print_table_header(2, "PDO Driver for Firebird", "enabled");
88+
php_info_print_table_row(2, "PDO Driver for Firebird", "enabled");
8989
php_info_print_table_row(2, "Client Library Version", version);
9090
php_info_print_table_end();
9191
}

‎ext/pdo_mysql/pdo_mysql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static PHP_MINFO_FUNCTION(pdo_mysql)
153153
{
154154
php_info_print_table_start();
155155

156-
php_info_print_table_header(2, "PDO Driver for MySQL", "enabled");
156+
php_info_print_table_row(2, "PDO Driver for MySQL", "enabled");
157157
php_info_print_table_row(2, "Client API version", mysql_get_client_info());
158158

159159
php_info_print_table_end();

‎ext/pdo_oci/pdo_oci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_oci)
147147
PHP_MINFO_FUNCTION(pdo_oci)
148148
{
149149
php_info_print_table_start();
150-
php_info_print_table_header(2, "PDO Driver for OCI 8 and later", "enabled");
150+
php_info_print_table_row(2, "PDO Driver for OCI 8 and later", "enabled");
151151
php_info_print_table_end();
152152
}
153153
/* }}} */

‎ext/pdo_odbc/pdo_odbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_odbc)
118118
PHP_MINFO_FUNCTION(pdo_odbc)
119119
{
120120
php_info_print_table_start();
121-
php_info_print_table_header(2, "PDO Driver for ODBC (" PDO_ODBC_TYPE ")" , "enabled");
121+
php_info_print_table_row(2, "PDO Driver for ODBC (" PDO_ODBC_TYPE ")" , "enabled");
122122
#ifdef SQL_ATTR_CONNECTION_POOLING
123123
php_info_print_table_row(2, "ODBC Connection Pooling", pdo_odbc_pool_on == SQL_CP_OFF ?
124124
"Disabled" : (pdo_odbc_pool_mode == SQL_CP_STRICT_MATCH ? "Enabled, strict matching" : "Enabled, relaxed matching"));

‎ext/pdo_sqlite/pdo_sqlite.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_sqlite)
8484
PHP_MINFO_FUNCTION(pdo_sqlite)
8585
{
8686
php_info_print_table_start();
87-
php_info_print_table_header(2, "PDO Driver for SQLite 3.x", "enabled");
87+
php_info_print_table_row(2, "PDO Driver for SQLite 3.x", "enabled");
8888
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
8989
php_info_print_table_end();
9090
}

‎ext/pgsql/pgsql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ PHP_MINFO_FUNCTION(pgsql)
512512
char buf[256];
513513

514514
php_info_print_table_start();
515-
php_info_print_table_header(2, "PostgreSQL Support", "enabled");
515+
php_info_print_table_row(2, "PostgreSQL Support", "enabled");
516516
php_info_print_table_row(2, "PostgreSQL (libpq) Version", pgsql_libpq_version);
517517
#ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
518518
php_info_print_table_row(2, "Multibyte character support", "enabled");

‎ext/phar/phar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3565,7 +3565,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
35653565
{
35663566
phar_request_initialize();
35673567
php_info_print_table_start();
3568-
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
3568+
php_info_print_table_row(2, "Phar: PHP Archive support", "enabled");
35693569
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
35703570
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
35713571
php_info_print_table_row(2, "Tar-based phar archives", "enabled");

‎ext/readline/readline_cli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ PHP_MSHUTDOWN_FUNCTION(cli_readline)
800800
PHP_MINFO_FUNCTION(cli_readline)
801801
{
802802
php_info_print_table_start();
803-
php_info_print_table_header(2, "Readline Support", "enabled");
803+
php_info_print_table_row(2, "Readline Support", "enabled");
804804
#ifdef PHP_WIN32
805805
php_info_print_table_row(2, "Readline library", "WinEditLine");
806806
#else

‎ext/skeleton/skeleton.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ PHP_RINIT_FUNCTION(%EXTNAME%)
5858
PHP_MINFO_FUNCTION(%EXTNAME%)
5959
{
6060
php_info_print_table_start();
61-
php_info_print_table_header(2, "%EXTNAME% support", "enabled");
61+
php_info_print_table_row(2, "%EXTNAME% support", "enabled");
6262
php_info_print_table_end();
6363
}
6464
/* }}} */

‎ext/sodium/libsodium.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ PHP_MSHUTDOWN_FUNCTION(sodium)
184184
PHP_MINFO_FUNCTION(sodium)
185185
{
186186
php_info_print_table_start();
187-
php_info_print_table_header(2, "sodium support", "enabled");
187+
php_info_print_table_row(2, "sodium support", "enabled");
188188
php_info_print_table_row(2, "libsodium headers version", SODIUM_VERSION_STRING);
189189
php_info_print_table_row(2, "libsodium library version", sodium_version_string());
190190
php_info_print_table_end();

‎ext/spl/php_spl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ PHP_MINFO_FUNCTION(spl)
670670
char *strg;
671671

672672
php_info_print_table_start();
673-
php_info_print_table_header(2, "SPL support", "enabled");
673+
php_info_print_table_row(2, "SPL support", "enabled");
674674

675675
array_init(&list);
676676
SPL_LIST_CLASSES(&list, 0, 1, ZEND_ACC_INTERFACE)

‎ext/sqlite3/sqlite3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2406,7 +2406,7 @@ PHP_MSHUTDOWN_FUNCTION(sqlite3)
24062406
PHP_MINFO_FUNCTION(sqlite3)
24072407
{
24082408
php_info_print_table_start();
2409-
php_info_print_table_header(2, "SQLite3 support", "enabled");
2409+
php_info_print_table_row(2, "SQLite3 support", "enabled");
24102410
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
24112411
php_info_print_table_end();
24122412

‎ext/zend_test/test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ static PHP_GSHUTDOWN_FUNCTION(zend_test)
804804
PHP_MINFO_FUNCTION(zend_test)
805805
{
806806
php_info_print_table_start();
807-
php_info_print_table_header(2, "zend_test extension", "enabled");
807+
php_info_print_table_row(2, "zend_test extension", "enabled");
808808
php_info_print_table_end();
809809

810810
DISPLAY_INI_ENTRIES();

‎ext/zlib/zlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ static PHP_RSHUTDOWN_FUNCTION(zlib)
14041404
static PHP_MINFO_FUNCTION(zlib)
14051405
{
14061406
php_info_print_table_start();
1407-
php_info_print_table_header(2, "ZLib Support", "enabled");
1407+
php_info_print_table_row(2, "ZLib Support", "enabled");
14081408
php_info_print_table_row(2, "Stream Wrapper", "compress.zlib://");
14091409
php_info_print_table_row(2, "Stream Filter", "zlib.inflate, zlib.deflate");
14101410
php_info_print_table_row(2, "Compiled Version", ZLIB_VERSION);

0 commit comments

Comments
 (0)