Change behaviour of @param parsing

In issue report phpDocumentor/phpDocumentor#620 @bobef reported that when he
used just a Type as content of the @param that it would be recognized as
description instead of the Type.

According to the unit tests this is correct behaviour but after reviewing the
pattern of the output his version is more consistent. As such I have altered
the behaviour to act as following:

If only one word is found after an @param (word means white-space bounded
series of characters) then interpret that as the type and not description.

During this item several issues in unit tests were fixed and a new 'Type'
Collection was introduced that is capable of expanding types based on a given
namespace and series of aliases.
This should be re-used in phpDocumentor's Transformer as a duplication exists
there with the expanding of the Types.

Please note: the suggested format by @bobef is not valid according to the
PHPDoc Standard but is provided for convenience.

Author: mvriel

.gitignore

@@ -1 +1,2 @@
-.idea
+.idea
+vendor

composer.json

@@ -10,6 +10,6 @@
         "dflydev/markdown": "1.0.*"
     },
     "autoload": {
-        "psr-0": {"phpDocumentor\\Reflection": "src/"}
+        "psr-0": {"phpDocumentor": ["src/"]}
     }
 }

composer.lock

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<phpunit colors="true" strict="true">
+<phpunit colors="true" strict="true" bootstrap="vendor/autoload.php">
   <testsuites>
     <testsuite name="phpDocumentor\Reflection\DocBlock">
       <directory>./tests/</directory>

phpunit.xml.dist

@@ -327,7 +327,7 @@ public function expandType($type, $ignore_keywords = null)
             );
         }
 
-        $namespace = '';
+        $namespace = '\\';
         if ($this->namespace != 'default' && $this->namespace != 'global') {
             $namespace = rtrim($this->namespace, '\\') . '\\';
         }
@@ -398,4 +398,16 @@ public function __toString()
         return 'Not yet implemented';
     }
 
+    /**
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    public function getNamespaceAliases()
+    {
+        return $this->namespace_aliases;
+    }
 }

src/phpDocumentor/Reflection/DocBlock.php

@@ -23,7 +23,7 @@
 class ParamTag extends Tag
 {
     /** @var string */
-    protected $type = null;
+    protected $type = '';
 
     /**
      * @var string
@@ -33,7 +33,7 @@ class ParamTag extends Tag
     /**
      * Parses a tag and populates the member variables.
      *
-     * @param string $type    Tag identifier for this tag (should be 'return')
+     * @param string $type    Tag identifier for this tag (should be 'param')
      * @param string $content Contents for this tag.
      */
     public function __construct($type, $content)
@@ -42,13 +42,13 @@ public function __construct($type, $content)
         $this->content = $content;
         $content = preg_split('/\s+/u', $content);
 
-        // if there is only 1, it is either a piece of content or a variable name
-        if (count($content) > 1) {
+        // if the first item that is encountered is not a variable; it is a type
+        if (isset($content[0]) && (strlen($content[0]) > 0) && ($content[0][0] !== '$')) {
             $this->type = array_shift($content);
         }
 
         // if the next item starts with a $ it must be the variable name
-        if ((strlen($content[0]) > 0) && ($content[0][0] == '$')) {
+        if (isset($content[0]) && (strlen($content[0]) > 0) && ($content[0][0] == '$')) {
             $this->variableName = array_shift($content);
         }
 
@@ -62,14 +62,13 @@ public function __construct($type, $content)
      */
     public function getTypes()
     {
-        $types = explode('|', $this->type);
-        foreach ($types as &$type) {
-            $type = !empty($type) && $this->docblock
-                ? $this->docblock->expandType($type)
-                : trim($type);
-        }
+        $types = new \phpDocumentor\Reflection\DocBlock\Type\Collection(
+            array($this->type),
+            $this->docblock ? $this->docblock->getNamespace() : null,
+            $this->docblock ? $this->docblock->getNamespaceAliases() : array()
+        );
 
-        return array_values(array_unique($types, SORT_REGULAR));
+        return $types->getArrayCopy();
     }
 
     /**
@@ -79,7 +78,7 @@ public function getTypes()
      */
     public function getType()
     {
-        return $this->docblock->expandType($this->type);
+        return implode('|', $this->getTypes());
     }
 
     /**