mirrors/barryvdh_ReflectionDocBlock
1
0
Fork 0
mirror of https://github.com/barryvdh/ReflectionDocBlock.git synced 2026-08-18 01:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved the type separation into ReturnTag, for consistency with the type merging that is currently there.

Browse Source
This commit is contained in:
Vasil Rangelov
2012-11-16 21:43:25 +02:00
parent cdaa97eb31
commit db20ae39fb
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php
+1 -1
View File
@@ -53,7 +53,7 @@ class ReturnTag extends Tag
public function getTypes()
{
$types = new \phpDocumentor\Reflection\DocBlock\Type\Collection(
array($this->type),
explode('|', $this->type),
$this->docblock ? $this->docblock->getNamespace() : null,
$this->docblock ? $this->docblock->getNamespaceAliases() : array()
);
src/phpDocumentor/Reflection/DocBlock/Type/Collection.php
+3 -11
View File
@@ -22,9 +22,6 @@ namespace phpDocumentor\Reflection\DocBlock\Type;
*/
class Collection extends \ArrayObject
{
/** @var string Definition of the OR operator for types */
const OPERATOR_OR = '|';
/** @var string Definition of the ARRAY operator for types */
const OPERATOR_ARRAY = '[]';
@@ -167,14 +164,9 @@ class Collection extends \ArrayObject
.var_export($type, true)
);
}
// separate the type by the OR operator
$type_parts = explode(self::OPERATOR_OR, $type);
foreach ($type_parts as $part) {
$expanded_type = $this->expand($part);
if ($expanded_type) {
$this[] = $expanded_type;
}
$expanded_type = $this->expand($type);
if ($expanded_type) {
$this[] = $expanded_type;
}
}