Keep explicit throw for unexpected token exception

Author: kylekatarnls

src/JsPhpize/Parser/Parser.php

@@ -93,15 +93,15 @@ protected function parseParentheses()
 
                     continue;
                 }
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             if ($value = $this->getValueFromToken($token)) {
                 $expectComma = true;
                 $parentheses->addNode($value);
 
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         throw new Exception('Missing ) to match ' . $exceptionInfos, 5);
@@ -122,15 +122,15 @@ protected function parseHooksArray()
 
                     continue;
                 }
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             if ($value = $this->getValueFromToken($token)) {
                 $expectComma = true;
                 $array->addItem($value);
 
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         throw new Exception('Missing ] to match ' . $exceptionInfos, 6);
@@ -151,7 +151,7 @@ protected function parseBracketsArray()
 
                     continue;
                 }
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             if ($pair = $this->getBracketsArrayItemKeyFromToken($token)) {
                 list($key, $value) = $pair;
@@ -160,7 +160,7 @@ protected function parseBracketsArray()
 
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         throw new Exception('Missing } to match ' . $exceptionInfos, 7);
@@ -237,13 +237,13 @@ protected function parseFunction($token)
             $token = $this->get(0);
         }
         if (!$token->is('(')) {
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
         $this->skip();
         $function->setValue($this->parseParentheses());
         $token = $this->get(0);
         if (!$token->is('{')) {
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
         $this->skip();
         $this->parseBlock($function);
@@ -291,7 +291,7 @@ protected function parseLet($token)
     {
         $letVariable = $this->get(0);
         if (!$letVariable->is('variable')) {
-            $this->unexpected($letVariable, $token);
+            throw $this->unexpected($letVariable, $token);
         }
 
         return $letVariable->value;
@@ -319,7 +319,7 @@ protected function parseInstructions($block)
                 $block->endInstruction();
                 continue;
             }
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
     }
 

src/JsPhpize/Parser/TokenCrawler.php

@@ -37,6 +37,6 @@ protected function exceptionInfos()
 
     protected function unexpected($token)
     {
-        throw new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);
+        return new Exception('Unexpected ' . $token->type . rtrim(' ' . ($token->value ?: '')) . $this->exceptionInfos(), 8);
     }
 }

src/JsPhpize/Parser/TokenExtractor.php

@@ -31,7 +31,7 @@ protected function getBracketsArrayItemKeyFromToken($token)
                 throw new Exception('Missing value after ' . $value . $this->exceptionInfos(), 12);
             }
             if (!$token->is(':')) {
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             $key = new Constant($type, $value);
             $value = $this->expectValue($this->next());
@@ -50,7 +50,7 @@ protected function getVariableChildFromToken($token)
                 return new Constant('string', var_export($token->value, true));
             }
 
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
 
         if ($token->is('[')) {
@@ -68,7 +68,7 @@ protected function getVariableChildFromToken($token)
                 return $value;
             }
 
-            $this->unexpected($token);
+            throw $this->unexpected($token);
         }
     }
 
@@ -145,7 +145,7 @@ protected function appendFunctionsCalls(&$value)
     {
         while ($token = $this->get(0)) {
             if ($token->is('{') || $token->expectNoLeftMember()) {
-                $this->unexpected($this->next());
+                throw $this->unexpected($this->next());
             }
             if ($token->is('?')) {
                 $this->skip();
@@ -191,13 +191,13 @@ protected function expectValue($next, $token = null)
     {
         if (!$next) {
             if ($token) {
-                $this->unexpected($token);
+                throw $this->unexpected($token);
             }
             throw new Exception('Value expected after ' . $this->exceptionInfos(), 20);
         }
         $value = $this->getValueFromToken($next);
         if (!$value) {
-            $this->unexpected($next);
+            throw $this->unexpected($next);
         }
 
         return $value;