commit 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3
author Feng Xiao <xfxyjwf@gmail.com> Wed Aug 08 17:00:41 2018 -0700
committer Feng Xiao <xfxyjwf@gmail.com> Wed Aug 08 17:00:41 2018 -0700
tree e575738adf52d24b883cca5e8928a5ded31caba1
parent e7746f487cb9cca685ffb1b3d7dccc5554b618a4

Down-integrate from google3.

conformance/conformance_php.php

diff --git a/conformance/conformance_php.php b/conformance/conformance_php.php
index 65483e2..799cc3e 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/TestCategory.php");
 require_once("Protobuf_test_messages/Proto3/ForeignMessage.php");
 require_once("Protobuf_test_messages/Proto3/ForeignEnum.php");
 require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3.php");
@@ -12,6 +13,7 @@
 require_once("GPBMetadata/Conformance.php");
 require_once("GPBMetadata/Google/Protobuf/TestMessagesProto3.php");
 
+use  \Conformance\TestCategory;
 use  \Conformance\WireFormat;
 
 if (!ini_get("date.timezone")) {
@@ -39,7 +41,9 @@
         trigger_error("Protobuf request doesn't have specific payload type", E_USER_ERROR);
       }
     } elseif ($request->getPayload() == "json_payload") {
-      $ignore_json_unknown = $request->getIgnoreUnknownJson();
+      $ignore_json_unknown =
+          ($request->getTestCategory() ==
+              TestCategory::JSON_IGNORE_UNKNOWN_PARSING_TEST);
       try {
           $test_message->mergeFromJsonString($request->getJsonPayload(),
                                              $ignore_json_unknown);