Skip to content
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

Jump to bottom

[PHP] New version of upb, and a new hash function wyhash in third_party. #8000

Merged
merged 7 commits into from Nov 3, 2020
Merged

[PHP] New version of upb, and a new hash function wyhash in third_party. #8000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6985e5
New version of upb, and a new hash function wyhash in third_party.
haberman Nov 2, 2020
f65bcca
Added extra files to Makefile.am and fixed spelling errors.
haberman Nov 2, 2020
78f56b8
Set -std=gnu99 for PHP extension compile.
haberman Nov 2, 2020
6e19526
PHP: Removed previously failing tests from the failure list.
haberman Nov 2, 2020
f5ab3b1
PHP: Removed 32-bit-specific PHP failure list.
haberman Nov 2, 2020
314ce3c
PHP: Fix in upb for 32-bit platforms.
haberman Nov 3, 2020
579aa89
Updated wyhash.h to pick up fix for spelling mistake.
haberman Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile.am
View file
Open in desktop
Expand Up @@ -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 \
Expand Down Expand Up @@ -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


Expand Down
3 changes: 0 additions & 3 deletions conformance/Makefile.am
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions conformance/failure_list_php_c.txt
View file
Open in desktop
@@ -1,4 +1,2 @@
Recommended.Proto2.JsonInput.FieldNameExtension.Validator
Recommended.Proto3.JsonInput.NullValueInOtherOneofNewFormat.Validator
Recommended.Proto3.JsonInput.NullValueInOtherOneofOldFormat.Validator
Required.Proto2.JsonInput.StoresDefaultPrimitive.Validator
4 changes: 0 additions & 4 deletions conformance/failure_list_php_c_32.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion php/ext/google/protobuf/config.m4
View file
Open in desktop
Expand Up @@ -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
2 changes: 2 additions & 0 deletions php/ext/google/protobuf/package.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down