phpstan update and fixes

Author: ashnazg

phive.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^6.5.5" installed="6.5.5" location="./tools/phpunit"/>
-  <phar name="phpstan" version="^0.9.1" installed="0.9.1" location="./tools/phpstan"/>
+  <phar name="phpunit" version="^6.5.5" installed="6.5.11" location="./tools/phpunit"/>
+  <phar name="phpstan" version="^0.9.1" installed="0.10.2" location="./tools/phpstan"/>
 </phive>

src/FqsenResolver.php

@@ -50,7 +50,7 @@ private function isFqsen($type)
      *
      * @param string $type
      * @return Fqsen
-     * @throws InvalidArgumentException when type is not a valid FQSEN.
+     * @throws \InvalidArgumentException when type is not a valid FQSEN.
      */
     private function resolvePartialStructuralElementName($type, Context $context)
     {

src/TypeResolver.php

@@ -116,6 +116,9 @@ public function resolve($type, Context $context = null)
 
         // split the type string into tokens `|`, `?`, `(`, `)[]`, '<', '>' and type names
         $tokens = preg_split('/(\\||\\?|<|>|,|\\(|\\)(?:\\[\\])+)/', $type, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        if (false === $tokens) {
+            throw new \InvalidArgumentException('Unable to split the type string "' . $type . '" into tokens');
+        }
         $tokenIterator = new \ArrayIterator($tokens);
 
         return $this->parseTypes($tokenIterator, $context, self::PARSER_IN_COMPOUND);
@@ -193,8 +196,9 @@ private function parseTypes(\ArrayIterator $tokens, Context $context, $parserCon
                 }
 
                 $classType = array_pop($types);
-
-                $types[] = $this->resolveCollection($tokens, $classType, $context);
+                if ($classType) {
+                    $types[] = $this->resolveCollection($tokens, $classType, $context);
+                }
 
                 $tokens->next();
             } elseif ($parserContext === self::PARSER_IN_COLLECTION_EXPRESSION

src/Types/ContextFactory.php

@@ -63,7 +63,10 @@ public function createFromReflector(\Reflector $reflector): Context
 
     private function createFromReflectionParameter(\ReflectionParameter $parameter): Context
     {
-        return $this->createFromReflectionClass($parameter->getDeclaringClass());
+        $class = $parameter->getDeclaringClass();
+        if ($class) {
+            return $this->createFromReflectionClass($class);
+        }
     }
 
     private function createFromReflectionMethod(\ReflectionMethod $method): Context
@@ -87,7 +90,11 @@ private function createFromReflectionClass(\ReflectionClass $class): Context
         $namespace = $class->getNamespaceName();
 
         if (is_string($fileName) && file_exists($fileName)) {
-            return $this->createForNamespace($namespace, file_get_contents($fileName));
+            $contents = file_get_contents($fileName);
+            if (false === $contents) {
+                throw new \RuntimeException('Unable to read file "' . $fileName . '"');
+            }
+            return $this->createForNamespace($namespace, $contents);
         }
 
         return new Context($namespace, []);

src/Types/Object_.php

@@ -30,7 +30,7 @@ final class Object_ implements Type
     /**
      * Initializes this object with an optional FQSEN, if not provided this object is considered 'untyped'.
      *
-     * @throws InvalidArgumentException when provided $fqsen is not a valid type.
+     * @throws \InvalidArgumentException when provided $fqsen is not a valid type.
      */
     public function __construct(Fqsen $fqsen = null)
     {