phpinfo improvements

- "Zstd support enabled" doesn't provide any information, so just remove it
- show if zstd is bundled or not
- show if zstd is the active serializer for apcu or if apcu isn't loaded
- rename serializer ABI to interface, which is consistent with zstd interface
- if apcu support wasn't built, show that it could have been built

Author: pavetheway91

config.m4

@@ -89,6 +89,7 @@ if test "$PHP_ZSTD" != "no"; then
 
     PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/zstd/lib/common)
     PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/zstd/lib)
+    AC_DEFINE(HAVE_BUNDLED_ZSTD, 1, [Bundled zstd])
   fi
   PHP_NEW_EXTENSION(zstd, zstd.c $ZSTD_COMMON_SOURCES $ZSTD_COMPRESS_SOURCES $ZSTD_DECOMPRESS_SOURCES, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
   PHP_SUBST(ZSTD_SHARED_LIBADD)

config.w32

@@ -23,6 +23,8 @@ if (PHP_ZSTD != "no") {
     ADD_SOURCES("zstd/lib/compress", "fse_compress.c hist.c huf_compress.c zstd_compress.c zstd_compress_literals.c zstd_compress_sequences.c zstd_compress_superblock.c zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c zstd_opt.c zstd_preSplit.c zstdmt_compress.c", "zstd");
     ADD_SOURCES("zstd/lib/decompress", "huf_decompress.c zstd_ddict.c zstd_decompress.c zstd_decompress_block.c", "zstd");
 
+    AC_DEFINE("HAVE_BUNDLED_ZSTD", 1, "Bundled zstd");
+
     ADD_FLAG("CFLAGS_ZSTD", " /I" + configure_module_dirname + " /I" + configure_module_dirname + "/zstd/lib/common" + " /I" + configure_module_dirname + "/zstd/lib");
   }
 }

tests/info.phpt

@@ -3,12 +3,75 @@ phpinfo() displays zstd info
 --SKIPIF--
 --FILE--
 <?php
-phpinfo();
---EXPECTF--
-%a
-zstd
+$ref = new ReflectionExtension('zstd');
+ob_start();
+$ref->info();
+$info = ob_get_contents();
+ob_end_clean();
+
+// skip uninteresting lines
+$lines = [];
+foreach(explode("\n", $info) as $line) {
+    if ($line && $line !== 'zstd') {
+        $lines[] = $line;
+    }
+}
+
+$verNum = '(([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{1,2}))';
+
+if (count($lines) >= 4) {
+    echo preg_match('/^Extension\sversion\s\=\>\s'.$verNum.'$/', $lines[0]) ? "Ext version OK\n" : "Fail\n";
+
+    $libZstd = '(bundled|external)';
+    $hasApcu = null;
+
+    if (file_exists($configH = dirname(__DIR__) . '/config.h')) {
+        $configH = file_get_contents($configH);
+        $libZstd = preg_match('/define\sHAVE_BUNDLED_ZSTD\s1/', $configH) ? 'bundled' : 'external';
+        $hasApcu = preg_match('/define\sHAVE_APCU_SUPPORT\s1/', $configH) ? true : false;
+    }
+
+    echo preg_match('/^Zstd\slibrary\s\=\>\s'.$libZstd.'$/', $lines[1]) ? "Bundled/external zstd OK\n" : "Fail\n";
 
-Zstd support => enabled
-Extension Version => %d.%d.%d
-Interface Version => %d.%d.%d
-%a
+    echo preg_match('/^Zstd\sinterface\sversion\s\=\>\s'.$verNum.'$/', $lines[2]) ? "Zstd version OK\n" : "Fail\n";
+
+    if ($hasApcu === null) {
+        echo "Apcu OK\n"; // just assume it is okay
+    } else if ($hasApcu) {
+        if (substr($lines[3], 0, 18) !== 'APCu serializer =>') {
+            echo "Fail\n";
+        } else {
+            $fail = '';
+            $value = substr($lines[3], 19);
+
+            if (!extension_loaded('apcu')) {
+                if ($value !== 'APCu extension not loaded') {
+                    $fail .= 'should be not loaded ';
+                }
+            } else if (!in_array($value, ['zstd active', 'zstd inactive'])) {
+                $fail .= 'active/inactive mismatch ';
+            }
+
+            if (
+                !isset($lines[4])
+                ||
+                !preg_match('/^APCu\sserializer\sinterface\sversion\s\=\>\s([0-9])/', $lines[4])
+            ) {
+                $fail .= 'ABI ';
+            }
+
+            echo !$fail ? "Apcu OK\n" : ("Fail: " . $fail . "");
+        }
+    } else {
+        echo ($lines[3] == 'APCu serializer support => not built') ? "Apcu OK\n" : "Fail: not built\n";
+    }
+
+    /**
+     * TODO: test built-in header exclusion list
+     **/
+}
+--EXPECTF--
+Ext version OK
+Bundled/external zstd OK
+Zstd version OK
+Apcu OK

zstd.c

@@ -1943,11 +1943,27 @@ ZEND_RSHUTDOWN_FUNCTION(zstd)
 ZEND_MINFO_FUNCTION(zstd)
 {
     php_info_print_table_start();
-    php_info_print_table_row(2, "Zstd support", "enabled");
-    php_info_print_table_row(2, "Extension Version", PHP_ZSTD_VERSION);
-    php_info_print_table_row(2, "Interface Version", ZSTD_VERSION_STRING);
+    php_info_print_table_row(2, "Extension version", PHP_ZSTD_VERSION);
+#if defined(HAVE_BUNDLED_ZSTD)
+    php_info_print_table_row(2, "Zstd library", "bundled");
+#else
+    php_info_print_table_row(2, "Zstd library", "external");
+#endif
+    php_info_print_table_row(2, "Zstd interface version", ZSTD_VERSION_STRING);
 #if defined(HAVE_APCU_SUPPORT)
-    php_info_print_table_row(2, "APCu serializer ABI", APC_SERIALIZER_ABI);
+    const char *serializer = zend_ini_string("apc.serializer", sizeof("apc.serializer")-1, 0);
+
+    if (serializer == NULL) {
+        php_info_print_table_row(2, "APCu serializer", "APCu extension not loaded");
+    } else if (strcmp(serializer, "zstd") == 0) {
+        php_info_print_table_row(2, "APCu serializer", "zstd active");
+    } else {
+        php_info_print_table_row(2, "APCu serializer", "zstd inactive");
+    }
+
+    php_info_print_table_row(2, "APCu serializer interface version", APC_SERIALIZER_ABI);
+#else
+    php_info_print_table_row(2, "APCu serializer support", "not built");
 #endif
     php_info_print_table_end();
     DISPLAY_INI_ENTRIES();