Merge branch 'cs/part2-variable-renaming' of https://github.com/arse/zf2

src/Decoder.php

@@ -73,6 +73,11 @@ class Decoder
      */
     protected $decodeType;
 
+    /**
+     * @var $_tokenValue
+     */
+    protected $tokenValue;
+
     /**
      * Constructor
      *
@@ -143,7 +148,7 @@ protected function _decodeValue()
     {
         switch ($this->token) {
             case self::DATUM:
-                $result  = $this->_tokenValue;
+                $result  = $this->tokenValue;
                 $this->_getNextToken();
                 return($result);
                 break;
@@ -180,11 +185,11 @@ protected function _decodeObject()
         $tok = $this->_getNextToken();
 
         while ($tok && $tok != self::RBRACE) {
-            if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
+            if ($tok != self::DATUM || ! is_string($this->tokenValue)) {
                 throw new RuntimeException('Missing key in object encoding: ' . $this->source);
             }
 
-            $key = $this->_tokenValue;
+            $key = $this->tokenValue;
             $tok = $this->_getNextToken();
 
             if ($tok != self::COLON) {
@@ -288,7 +293,7 @@ protected function _eatWhitespace()
     protected function _getNextToken()
     {
         $this->token      = self::EOF;
-        $this->_tokenValue = null;
+        $this->tokenValue = null;
         $this->_eatWhitespace();
 
         if ($this->offset >= $this->sourceLength) {
@@ -374,28 +379,28 @@ protected function _getNextToken()
                 } while ($i < $str_length);
 
                 $this->token = self::DATUM;
-                //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
-                $this->_tokenValue = $result;
+                //$this->tokenValue = substr($str, $start + 1, $i - $start - 1);
+                $this->tokenValue = $result;
                 break;
             case 't':
                 if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
                     $this->token = self::DATUM;
                 }
-                $this->_tokenValue = true;
+                $this->tokenValue = true;
                 $i += 3;
                 break;
             case 'f':
                 if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
                     $this->token = self::DATUM;
                 }
-                $this->_tokenValue = false;
+                $this->tokenValue = false;
                 $i += 4;
                 break;
             case 'n':
                 if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
                     $this->token = self::DATUM;
                 }
-                $this->_tokenValue = NULL;
+                $this->tokenValue = NULL;
                 $i += 3;
                 break;
         }
@@ -418,7 +423,7 @@ protected function _getNextToken()
                     } else {
                         $val  = intval($datum);
                         $fVal = floatval($datum);
-                        $this->_tokenValue = ($val == $fVal ? $val : $fVal);
+                        $this->tokenValue = ($val == $fVal ? $val : $fVal);
                     }
                 } else {
                     throw new RuntimeException("Illegal number format: {$datum}");

src/Server/Response.php

@@ -49,6 +49,11 @@ class Response
      */
     protected $version;
 
+    /**
+     * @var $args
+     */
+    protected $args;
+
     /**
      * Set response state
      *
@@ -225,7 +230,7 @@ public function toJson()
      */
     public function getArgs()
     {
-        return $this->_args;
+        return $this->args;
     }
 
     /**
@@ -236,7 +241,7 @@ public function getArgs()
      */
     public function setArgs($args)
     {
-        $this->_args = $args;
+        $this->args = $args;
         return $this;
     }