Merge pull request #221 from kmfk/documentation-in-handler

Modify the `documentation` property inside annotation handlers
This commit is contained in:
William Durand 2013-09-12 01:51:49 -07:00
commit c2d36d9ef0
2 changed files with 12 additions and 4 deletions

View File

@ -279,6 +279,14 @@ class ApiDoc
$this->documentation = $documentation;
}
/**
* @return string
*/
public function getDocumentation()
{
return $this->documentation;
}
/**
* @return Boolean
*/

View File

@ -240,6 +240,9 @@ class ApiDocExtractor
// create a new annotation
$annotation = clone $annotation;
// doc
$annotation->setDocumentation($this->commentExtractor->getDocCommentText($method));
// parse annotations
$this->parseAnnotations($annotation, $route, $method);
@ -248,7 +251,7 @@ class ApiDocExtractor
// description
if (null === $annotation->getDescription()) {
$comments = explode("\n", $this->commentExtractor->getDocCommentText($method));
$comments = explode("\n", $annotation->getDocumentation());
// just set the first line
$comment = trim($comments[0]);
$comment = preg_replace("#\n+#", ' ', $comment);
@ -260,9 +263,6 @@ class ApiDocExtractor
}
}
// doc
$annotation->setDocumentation($this->commentExtractor->getDocCommentText($method));
// input (populates 'parameters' for the formatters)
if (null !== $input = $annotation->getInput()) {
$parameters = array();