Fixed naming

This commit is contained in:
William DURAND 2012-04-12 18:44:38 +02:00
parent b122efb777
commit 5bd05379ec
6 changed files with 26 additions and 26 deletions

View File

@ -33,16 +33,16 @@ class DumpCommand extends ContainerAwareCommand
$routeCollection = $this->getContainer()->get('router')->getRouteCollection(); $routeCollection = $this->getContainer()->get('router')->getRouteCollection();
if (!$input->hasOption('format') || in_array($format, array('json'))) { if (!$input->hasOption('format') || in_array($format, array('json'))) {
$formatter = $this->getContainer()->get('nelmio.api.formatter.simple_formatter'); $formatter = $this->getContainer()->get('nelmio_api_doc.formatter.simple_formatter');
} else { } else {
if (!in_array($format, $this->availableFormats)) { if (!in_array($format, $this->availableFormats)) {
throw new \RuntimeException(sprintf('Format "%s" not supported.', $format)); throw new \RuntimeException(sprintf('Format "%s" not supported.', $format));
} }
$formatter = $this->getContainer()->get(sprintf('nelmio.api.formatter.%s_formatter', $format)); $formatter = $this->getContainer()->get(sprintf('nelmio_api_doc.formatter.%s_formatter', $format));
} }
$extractedDoc = $this->getContainer()->get('nelmio.api.extractor.api_doc_extractor')->all(); $extractedDoc = $this->getContainer()->get('nelmio_api_doc.extractor.api_doc_extractor')->all();
$formattedDoc = $formatter->format($extractedDoc); $formattedDoc = $formatter->format($extractedDoc);
if ('json' === $format) { if ('json' === $format) {

View File

@ -9,8 +9,8 @@ class ApiDocController extends Controller
{ {
public function indexAction() public function indexAction()
{ {
$extractedDoc = $this->get('nelmio.api.extractor.api_doc_extractor')->all(); $extractedDoc = $this->get('nelmio_api_doc.extractor.api_doc_extractor')->all();
$htmlContent = $this->get('nelmio.api.formatter.html_formatter')->format($extractedDoc); $htmlContent = $this->get('nelmio_api_doc.formatter.html_formatter')->format($extractedDoc);
return new Response($htmlContent); return new Response($htmlContent);
} }

View File

@ -4,26 +4,26 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters> <parameters>
<parameter key="nelmio.api.parser.form_type_parser.class">Nelmio\ApiDocBundle\Parser\FormTypeParser</parameter> <parameter key="nelmio_api_doc.parser.form_type_parser.class">Nelmio\ApiDocBundle\Parser\FormTypeParser</parameter>
<parameter key="nelmio.api.formatter.abstract_formatter.class">Nelmio\ApiDocBundle\Formatter\AbstractFormatter</parameter> <parameter key="nelmio_api_doc.formatter.abstract_formatter.class">Nelmio\ApiDocBundle\Formatter\AbstractFormatter</parameter>
<parameter key="nelmio.api.formatter.markdown_formatter.class">Nelmio\ApiDocBundle\Formatter\MarkdownFormatter</parameter> <parameter key="nelmio_api_doc.formatter.markdown_formatter.class">Nelmio\ApiDocBundle\Formatter\MarkdownFormatter</parameter>
<parameter key="nelmio.api.formatter.simple_formatter.class">Nelmio\ApiDocBundle\Formatter\SimpleFormatter</parameter> <parameter key="nelmio_api_doc.formatter.simple_formatter.class">Nelmio\ApiDocBundle\Formatter\SimpleFormatter</parameter>
<parameter key="nelmio.api.formatter.html_formatter.class">Nelmio\ApiDocBundle\Formatter\HtmlFormatter</parameter> <parameter key="nelmio_api_doc.formatter.html_formatter.class">Nelmio\ApiDocBundle\Formatter\HtmlFormatter</parameter>
</parameters> </parameters>
<services> <services>
<service id="nelmio.api.parser.form_type_parser" class="%nelmio.api.parser.form_type_parser.class%"> <service id="nelmio_api_doc.parser.form_type_parser" class="%nelmio_api_doc.parser.form_type_parser.class%">
<argument type="service" id="form.factory" /> <argument type="service" id="form.factory" />
</service> </service>
<service id="nelmio.api.formatter.abstract_formatter" class="%nelmio.api.formatter.abstract_formatter.class%"> <service id="nelmio_api_doc.formatter.abstract_formatter" class="%nelmio_api_doc.formatter.abstract_formatter.class%">
<argument type="service" id="nelmio.api.parser.form_type_parser" /> <argument type="service" id="nelmio_api_doc.parser.form_type_parser" />
</service> </service>
<service id="nelmio.api.formatter.markdown_formatter" class="%nelmio.api.formatter.markdown_formatter.class%" <service id="nelmio_api_doc.formatter.markdown_formatter" class="%nelmio_api_doc.formatter.markdown_formatter.class%"
parent="nelmio.api.formatter.abstract_formatter" /> parent="nelmio_api_doc.formatter.abstract_formatter" />
<service id="nelmio.api.formatter.simple_formatter" class="%nelmio.api.formatter.simple_formatter.class%" <service id="nelmio_api_doc.formatter.simple_formatter" class="%nelmio_api_doc.formatter.simple_formatter.class%"
parent="nelmio.api.formatter.abstract_formatter" /> parent="nelmio_api_doc.formatter.abstract_formatter" />
<service id="nelmio.api.formatter.html_formatter" class="%nelmio.api.formatter.html_formatter.class%" <service id="nelmio_api_doc.formatter.html_formatter" class="%nelmio_api_doc.formatter.html_formatter.class%"
parent="nelmio.api.formatter.abstract_formatter" /> parent="nelmio_api_doc.formatter.abstract_formatter" />
</services> </services>
</container> </container>

View File

@ -4,13 +4,13 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters> <parameters>
<parameter key="nelmio.api.event_listener.request.class">Nelmio\ApiDocBundle\EventListener\RequestListener</parameter> <parameter key="nelmio_api_doc.event_listener.request.class">Nelmio\ApiDocBundle\EventListener\RequestListener</parameter>
</parameters> </parameters>
<services> <services>
<service id="nelmio.api.event_listener.request" class="%nelmio.api.event_listener.request.class%"> <service id="nelmio_api_doc.event_listener.request" class="%nelmio_api_doc.event_listener.request.class%">
<argument type="service" id="nelmio.api.extractor.api_doc_extractor" /> <argument type="service" id="nelmio_api_doc.extractor.api_doc_extractor" />
<argument type="service" id="nelmio.api.formatter.html_formatter" /> <argument type="service" id="nelmio_api_doc.formatter.html_formatter" />
<tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" /> <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
</service> </service>
</services> </services>

View File

@ -1,4 +1,4 @@
nelmio_api_api_doc_index: nelmio_api_doc_index:
pattern: /api/doc pattern: /api/doc
defaults: { _controller: NelmioApiDocBundle:ApiDoc:index } defaults: { _controller: NelmioApiDocBundle:ApiDoc:index }
requirements: requirements:

View File

@ -4,11 +4,11 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters> <parameters>
<parameter key="nelmio.api.extractor.api_doc_extractor.class">Nelmio\ApiDocBundle\Extractor\ApiDocExtractor</parameter> <parameter key="nelmio_api_doc.extractor.api_doc_extractor.class">Nelmio\ApiDocBundle\Extractor\ApiDocExtractor</parameter>
</parameters> </parameters>
<services> <services>
<service id="nelmio.api.extractor.api_doc_extractor" class="%nelmio.api.extractor.api_doc_extractor.class%"> <service id="nelmio_api_doc.extractor.api_doc_extractor" class="%nelmio_api_doc.extractor.api_doc_extractor.class%">
<argument type="service" id="router" /> <argument type="service" id="router" />
<argument type="service" id="annotation_reader" /> <argument type="service" id="annotation_reader" />
</service> </service>