catching more invalid syntax conditions,

fixing exception inheritance
deceze · Oct 22, 2012 · bbad773 · bbad773
1 parent 4a3e500
commit bbad773
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Rison/RisonDecoder.php b/Rison/RisonDecoder.php
@@ -49,7 +49,11 @@ protected function init() {
     }
 
     public function decode() {
-        return $this->parseValue();
+        $value = $this->parseValue();
+        if ($this->next() !== false) {
+            $this->parseError('Invalid syntax');
+        }
+        return $value;
     }
 
     protected function parseValue() {
@@ -221,7 +225,7 @@ protected function next() {
         do {
             if ($this->index >= $this->length) {
                 $this->eof = true;
-                return;
+                return false;
             }
             $c = $this->rison[$this->index++];
         } while (strpos($this->whitespace, $c) !== false);

diff --git a/Rison/RisonParseErrorException.php b/Rison/RisonParseErrorException.php
@@ -7,7 +7,7 @@ class RisonParseErrorException extends \RuntimeException {
 
     protected $rison;
 
-    public function __construct($rison, $message, $code = 0, Exception $previous = null) {
+    public function __construct($rison, $message, $code = 0, \Exception $previous = null) {
         $this->rison = $rison;
         parent::__construct($message, $code, $previous);
     }

diff --git a/readme.md b/readme.md
@@ -37,7 +37,7 @@ Usage
 Information
 -----------
 
-Version: 0.9  
+Version: 0.91  
 Author:  David Zentgraf  
 Contact: rison@kunststube.net  
 License: Public Domain
diff --git a/tests/Rison/RisonDecoderTest.php b/tests/Rison/RisonDecoderTest.php
@@ -279,4 +279,11 @@ public function testAllTypesNested() {
 		$this->assertEquals(json_decode($json, true), R\rison_decode($rison));
 	}
 
+	/**
+	 * @expectedException Kunststube\Rison\RisonParseErrorException
+	 */
+	public function textTwoLiterals() {
+		R\rison_decode('foo bar');
+	}
+
 }