Merge branch 'develop'

yosymfony · May 3, 2014 · b2b20ec · b2b20ec
2 parents 716fe10 + 4b5240d
commit b2b20ec
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/Yosymfony/Toml/Exception/ParseException.php b/src/Yosymfony/Toml/Exception/ParseException.php
@@ -35,7 +35,7 @@ class ParseException extends RuntimeException
      * @param string    $parsedFile The file name where the error occurred
      * @param Exception $previous   The previous exception
      */
-    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, Exception $previous = null)
+    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
     {
         $this->parsedFile = $parsedFile;
         $this->parsedLine = $parsedLine;

diff --git a/src/Yosymfony/Toml/Lexer.php b/src/Yosymfony/Toml/Lexer.php
@@ -56,7 +56,6 @@ class Lexer
     private $currentToken;
     private $backToken;
     private $inputLength = 0;
-    private $snippet = '';
 
     private $beginQuoteOpen = false;
     private $endQuoteOpen = false;

diff --git a/src/Yosymfony/Toml/Parser.php b/src/Yosymfony/Toml/Parser.php
@@ -22,7 +22,6 @@ class Parser
 {
     private $lexer = null;
     private $currentLine = 0;
-    private $currentToken = null;
     private $data = null;
     private $result = array();
     private $tableNames = array();

diff --git a/src/Yosymfony/Toml/TomlBuilder.php b/src/Yosymfony/Toml/TomlBuilder.php
@@ -314,7 +314,7 @@ private function addKey($key)
         $this->addKeyToKeyList($absKey);
     }
 
-    private function addKeyTable($key, array $keyParts)
+    private function addKeyTable($key)
     {
         if(in_array($key, $this->keyListArryOfTables))
         {
@@ -354,12 +354,12 @@ private function addKeyArrayOfTables($key, array $keyParts)
             $this->keyListArryOfTables[$key] = $counter + 1;
         }
 
-        $keyPath = $this->getArrayTablesKeyPath($key, $keyParts);
+        $keyPath = $this->getArrayTablesKeyPath($keyParts);
         $this->addKeyToKeyList($keyPath);
         $this->currentArrayOfTables = $keyPath;
     }
 
-    private function getArrayTablesKeyPath($key, array $keyParts)
+    private function getArrayTablesKeyPath(array $keyParts)
     {
         $path = $simplePath = '';