Skip to content

Commit

Permalink
minor #5843 Fixed the YAML syntax for service references (javiereguiluz)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 2.3 branch (closes #5843).

Discussion
----------

Fixed the YAML syntax for service references

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | -

See symfony/symfony#16285 and symfony/symfony#16353 for context. I've just found two issues, but it's possible that this syntax is used in more places.

Commits
-------

daeda56 Fixed the YAML syntax for service references
  • Loading branch information
xabbuh committed Oct 27, 2015
2 parents 506b331 + daeda56 commit 1e388eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cookbook/routing/custom_route_loader.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A custom route loader does not enable your bundle to inject routes
without the need to modify the routing configuration
(e.g. ``app/config/routing.yml``) manually.
If your bundle provides routes, whether via a configuration file, like
the `WebProfilerBundle` does, or via a custom route loader, like the
the `WebProfilerBundle` does, or via a custom route loader, like the
`FOSRestBundle`_ does, an entry in the routing configuration is always
necessary.

Expand Down Expand Up @@ -46,7 +46,7 @@ Take these lines from the ``routing.yml`` in the Symfony Standard Edition:
# app/config/routing.yml
app:
resource: @AppBundle/Controller/
resource: "@AppBundle/Controller/"
type: annotation
When the main loader parses this, it tries all registered delegate loaders and calls
Expand Down
2 changes: 1 addition & 1 deletion reference/configuration/twig.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ TwigBundle Configuration ("twig")
# The following were added in Symfony 2.3.
# See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy
autoescape_service: ~ # Example: @my_service
autoescape_service: ~ # Example: "@my_service"
autoescape_service_method: ~ # use in combination with autoescape_service option
base_template_class: ~ # Example: Twig_Template
cache: "%kernel.cache_dir%/twig"
Expand Down

0 comments on commit 1e388eb

Please sign in to comment.