move some logic into private methods in order to do closer type checking

Author: ashnazg

src/TypeResolver.php

@@ -398,10 +398,10 @@ private function resolveTypedObject($type, Context $context = null)
      *
      * @param \ArrayIterator $tokens
      * @param Type $classType
-     * @param Context|null $context
+     * @param Context $context
      * @return Array_|Collection
      */
-    private function resolveCollection(\ArrayIterator $tokens, Type $classType, Context $context = null) {
+    private function resolveCollection(\ArrayIterator $tokens, Type $classType, Context $context) {
 
         $isArray = ('array' == (string) $classType);
 
@@ -419,7 +419,7 @@ private function resolveCollection(\ArrayIterator $tokens, Type $classType, Cont
         $keyType = null;
 
         if ($tokens->current() == ',') {
-            // if we have a coma, then we just parsed the key type, not the value type
+            // if we have a comma, then we just parsed the key type, not the value type
             $keyType = $valueType;
             if ($isArray) {
                 // check the key type for an "array" collection. We allow only
@@ -463,8 +463,20 @@ private function resolveCollection(\ArrayIterator $tokens, Type $classType, Cont
         if ($isArray) {
             return new Array_($valueType, $keyType);
         }
-        else {
-            return new Collection($classType->getFqsen(), $valueType, $keyType);
+
+        if ($classType instanceof Object_) {
+            return $this->makeCollectionFromObject($classType, $valueType, $keyType);
         }
     }
+
+    /**
+     * @param Object_ $object
+     * @param Type $valueType
+     * @param Type|null $keyType
+     * @return Collection
+     */
+    private function makeCollectionFromObject(Object_ $object, Type $valueType, Type $keyType = null)
+    {
+        return new Collection($object->getFqsen(), $valueType, $keyType);
+    }
 }

src/Types/Collection.php

@@ -29,16 +29,17 @@
 final class Collection extends AbstractList
 {
 
-    /** @var Fqsen */
+    /** @var Fqsen|null */
     private $fqsen;
 
     /**
      * Initializes this representation of an array with the given Type or Fqsen.
      *
+     * @param \phpDocumentor\Reflection\Fqsen|null $fqsen
      * @param Type $valueType
      * @param Type $keyType
      */
-    public function __construct(Fqsen $fqsen, Type $valueType, Type $keyType = null)
+    public function __construct(Fqsen $fqsen = null, Type $valueType, Type $keyType = null)
     {
         parent::__construct($valueType, $keyType);
 
@@ -48,7 +49,7 @@ public function __construct(Fqsen $fqsen, Type $valueType, Type $keyType = null)
     /**
      * Returns the FQSEN associated with this object.
      *
-     * @return Fqsen
+     * @return Fqsen|null
      */
     public function getFqsen()
     {

src/Types/Context.php

@@ -44,7 +44,7 @@ final class Context
     public function __construct($namespace, array $namespaceAliases = [])
     {
         $this->namespace = ('global' !== $namespace && 'default' !== $namespace)
-            ? trim((string)$namespace, '\\')
+            ? trim($namespace, '\\')
             : '';
 
         foreach ($namespaceAliases as $alias => $fqnn) {

src/Types/ContextFactory.php

@@ -40,12 +40,32 @@ final class ContextFactory
      */
     public function createFromReflector(\Reflector $reflector)
     {
-        if (method_exists($reflector, 'getDeclaringClass')) {
-            $reflector = $reflector->getDeclaringClass();
+        if ($reflector instanceof \ReflectionMethod) {
+            return $this->createFromReflectionMethod($reflector);
         }
 
-        $fileName = $reflector->getFileName();
-        $namespace = $reflector->getNamespaceName();
+        if ($reflector instanceof \ReflectionClass) {
+            return $this->createFromReflectionClass($reflector);
+        }
+    }
+
+    /**
+     * @param \ReflectionMethod $method
+     * @return Context
+     */
+    private function createFromReflectionMethod(\ReflectionMethod $method)
+    {
+        return $this->createFromReflectionClass($method->getDeclaringClass());
+    }
+
+    /**
+     * @param \ReflectionClass $class
+     * @return Context
+     */
+    private function createFromReflectionClass(\ReflectionClass $class)
+    {
+        $fileName = $class->getFileName();
+        $namespace = $class->getNamespaceName();
 
         if (is_string($fileName) && file_exists($fileName)) {
             return $this->createForNamespace($namespace, file_get_contents($fileName));
@@ -177,7 +197,7 @@ private function skipToNextStringOrNamespaceSeparator(\ArrayIterator $tokens)
      *
      * @param \ArrayIterator $tokens
      *
-     * @return string
+     * @return array
      */
     private function extractUseStatement(\ArrayIterator $tokens)
     {