Merge pull request newrelic#27 from kneitinger/protobuf-php-8

Update vendor/protobuf to v3.13.0 for PHP 8 compilation compatibility
mfulb · Dec 15, 2020 · b649220 · b649220
2 parents 6226a63 + 6100134
commit b649220
Show file tree

Hide file tree

Showing 1,234 changed files with 211,873 additions and 56,386 deletions.
diff --git a/vendor/README.md b/vendor/README.md
@@ -42,7 +42,7 @@ If you see anything _other_ than these libraries, you should investigate.
 
 ### `protobuf`
 
-Version 3.11.4 of [the C++ protobuf
+Version 3.13.0 of [the C++ protobuf
 code](https://github.com/protocolbuffers/protobuf), as cloned from the repo.
 
 Two directories have been removed from the checkout to avoid build issues:

diff --git a/vendor/protobuf/.bazelignore b/vendor/protobuf/.bazelignore
@@ -0,0 +1,3 @@
+# These are fetched as external repositories.
+third_party/benchmark
+third_party/googletest
diff --git a/vendor/protobuf/.github/ISSUE_TEMPLATE/bug_report.md b/vendor/protobuf/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/vendor/protobuf/.github/ISSUE_TEMPLATE/feature_request.md b/vendor/protobuf/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/vendor/protobuf/.github/mergeable.yml b/vendor/protobuf/.github/mergeable.yml
diff --git a/vendor/protobuf/.gitignore b/vendor/protobuf/.gitignore
@@ -57,6 +57,7 @@ python/**/*.egg
 python/.eggs/
 python/.tox
 python/build/
+python/docs/_build/
 
 src/js_embed
 src/protoc
@@ -136,19 +137,24 @@ conformance/*.class
 
 # php test output
 composer.lock
+php/tests/.phpunit.result.cache
 php/tests/generated/
 php/tests/old_protoc
+php/tests/phpunit-9.phar
 php/tests/protobuf/
 php/tests/core
 php/tests/vgcore*
 php/tests/multirequest.result
 php/tests/nohup.out
+php/tests/.phpunit.result.cache
+php/tests/phpunit-*
 php/ext/google/protobuf/.libs/
 php/ext/google/protobuf/Makefile.fragments
 php/ext/google/protobuf/Makefile.global
 php/ext/google/protobuf/Makefile.objects
 php/ext/google/protobuf/acinclude.m4
 php/ext/google/protobuf/build/
+php/ext/google/protobuf/bundled_php.c
 php/ext/google/protobuf/config.h
 php/ext/google/protobuf/config.h.in~
 php/ext/google/protobuf/config.nice
@@ -208,3 +214,6 @@ cmake/cmake-build-debug/
 # IntelliJ
 .idea
 *.iml
+
+# BenchmarkDotNet
+BenchmarkDotNet.Artifacts/
diff --git a/vendor/protobuf/.readthedocs.yml b/vendor/protobuf/.readthedocs.yml
@@ -0,0 +1,22 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+sphinx:
+  configuration: python/docs/conf.py
+  fail_on_warning: false
+
+# Setup build requirements for docs.
+# Use conda so that we can install the latest libprotobuf package without
+# having to build from scratch just for docs builds.
+conda:
+  environment: python/docs/environment.yml
+
+python:
+  version: 3.7
+  install:
+    - method: setuptools
+      path: python