2 files changed, 5 insertions, 5 deletions
diff --git a/conformance/conformance_php.php b/conformance/conformance_php.php
index 69001971..20fb5082 100755
--- a/conformance/conformance_php.php
+++ b/conformance/conformance_php.php
@@ -46,7 +46,7 @@ function doTest($request)
     $response = new \Conformance\ConformanceResponse();
     if ($request->getPayload() == "protobuf_payload") {
       try {
-          $test_message->decode($request->getProtobufPayload());
+          $test_message->mergeFromString($request->getProtobufPayload());
       } catch (Exception $e) {
           $response->setParseError($e->getMessage());
           return $response;
@@ -65,7 +65,7 @@ function doTest($request)
     if ($request->getRequestedOutputFormat() == WireFormat::UNSPECIFIED) {
       trigger_error("Unspecified output format.", E_USER_ERROR);
     } elseif ($request->getRequestedOutputFormat() == WireFormat::PROTOBUF) {
-      $response->setProtobufPayload($test_message->encode());
+      $response->setProtobufPayload($test_message->serializeToString());
     } elseif ($request->getRequestedOutputFormat() == WireFormat::JSON) {
       $response->setJsonPayload($test_message->jsonEncode());
     }
@@ -89,11 +89,11 @@ function doTestIO()
     }
 
     $request = new \Conformance\ConformanceRequest();
-    $request->decode($serialized_request);
+    $request->mergeFromString($serialized_request);
 
     $response = doTest($request);
 
-    $serialized_response = $response->encode();
+    $serialized_response = $response->serializeToString();
     fwrite(STDOUT, pack("V", strlen($serialized_response)));
     fwrite(STDOUT, $serialized_response);
 
diff --git a/conformance/update_failure_list.py b/conformance/update_failure_list.py
index 69f210e3..63f453df 100755
--- a/conformance/update_failure_list.py
+++ b/conformance/update_failure_list.py
@@ -57,7 +57,7 @@ for remove_file in (args.remove_list or []):
   with open(remove_file) as f:
     for line in f:
       if line in add_set:
-        raise "Asked to both add and remove test: " + line
+        raise Exception("Asked to both add and remove test: " + line)
       remove_set.add(line.strip())
 
 add_list = sorted(add_set, reverse=True)