commit cecba296b8c49b9dca789a9dc24e01c6c3cfa98f
author Paul Yang <TeBoring@users.noreply.github.com> Fri Dec 14 16:05:03 2018 -0800
committer GitHub <noreply@github.com> Fri Dec 14 16:05:03 2018 -0800
tree 03d968ae55f51bc3ba22c0a2042dceb6d0687d4d
parent f93cf5a3cf8e9b60b6619e17a5d43106fd9c3a71

Down-integrate internal changes (#5467)

* Down-integrate internal changes

* Update generated code for php, objc and csharp.

* Add missing dependency in conformance_php

conformance/conformance_php.php

diff --git a/conformance/conformance_php.php b/conformance/conformance_php.php
index 799cc3e..cc6d4b9 100755
--- a/conformance/conformance_php.php
+++ b/conformance/conformance_php.php
@@ -3,6 +3,7 @@
 require_once("Conformance/WireFormat.php");
 require_once("Conformance/ConformanceResponse.php");
 require_once("Conformance/ConformanceRequest.php");
+require_once("Conformance/JspbEncodingConfig.php");
 require_once("Conformance/TestCategory.php");
 require_once("Protobuf_test_messages/Proto3/ForeignMessage.php");
 require_once("Protobuf_test_messages/Proto3/ForeignEnum.php");