Merge pull request #8000 from haberman/php-upb-update

[PHP] New version of upb, and a new hash function wyhash in third_party.
protocolbuffers · Nov 3, 2020 · 1dd4834 · 1dd4834
2 parents b5d2cc0 + 579aa89
commit 1dd4834
Show file tree

Hide file tree

Showing 13 changed files with 1,815 additions and 1,690 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -791,6 +791,7 @@ php_EXTRA_DIST=                                                       \
   php/ext/google/protobuf/wkt.inc                                     \
   php/generate_descriptor_protos.sh                                   \
   php/phpunit.xml                                                     \
+  php/prepare_c_extension.sh                                          \
   php/release.sh                                                      \
   php/src/GPBMetadata/Google/Protobuf/Any.php                         \
   php/src/GPBMetadata/Google/Protobuf/Api.php                         \
@@ -1391,6 +1392,8 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
   python/release/wheel/README.md         \
   third_party/six.BUILD                  \
   third_party/zlib.BUILD                 \
+  third_party/wyhash/LICENSE             \
+  third_party/wyhash/wyhash.h            \
   util/python/BUILD
 
 

diff --git a/conformance/Makefile.am b/conformance/Makefile.am
@@ -353,9 +353,6 @@ test_php: protoc_middleman conformance-test-runner conformance-php $(other_langu
 test_php_c: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs)
 	./conformance-test-runner --enforce_recommended --failure_list failure_list_php_c.txt --text_format_failure_list text_format_failure_list_php.txt ./conformance-php-c
 
-test_php_c_32: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs)
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_php_c_32.txt --text_format_failure_list text_format_failure_list_php.txt ./conformance-php-c
-
 # These depend on library paths being properly set up.  The easiest way to
 # run them is to just use "tox" from the python dir.
 test_python: protoc_middleman conformance-test-runner

diff --git a/conformance/failure_list_php_c.txt b/conformance/failure_list_php_c.txt
@@ -1,4 +1,2 @@
 Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Recommended.Proto3.JsonInput.NullValueInOtherOneofNewFormat.Validator
-Recommended.Proto3.JsonInput.NullValueInOtherOneofOldFormat.Validator
 Required.Proto2.JsonInput.StoresDefaultPrimitive.Validator
diff --git a/conformance/failure_list_php_c_32.txt b/conformance/failure_list_php_c_32.txt
diff --git a/php/ext/google/protobuf/config.m4 b/php/ext/google/protobuf/config.m4
@@ -5,6 +5,6 @@ if test "$PHP_PROTOBUF" != "no"; then
   PHP_NEW_EXTENSION(
     protobuf,
     arena.c array.c convert.c def.c map.c message.c names.c php-upb.c protobuf.c,
-    $ext_shared)
+    $ext_shared, , -std=gnu99)
 
 fi
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
@@ -45,6 +45,8 @@
     <file baseinstalldir="/" name="php-upb.h" role="src"/>
     <file baseinstalldir="/" name="protobuf.c" role="src"/>
     <file baseinstalldir="/" name="protobuf.h" role="src"/>
+    <file baseinstalldir="/" name="third_party/wyhash/wyhash.h" role="src"/>
+    <file baseinstalldir="/" name="third_party/wyhash/LICENSE" role="doc"/>
     <file baseinstalldir="/" name="LICENSE" role="doc"/>
   </dir>
  </contents>