From 731e797dd8e2b15f1be8e46e7c33dc931cad3a1b Mon Sep 17 00:00:00 2001 From: Mike van Riel Date: Fri, 29 Jun 2012 23:04:12 +0200 Subject: [PATCH] Added 'global' to the list of special namespace names indicating global space and adding namespace resolution to the param tags 'getType()' method --- src/phpDocumentor/Reflection/DocBlock.php | 2 +- src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/phpDocumentor/Reflection/DocBlock.php b/src/phpDocumentor/Reflection/DocBlock.php index 00958ac..e09fdf1 100644 --- a/src/phpDocumentor/Reflection/DocBlock.php +++ b/src/phpDocumentor/Reflection/DocBlock.php @@ -330,7 +330,7 @@ class DocBlock implements \Reflector } $namespace = ''; - if ($this->namespace != 'default') { + if ($this->namespace != 'default' && $this->namespace != 'global') { $namespace = rtrim($this->namespace, '\\') . '\\'; } diff --git a/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php b/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php index 4be3254..8214534 100644 --- a/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php +++ b/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); } /**