Merge pull request #228 from vincentchalamon/master

Fix #226
This commit is contained in:
William Durand 2013-08-16 17:10:44 -07:00
commit 6455a8669d
4 changed files with 25 additions and 2 deletions

View File

@ -49,6 +49,11 @@ class ApiDoc
*/ */
private $output = null; private $output = null;
/**
* @var string
*/
private $link = null;
/** /**
* Most of the time, a single line of text describing the action. * Most of the time, a single line of text describing the action.
* *
@ -242,6 +247,14 @@ class ApiDoc
$this->description = $description; $this->description = $description;
} }
/**
* @param string $link
*/
public function setLink($link)
{
$this->link = $link;
}
/** /**
* @param string $section * @param string $section
*/ */
@ -441,6 +454,10 @@ class ApiDoc
$data['description'] = $description; $data['description'] = $description;
} }
if ($link = $this->link) {
$data['link'] = $link;
}
if ($documentation = $this->documentation) { if ($documentation = $this->documentation) {
$data['documentation'] = $documentation; $data['documentation'] = $documentation;
} }

View File

@ -337,6 +337,9 @@ class ApiDocExtractor
if (preg_match('{^@deprecated\b(.*)}', trim($line), $matches)) { if (preg_match('{^@deprecated\b(.*)}', trim($line), $matches)) {
$annotation->setDeprecated(true); $annotation->setDeprecated(true);
} }
if (preg_match('{^@link\b(.*)}', trim($line), $matches)) {
$annotation->setLink($matches[1]);
}
} }
$regexp = '{(\w*) *\$%s\b *(.*)}i'; $regexp = '{(\w*) *\$%s\b *(.*)}i';

View File

@ -134,8 +134,6 @@ class FormTypeParser implements ParserInterface
'description' => $config->getAttribute('description'), 'description' => $config->getAttribute('description'),
'readonly' => $config->getDisabled(), 'readonly' => $config->getDisabled(),
); );
} else {
$parameters[$name]['class'] = $type;
} }
continue; continue;

View File

@ -48,6 +48,11 @@
<div>{{ data.documentation|extra_markdown }}</div> <div>{{ data.documentation|extra_markdown }}</div>
{% endif %} {% endif %}
{% if data.link is defined and data.link is not empty %}
<h4>Link</h4>
<div><a href="{{ data.link }}" target="_blank">{{ data.link }}</a></div>
{% endif %}
{% if data.requirements is defined and data.requirements is not empty %} {% if data.requirements is defined and data.requirements is not empty %}
<h4>Requirements</h4> <h4>Requirements</h4>
<table class="fullwidth"> <table class="fullwidth">