Use ‘simdjson-plus’ for package name.

Reduces confusion and conflicts with the simdjson PECL package, which
doesn’t seem to be actively maintained.

Author: onethumb

config.m4

@@ -31,7 +31,7 @@ if test "$PHP_SIMDJSON" != "no"; then
   AC_DEFINE(HAVE_SIMDJSON, 1, [whether simdjson is enabled])
   dnl Disable exceptions because PHP is written in C and loads this C++ module, handle errors manually.
   dnl Disable development checks of C simdjson library in php debug builds (can manually override)
-  PHP_NEW_EXTENSION(simdjson, [
+  PHP_NEW_EXTENSION(simdjson_plus, [
       php_simdjson.cpp                    \
       src/simdjson_decoder.cpp            \
       src/countlut.cpp                    \
@@ -40,7 +40,7 @@ if test "$PHP_SIMDJSON" != "no"; then
       src/simdjson.cpp],
     $ext_shared,, "-std=c++17 -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1", cxx)
 
-  PHP_INSTALL_HEADERS([ext/simdjson], [php_simdjson.h src/simdjson_decoder_defs.h])
+  PHP_INSTALL_HEADERS([ext/simdjson_plus], [php_simdjson.h src/simdjson_decoder_defs.h])
   PHP_ADD_MAKEFILE_FRAGMENT
   PHP_ADD_BUILD_DIR(src, 1)
 fi

php_simdjson.cpp

@@ -678,13 +678,17 @@ PHP_RSHUTDOWN_FUNCTION (simdjson) {
 PHP_MINFO_FUNCTION (simdjson) {
     php_info_print_table_start();
 
-    php_info_print_table_row(2, "simdjson support", "enabled");
-    php_info_print_table_row(2, "Version", PHP_SIMDJSON_VERSION);
-    php_info_print_table_row(2, "Support", SIMDJSON_SUPPORT_URL);
+    const simdutf::implementation *simdutf_impl = simdutf::get_active_implementation();
+
+    php_info_print_table_row(2, "simdjson-plus", "enabled");
+    php_info_print_table_row(2, "simdjson-plus support", SIMDJSON_PLUS_SUPPORT_URL);
+    php_info_print_table_row(2, "simdjson-plus extension version", PHP_SIMDJSON_PLUS_VERSION);
     php_info_print_table_row(2, "simdjson library version", SIMDJSON_VERSION);
+    php_info_print_table_row(2, "simdjson decoder implementation", simdjson::get_active_implementation()->description().c_str());
+    php_info_print_table_row(2, "simdjson decoder implementation", simdjson_encode_implementation());
     php_info_print_table_row(2, "simdutf library version", SIMDUTF_VERSION);
-    php_info_print_table_row(2, "Decoder implementation", simdjson::get_active_implementation()->description().c_str());
-    php_info_print_table_row(2, "Encoder implementation", simdjson_encode_implementation());
+    php_info_print_table_row(2, "simdutf implementation name", simdutf_impl->name().c_str());
+    php_info_print_table_row(2, "simdutf implementation description", simdutf_impl->description().c_str());
 
     php_info_print_table_end();
 }
@@ -702,14 +706,14 @@ zend_module_dep simdjson_deps[] = {
 zend_module_entry simdjson_module_entry = {
     STANDARD_MODULE_HEADER_EX, NULL,
     simdjson_deps,
-    "simdjson",
+    "simdjson_plus",
     ext_functions,
     PHP_MINIT(simdjson),
     PHP_MSHUTDOWN(simdjson),
     PHP_RINIT(simdjson),
     PHP_RSHUTDOWN(simdjson),
     PHP_MINFO(simdjson),
-    PHP_SIMDJSON_VERSION,
+    PHP_SIMDJSON_PLUS_VERSION,
     PHP_MODULE_GLOBALS(simdjson),
     PHP_GINIT(simdjson),
     NULL,
@@ -720,7 +724,7 @@ zend_module_entry simdjson_module_entry = {
 
 /** {{{ DL support
  */
-#ifdef COMPILE_DL_SIMDJSON
+#ifdef COMPILE_DL_SIMDJSON_PLUS
 #ifdef ZTS
 ZEND_TSRMLS_CACHE_DEFINE();
 #endif

php_simdjson.h

@@ -51,15 +51,15 @@ BEGIN_EXTERN_C()
 extern zend_module_entry simdjson_module_entry;
 #define phpext_simdjson_ptr &simdjson_module_entry
 
-#define PHP_SIMDJSON_VERSION                  "5.0.0dev"
+#define PHP_SIMDJSON_PLUS_VERSION                  "1.0.0"
 /**
  * PHP_SIMDJSON_VERSION_ID has the same format as PHP_VERSION_ID: Major version * 10000 + Minor version * 100 + Patch version.
  * This is meant for use by PECL extensions that depend on simdjson.
  * (e.g. 4.5.6dev and 4.5.6 would be 40506)
  */
-#define PHP_SIMDJSON_VERSION_ID               50000
+#define PHP_SIMDJSON_PLUS_VERSION_ID               10000
 
-#define SIMDJSON_SUPPORT_URL                  "https://github.com/JakubOnderka/simdjson_php"
+#define SIMDJSON_PLUS_SUPPORT_URL                  "https://github.com/awesomized/simdjson-plus-php-ext"
 
 #define SIMDJSON_PARSE_DEFAULT_DEPTH          512
 /**

tests/decode_args.phpt

@@ -7,7 +7,7 @@ echo $reflection;
 
 ?>
 --EXPECTF--
-Function [ <internal:simdjson> function simdjson_decode ] {
+Function [ <internal:simdjson_plus> function simdjson_decode ] {
 
   - Parameters [3] {
     Parameter #0 [ <required> string $json ]

tests/is_valid_args.phpt

@@ -7,7 +7,7 @@ echo $reflection;
 
 ?>
 --EXPECTF--
-Function [ <internal:simdjson> function simdjson_is_valid ] {
+Function [ <internal:simdjson_plus> function simdjson_is_valid ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $json ]

tests/key_count_args.phpt

@@ -7,7 +7,7 @@ echo $reflection;
 
 ?>
 --EXPECTF--
-Function [ <internal:simdjson> function simdjson_key_count ] {
+Function [ <internal:simdjson_plus> function simdjson_key_count ] {
 
   - Parameters [4] {
     Parameter #0 [ <required> string $json ]

tests/key_exists_args.phpt

@@ -7,7 +7,7 @@ echo $reflection;
 
 ?>
 --EXPECTF--
-Function [ <internal:simdjson> function simdjson_key_exists ] {
+Function [ <internal:simdjson_plus> function simdjson_key_exists ] {
 
   - Parameters [3] {
     Parameter #0 [ <required> string $json ]

tests/key_value_args.phpt

@@ -7,7 +7,7 @@ echo $reflection;
 
 ?>
 --EXPECTF--
-Function [ <internal:simdjson> function simdjson_key_value ] {
+Function [ <internal:simdjson_plus> function simdjson_key_value ] {
 
   - Parameters [4] {
     Parameter #0 [ <required> string $json ]