Add explicit array checking for peeks, enhance the checks for variables.

Author: battye

README.md

@@ -3,7 +3,7 @@ A small library to parse text representations of a PHP array and return an actua
 
 ## Installation
 
-Run `composer install` to run this script (and tests) in a standalone way. Alternatively, this can be used as a dependency in another project by running `composer require battye/php-array-parser:1.0.4`.
+Run `composer install` to run this script (and tests) in a standalone way. Alternatively, this can be used as a dependency in another project by running `composer require battye/php-array-parser "~1.0"`.
 
 If you notice any bugs, please feel free to raise an issue or pull request.
 

src/parser.php

@@ -73,15 +73,22 @@ public function parse_value()
 		// Ignore values that rely on another variable
 		if (!$this->tokens->done())
 		{
-			if (count($this->tokens->peek()) > 1 && substr($this->tokens->peek()[1], 0, 1) === "$")
+			if (is_array($this->tokens->peek()) && count($this->tokens->peek()) > 1 && substr($this->tokens->peek()[1], 0, 1) === "$")
 			{
+				// If a variable is being used as a value then don't bother with this any more
+				$literalValue = self::NOT_STRING_LITERAL;
+
 				while (!$this->tokens->does_match(","))
 				{
+					if ($this->tokens->does_match(")"))
+					{
+						return $literalValue;
+					}
+
 					$this->tokens->pop(); // Ignore comments
 				}
 
-				// If a variable is being used as a value then don't bother with this any more
-				return self::NOT_STRING_LITERAL;
+				return $literalValue;
 			}
 		}
 
@@ -145,7 +152,7 @@ public function ignore_comments()
 		if (!$this->tokens->done())
 		{
 			// Check for both short and long form comment blocks
-			while (count($this->tokens->peek()) > 1 && $this->is_comment_block($this->tokens->peek()[1]))
+			while (is_array($this->tokens->peek()) && count($this->tokens->peek()) > 1 && $this->is_comment_block($this->tokens->peek()[1]))
 			{
 				$this->tokens->pop(); // Ignore comments
 			}

src/tokens.php

@@ -62,7 +62,7 @@ public function does_match($what)
 	{
 		$token = $this->peek();
 
-		if (is_string($what) && ! is_array($token) && $token === $what)
+		if (is_string($what) && !is_array($token) && $token === $what)
 		{
 			return true;
 		}

tests/ArrayParserTest.php

@@ -30,6 +30,30 @@ public function testCanParseSimpleString()
 		$this->assertArraySubset($expected_simple_output, $result);
 	}
 
+	/**
+	 * Test that variables can be picked up
+	 */
+	public function testCanDetectVariable()
+	{
+		// Put some variable names in there; test that we can have them in the start, middle or end
+		$string = "array(0 => array('one' => \$test, 'two' => \$test, 'three' => \$test));";
+
+		$tokens = new tokens($string);
+		$parser = new parser($tokens);
+		$result = $parser->parse_array();
+
+		// Expected output
+		$expected_simple_output = array(
+			0 => array(
+				'one' => parser::NOT_STRING_LITERAL,
+				'two' => parser::NOT_STRING_LITERAL,
+				'three' => parser::NOT_STRING_LITERAL,
+			)
+		);
+
+		$this->assertArraySubset($expected_simple_output, $result);
+	}
+
 	/**
 	 * Test that an event file is parsed correctly
 	 */