Isolate bracket array item key extraction

Author: kylekatarnls

src/JsPhpize/Parser/BracketsArrayItemKey.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace JsPhpize\Parser;
+
+use JsPhpize\Lexer\Token;
+
+class BracketsArrayItemKey
+{
+    /**
+     * @var Token
+     */
+    protected $token;
+
+    /**
+     * @var array
+     */
+    protected $typeAndValue;
+
+    public function __construct(Token $token)
+    {
+        $this->token = $token;
+        $this->typeAndValue = $this->parseTypeAndValue();
+    }
+
+    protected function getStringExport($value)
+    {
+        return array('string', var_export($value, true));
+    }
+
+    protected function parseTypeAndValue()
+    {
+        $token = $this->token;
+
+        if ($token->is('keyword')) {
+            return $this->getStringExport($token->value);
+        }
+
+        if ($token->isValue()) {
+            $type = $token->type;
+            $value = $token->value;
+
+            if ($type === 'variable') {
+                return $this->getStringExport($value);
+            }
+
+            return array($token->type, $token->value);
+        }
+
+        return array(null, null);
+    }
+
+    public function isValid()
+    {
+        return !is_null($this->typeAndValue[0]);
+    }
+
+    public function get()
+    {
+        return $this->typeAndValue;
+    }
+}

src/JsPhpize/Parser/TokenExtractor.php

@@ -2,43 +2,19 @@
 
 namespace JsPhpize\Parser;
 
-use JsPhpize\Lexer\Token;
 use JsPhpize\Nodes\Assignation;
 use JsPhpize\Nodes\Constant;
 use JsPhpize\Nodes\Dyiade;
 use JsPhpize\Nodes\FunctionCall;
 
 abstract class TokenExtractor extends TokenCrawler
 {
-    protected function getStringExport($value)
-    {
-        return array('string', var_export($value, true));
-    }
-
-    protected function getTypeAndValueFromToken(Token $token)
-    {
-        if ($token->is('keyword')) {
-            return $this->getStringExport($token->value);
-        }
-
-        if ($token->isValue()) {
-            $type = $token->type;
-            $value = $token->value;
-
-            if ($type === 'variable') {
-                return $this->getStringExport($value);
-            }
-
-            return array($token->type, $token->value);
-        }
-
-        return array(null, null);
-    }
     protected function getBracketsArrayItemKeyFromToken($token)
     {
-        list($type, $value) = $this->getTypeAndValueFromToken($token);
+        $typeAndValue = new BracketsArrayItemKey($token);
 
-        if ($type) {
+        if ($typeAndValue->isValid()) {
+            list($type, $value) = $typeAndValue->get();
             $token = $this->next();
             if (!$token) {
                 throw new Exception('Missing value after ' . $value . $this->exceptionInfos(), 12);