Thrift: Fix new-style generated PHP code.

Summary:
Fix reading of lists/sets of lists/sets/maps.

Reviewed By: mcslee

Test Plan: Tested in trunk.

Revert Plan: ok

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665333 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/php/src/Thrift.php b/lib/php/src/Thrift.php
index a47f4aa..fdec97f 100644 (file)
--- a/lib/php/src/Thrift.php
+++ b/lib/php/src/Thrift.php
@@ -175,13 +175,13 @@ class TException extends Exception {
           $xfer += $elem->read($input);
           break;
         case TType::MAP:
-          $xfer += $this->_readMap($key, $espec, $input);
+          $xfer += $this->_readMap($elem, $espec, $input);
           break;
         case TType::LST:
-          $xfer += $this->_readList($key, $espec, $input, false);
+          $xfer += $this->_readList($elem, $espec, $input, false);
           break;
         case TType::SET:
-          $xfer += $this->_readList($key, $espec, $input, true);
+          $xfer += $this->_readList($elem, $espec, $input, true);
           break;
         }
       }
@@ -457,13 +457,13 @@ abstract class TBase {
           $xfer += $key->read($input);
           break;
         case TType::MAP:
-          $xfer += $this->_readMap($key, $kspec, $input);
+          $xfer += $this->_readMap($elem, $kspec, $input);
           break;
         case TType::LST:
-          $xfer += $this->_readList($key, $kspec, $input, false);
+          $xfer += $this->_readList($elem, $kspec, $input, false);
           break;
         case TType::SET:
-          $xfer += $this->_readList($key, $kspec, $input, true);
+          $xfer += $this->_readList($elem, $kspec, $input, true);
           break;
         }
       }