Merge branch 'master' of github.com:phpDocumentor/ReflectionDocBlock

This commit is contained in:
Mike van Riel
2014-04-26 12:10:44 +02:00
3 changed files with 8 additions and 8 deletions
+2 -6
View File
@@ -209,20 +209,16 @@ class DocBlock implements \Reflector
);
}
foreach (explode("\n", $tags) as $tag_line) {
if (trim($tag_line) === '') {
continue;
}
if (isset($tag_line[0]) && ($tag_line[0] === '@')) {
$result[] = $tag_line;
} else {
$result[count($result) - 1] .= PHP_EOL . $tag_line;
$result[count($result) - 1] .= "\n" . $tag_line;
}
}
// create proper Tag objects
foreach ($result as $key => $tag_line) {
$result[$key] = Tag::createInstance($tag_line, $this);
$result[$key] = Tag::createInstance(trim($tag_line), $this);
}
}
@@ -56,7 +56,7 @@ class ExampleTag extends SourceTag
$filePath = '"' . $this->filePath . '"';
}
$this->content = $filePath . ' ' . $this->getContent();
$this->content = $filePath . ' ' . parent::getContent();
}
return $this->content;