Fix variable indeces for array globals

phramework · Feb 10, 2016 · cc75783 · cc75783
1 parent 3a3f30f
commit cc75783
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/src/Expression.php b/src/Expression.php
@@ -55,7 +55,7 @@ class Expression
     /**
      * Regular expression pattern of array indices
      */
-    const PATTERN_ARRAY_INDEX = '[1-9]*[0-9]';
+    const PATTERN_ARRAY_INDEX = '[a-zA-Z][a-zA-Z0-9\-_]{1,}|[1-9]*[0-9]'; //[1-9]*[0-9]
 
     /**
      * Get prefix and suffix

diff --git a/tests/src/GlobalsTest.php b/tests/src/GlobalsTest.php
@@ -166,6 +166,45 @@ public function testGetVariableAsArgument2()
         $this->assertSame($echoVariable, $return);
     }
 
+    /**
+     * @depends testSetArray
+     * @covers Phramework\Testphase\Globals::get
+     */
+    public function testGetVariableAsIndex($array)
+    {
+        $variableIndex = '1';
+
+        Globals::set('variableIndex', $variableIndex);
+
+        $return = Globals::get(sprintf(
+            'array[%s]',
+            'variableIndex'
+        ));
+
+        $this->assertSame($array[$variableIndex], $return);
+
+        //literal integer
+        $return = Globals::get(sprintf(
+            'array[%s]',
+            2
+        ));
+
+        $this->assertSame($array[2], $return);
+    }
+
+    /**
+     * @covers Phramework\Testphase\Globals::get
+     * @expectedException \Exception
+     */
+    public function testGetVariableAsIndexFailure()
+    {
+        //literal
+        $return = Globals::get(sprintf(
+            'array["%s"]',
+            2
+        ));
+    }
+
     /**
      * @depends testSetArray
      * @params int[] $array