Multiline @return statements were stripped from their newlines and indent

@return statements (and effectively others) were stripped from their newlines
and indentation. By tweaking the reflection a bit was this effect countered.

src/phpDocumentor/Reflection/DocBlock.php

@@ -99,7 +99,7 @@ class DocBlock implements \Reflector
     {
         $comment = trim(
             preg_replace(
-                '#[ \t]*(?:\/\*\*|\*\/|\*)?[ \t]{0,1}(.*)?#', '$1', $comment
+                '#[ \t]*(?:\/\*\*|\*\/|\*)?[ \t]{0,1}(.*)?#u', '$1', $comment
             )
         );
 
@@ -133,7 +133,7 @@ class DocBlock implements \Reflector
         } else {
             // clears all extra horizontal whitespace from the line endings
             // to prevent parsing issues
-            $comment = preg_replace('~(?m)\h*$~', '', $comment);
+            $comment = preg_replace('~(?m)\h*$~u', '', $comment);
 
             /*
              * Splits the docblock into a short description, long description and
@@ -173,7 +173,7 @@ class DocBlock implements \Reflector
           )
         )?
         (\s+ [\s\S]*)? # everything that follows
-        /', $comment, $matches
+        /u', $comment, $matches
             );
             array_shift($matches);
         }
@@ -199,8 +199,6 @@ class DocBlock implements \Reflector
                 continue;
             }
 
-            $tag_line = ltrim($tag_line);
-
             if (isset($tag_line[0]) && ($tag_line[0] === '@')) {
                 $result[] = $tag_line;
             } else {
@@ -325,12 +323,12 @@ class DocBlock implements \Reflector
             $ignore_keywords = array(
                 'string', 'int', 'integer', 'bool', 'boolean', 'float', 'double',
                 'object', 'mixed', 'array', 'resource', 'void', 'null',
-                'callback', 'false', 'true'
+                'callback', 'false', 'true', 'self', '$this', 'callable'
             );
         }
 
         $namespace = '';
-        if ($this->namespace != 'default') {
+        if ($this->namespace != 'default' && $this->namespace != 'global') {
             $namespace = rtrim($this->namespace, '\\') . '\\';
         }
 
@@ -350,21 +348,12 @@ class DocBlock implements \Reflector
             ) {
                 $type_parts = explode('\\', $item);
 
-                // if the first part is the keyword 'namespace', replace it
-                // with the current namespace
-                if ($type_parts[0] == 'namespace') {
-                    $type_parts[0] = $this->getNamespace();
-                    $item = implode('\\', $type_parts);
-                }
-
                 // if the first segment is an alias; replace with full name
                 if (isset($this->namespace_aliases[$type_parts[0]])) {
                     $type_parts[0] = $this->namespace_aliases[$type_parts[0]];
-
                     $item = implode('\\', $type_parts);
-                } elseif (count($type_parts) == 1) {
+                } else {
-                    // prefix the item with the namespace if there is only one
+                    // otherwise prepend the current namespace
-                    // part and no alias
                     $item = $namespace . $item;
                 }
             }

src/phpDocumentor/Reflection/DocBlock/LongDescription.php

@@ -35,7 +35,7 @@ class LongDescription implements \Reflector
      */
     public function __construct($content)
     {
-        if (preg_match('/\{\@(.+?)\}/', $content, $matches)) {
+        if (preg_match('/\{\@(.+?)\}/u', $content, $matches)) {
             array_shift($matches);
             foreach ($matches as $tag) {
                 $this->tags[] = Tag::createInstance('@' . $tag);
@@ -78,7 +78,7 @@ class LongDescription implements \Reflector
             );
         }
 
-        if (class_exists('\dflydev\markdown\MarkdownExtraParser')) {
+        if (class_exists('dflydev\markdown\MarkdownExtraParser')) {
             $md = new \dflydev\markdown\MarkdownExtraParser();
             $result = $md->transformMarkdown($result);
         }

src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php

@@ -79,7 +79,7 @@ class ParamTag extends Tag
      */
     public function getType()
     {
-        return $this->type;
+        return $this->docblock->expandType($this->type);
     }
 
     /**

src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php

@@ -34,7 +34,8 @@ class ReturnTag extends ParamTag
     {
         $this->tag = $type;
         $this->content = $content;
-        $content = preg_split('/\s+/u', $content);
+
+        $content = preg_split('/[\ \t]+/u', $content, 2);
 
         // any output is considered a type
         $this->type = array_shift($content);