Added psalm to static analyze tools

Author: norberttech

.phive/phars.xml

@@ -3,4 +3,5 @@
   <phar name="php-cs-fixer" version="^2.16.4" installed="2.16.4" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="phpstan" version="^0.12.32" installed="0.12.32" location="./tools/phpstan" copy="true"/>
   <phar name="roave/backwardcompatibilitycheck" version="^5.0.0" installed="5.0.0" location="./tools/roave-backward-compatibility-check" copy="true"/>
+  <phar name="psalm" version="^3.12.2" installed="3.12.2" location="./tools/psalm" copy="true"/>
 </phive>

composer.json

@@ -52,6 +52,7 @@
             "phpunit"
         ],
         "static:analyze": [
+            "tools/psalm",
             "tools/phpstan analyze -c phpstan.neon",
             "tools/php-cs-fixer fix --dry-run"
         ]

psalm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="5"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    cacheDirectory="var/psalm/cache"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Parser.php

@@ -76,9 +76,7 @@ private function getPattern() : AST\Pattern
                 break;
 
             default:
-                $this->unexpectedSyntaxError($this->lexer->lookahead, '@type@ pattern');
-
-                break;
+                throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, '@type@ pattern'));
         }
 
         $this->lexer->moveNext();
@@ -119,7 +117,7 @@ private function getNextExpanderNode() : ?AST\Expander
         }
 
         if (!$this->isNextCloseParenthesis()) {
-            $this->unexpectedSyntaxError($this->lexer->lookahead, ')');
+            throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, ')'));
         }
 
         return $expander;
@@ -128,9 +126,15 @@ private function getNextExpanderNode() : ?AST\Expander
     private function getExpanderName() : string
     {
         if ($this->lexer->lookahead['type'] !== Lexer::T_EXPANDER_NAME) {
-            $this->unexpectedSyntaxError($this->lexer->lookahead, '.expanderName(args) definition');
+            throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, '.expanderName(args) definition'));
         }
+
         $expander = $this->lexer->lookahead['value'];
+
+        if ($expander === null) {
+            throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, '.expanderName(args) definition'));
+        }
+
         $this->lexer->moveNext();
 
         return $expander;
@@ -152,7 +156,7 @@ private function addArgumentValues(AST\Expander $expander) : void
             $this->lexer->moveNext();
 
             if ($this->lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
-                $this->unexpectedSyntaxError($this->lexer->lookahead, 'string, number, boolean or null argument');
+                throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, 'string, number, boolean or null argument'));
             }
         }
     }
@@ -182,7 +186,7 @@ private function getNextArgumentValue()
         }
 
         if (!$this->lexer->isNextTokenAny($validArgumentTypes)) {
-            $this->unexpectedSyntaxError($this->lexer->lookahead, 'string, number, boolean or null argument');
+            throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, 'string, number, boolean or null argument'));
         }
 
         $tokenType = $this->lexer->lookahead['type'];
@@ -206,7 +210,7 @@ private function getArrayArgument() : array
         }
 
         if (!$this->lexer->isNextToken(Lexer::T_CLOSE_CURLY_BRACE)) {
-            $this->unexpectedSyntaxError($this->lexer->lookahead, '}');
+            throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, '}'));
         }
 
         $this->lexer->moveNext();
@@ -227,7 +231,7 @@ private function getNextArrayElement(array &$array)
         }
 
         if (!$this->lexer->isNextToken(Lexer::T_COLON)) {
-            $this->unexpectedSyntaxError($this->lexer->lookahead, ':');
+            throw PatternException::syntaxError($this->unexpectedSyntaxError($this->lexer->lookahead, ':'));
         }
 
         $this->lexer->moveNext();
@@ -258,17 +262,15 @@ private function isNextCloseParenthesis() : bool
     /**
      * @param array $unexpectedToken
      * @param string $expected
-     *
-     * @throws PatternException
      */
-    private function unexpectedSyntaxError(array $unexpectedToken, string $expected = null) : void
+    private function unexpectedSyntaxError(array $unexpectedToken, string $expected = null) : string
     {
         $tokenPos = (isset($unexpectedToken['position'])) ? $unexpectedToken['position'] : '-1';
         $message  = \sprintf('line 0, col %d: Error: ', $tokenPos);
         $message .= (isset($expected)) ? \sprintf('Expected "%s", got ', $expected) : 'Unexpected';
         $message .= \sprintf('"%s"', $unexpectedToken['value']);
 
-        throw PatternException::syntaxError($message);
+        return $message;
     }
 
     /**