Skip to content

Fix YAML syntax so the parser renders the colors correctly #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/doctrine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
type: entity
# ...
lifecycleCallbacks:
prePersist: [ setCreatedValue ]
prePersist: [setCreatedValue]

.. code-block:: xml

Expand Down
14 changes: 7 additions & 7 deletions book/service_container.rst
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ straightforward. Parameters make defining services more organized and flexible:
services:
my_mailer:
class: "%my_mailer.class%"
arguments: [%my_mailer.transport%]
arguments: ["%my_mailer.transport%"]

.. code-block:: xml

Expand Down Expand Up @@ -358,7 +358,7 @@ directories don't exist, create them.
services:
my_mailer:
class: "%my_mailer.class%"
arguments: [%my_mailer.transport%]
arguments: ["%my_mailer.transport%"]

.. code-block:: xml

Expand Down Expand Up @@ -398,7 +398,7 @@ configuration.

# app/config/config.yml
imports:
- { resource: @AcmeHelloBundle/Resources/config/services.yml }
- { resource: "@AcmeHelloBundle/Resources/config/services.yml" }

.. code-block:: xml

Expand Down Expand Up @@ -599,7 +599,7 @@ the service container gives you a much more appealing option:
# ...
newsletter_manager:
class: "%newsletter_manager.class%"
arguments: [@my_mailer]
arguments: ["@my_mailer"]

.. code-block:: xml

Expand Down Expand Up @@ -690,7 +690,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
newsletter_manager:
class: "%newsletter_manager.class%"
calls:
- [ setMailer, [ @my_mailer ] ]
- [setMailer, ["@my_mailer"]]

.. code-block:: xml

Expand Down Expand Up @@ -757,7 +757,7 @@ it exists and do nothing if it doesn't:
services:
newsletter_manager:
class: "%newsletter_manager.class%"
arguments: [@?my_mailer]
arguments: ["@?my_mailer"]

.. code-block:: xml

Expand Down Expand Up @@ -862,7 +862,7 @@ Configuring the service container is easy:
services:
newsletter_manager:
class: "%newsletter_manager.class%"
arguments: [@mailer, @templating]
arguments: ["@mailer", "@templating"]

.. code-block:: xml

Expand Down
2 changes: 1 addition & 1 deletion components/dependency_injection/factories.rst
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ in the previous example takes the ``templating`` service as an argument:
factory_service: newsletter_factory
factory_method: get
arguments:
- @templating
- "@templating"

.. code-block:: xml

Expand Down
4 changes: 2 additions & 2 deletions components/dependency_injection/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ The ``newsletter_manager`` and ``mailer`` services can be set up using config fi
services:
mailer:
class: Mailer
arguments: [%mailer.transport%]
arguments: ["%mailer.transport%"]
newsletter_manager:
class: NewsletterManager
calls:
- [ setMailer, [ @mailer ] ]
- [setMailer, ["@mailer"]]

.. code-block:: xml

Expand Down
22 changes: 11 additions & 11 deletions components/dependency_injection/parentservices.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ The service config for these classes would look something like this:
newsletter_manager:
class: "%newsletter_manager.class%"
calls:
- [ setMailer, [ @my_mailer ] ]
- [ setEmailFormatter, [ @my_email_formatter] ]
- [setMailer, ["@my_mailer"]]
- [setEmailFormatter, ["@my_email_formatter"]]

greeting_card_manager:
class: "%greeting_card_manager.class%"
calls:
- [ setMailer, [ @my_mailer ] ]
- [ setEmailFormatter, [ @my_email_formatter] ]
- [setMailer, ["@my_mailer"]]
- [setEmailFormatter, ["@my_email_formatter"]]

.. code-block:: xml

Expand Down Expand Up @@ -194,8 +194,8 @@ a parent for a service.
class: "%mail_manager.class%"
abstract: true
calls:
- [ setMailer, [ @my_mailer ] ]
- [ setEmailFormatter, [ @my_email_formatter] ]
- [setMailer, ["@my_mailer"]]
- [setEmailFormatter, ["@my_email_formatter"]]

newsletter_manager:
class: "%newsletter_manager.class%"
Expand Down Expand Up @@ -320,14 +320,14 @@ to the ``NewsletterManager`` class, the config would look like this:
class: "%mail_manager.class%"
abstract: true
calls:
- [ setMailer, [ @my_mailer ] ]
- [ setEmailFormatter, [ @my_email_formatter] ]
- [setMailer, ["@my_mailer"]]
- [setEmailFormatter, ["@my_email_formatter"]]

newsletter_manager:
class: "%newsletter_manager.class%"
parent: mail_manager
calls:
- [ setMailer, [ @my_alternative_mailer ] ]
- [setMailer, ["@my_alternative_mailer"]]

greeting_card_manager:
class: "%greeting_card_manager.class%"
Expand Down Expand Up @@ -452,13 +452,13 @@ If you had the following config:
class: "%mail_manager.class%"
abstract: true
calls:
- [ setFilter, [ @my_filter ] ]
- [setFilter, ["@my_filter"]]

newsletter_manager:
class: "%newsletter_manager.class%"
parent: mail_manager
calls:
- [ setFilter, [ @another_filter ] ]
- [setFilter, ["@another_filter"]]

.. code-block:: xml

Expand Down
4 changes: 2 additions & 2 deletions components/dependency_injection/tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ For example you may add the following transports as services:
acme_mailer.transport.smtp:
class: \Swift_SmtpTransport
arguments:
- %mailer_host%
- "%mailer_host%"
tags:
- { name: acme_mailer.transport }
acme_mailer.transport.sendmail:
Expand Down Expand Up @@ -219,7 +219,7 @@ To answer this, change the service declaration:
acme_mailer.transport.smtp:
class: \Swift_SmtpTransport
arguments:
- %mailer_host%
- "%mailer_host%"
tags:
- { name: acme_mailer.transport, alias: foo }
acme_mailer.transport.sendmail:
Expand Down
6 changes: 3 additions & 3 deletions components/dependency_injection/types.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ service container configuration:
# ...
newsletter_manager:
class: NewsletterManager
arguments: [@my_mailer]
arguments: ["@my_mailer"]

.. code-block:: xml

Expand Down Expand Up @@ -119,7 +119,7 @@ accepts the dependency::
newsletter_manager:
class: NewsletterManager
calls:
- [ setMailer, [ @my_mailer ] ]
- [setMailer, ["@my_mailer"]]

.. code-block:: xml

Expand Down Expand Up @@ -186,7 +186,7 @@ Another possibility is just setting public fields of the class directly::
newsletter_manager:
class: NewsletterManager
properties:
mailer: @my_mailer
mailer: "@my_mailer"

.. code-block:: xml

Expand Down
6 changes: 3 additions & 3 deletions cookbook/configuration/pdo_session_storage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ configuration format of your choice):

session.storage.pdo:
class: Symfony\Component\HttpFoundation\SessionStorage\PdoSessionStorage
arguments: [@pdo, %session.storage.options%, %pdo.db_options%]
arguments: ["@pdo", "%session.storage.options%", "%pdo.db_options%"]

.. code-block:: xml

Expand Down Expand Up @@ -133,8 +133,8 @@ parameter.ini by referencing the database-related parameters defined there:
class: PDO
arguments:
- "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
- %database_user%
- %database_password%
- "%database_user%"
- "%database_password%"

.. code-block:: xml

Expand Down
24 changes: 12 additions & 12 deletions cookbook/doctrine/multiple_entity_managers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ The following configuration code shows how you can configure two entity managers
default_connection: default
connections:
default:
driver: %database_driver%
host: %database_host%
port: %database_port%
dbname: %database_name%
user: %database_user%
password: %database_password%
driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
charset: UTF8
customer:
driver: %database_driver2%
host: %database_host2%
port: %database_port2%
dbname: %database_name2%
user: %database_user2%
password: %database_password2%
driver: "%database_driver2%"
host: "%database_host2%"
port: "%database_port2%"
dbname: "%database_name2%"
user: "%database_user2%"
password: "%database_password2%"
charset: UTF8

orm:
Expand Down
4 changes: 2 additions & 2 deletions cookbook/event_dispatcher/before_after_filters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ your listener to be called just before any controller is executed.
services:
demo.tokens.action_listener:
class: Acme\DemoBundle\EventListener\TokenListener
arguments: [ %tokens% ]
arguments: ["%tokens%"]
tags:
- { name: kernel.event_listener, event: kernel.controller, method: onKernelController }

Expand Down Expand Up @@ -251,7 +251,7 @@ event:
services:
demo.tokens.action_listener:
class: Acme\DemoBundle\EventListener\TokenListener
arguments: [ %tokens% ]
arguments: ["%tokens%"]
tags:
- { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
- { name: kernel.event_listener, event: kernel.response, method: onKernelResponse }
Expand Down
2 changes: 1 addition & 1 deletion cookbook/logging/monolog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ using a processor.

monolog.processor.session_request:
class: Acme\MyBundle\SessionRequestProcessor
arguments: [ @session ]
arguments: ["@session"]
tags:
- { name: monolog.processor, method: processRecord }

Expand Down
4 changes: 2 additions & 2 deletions cookbook/security/custom_authentication_provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,11 @@ to service ids that do not exist yet: ``wsse.security.authentication.provider``
services:
wsse.security.authentication.provider:
class: Acme\DemoBundle\Security\Authentication\Provider\WsseProvider
arguments: ['', %kernel.cache_dir%/security/nonces]
arguments: ["", "%kernel.cache_dir%/security/nonces"]

wsse.security.authentication.listener:
class: Acme\DemoBundle\Security\Firewall\WsseListener
arguments: [@security.context, @security.authentication.manager]
arguments: ["@security.context", "@security.authentication.manager"]


.. code-block:: xml
Expand Down
2 changes: 1 addition & 1 deletion cookbook/security/securing_services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Then in your service configuration, you can inject the service:
services:
newsletter_manager:
class: "%newsletter_manager.class%"
arguments: [@security.context]
arguments: ["@security.context"]

.. code-block:: xml

Expand Down
4 changes: 2 additions & 2 deletions cookbook/security/voters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ and tag it as a "security.voter":
services:
security.access.blacklist_voter:
class: Acme\DemoBundle\Security\Authorization\Voter\ClientIpVoter
arguments: [@service_container, [123.123.123.123, 171.171.171.171]]
arguments: ["@service_container", [123.123.123.123, 171.171.171.171]]
public: false
tags:
- { name: security.voter }
- { name: security.voter }

.. code-block:: xml

Expand Down
2 changes: 1 addition & 1 deletion cookbook/web_services/php_soap_extension.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ a ``HelloService`` object properly:
services:
hello_service:
class: Acme\SoapBundle\Services\HelloService
arguments: [@mailer]
arguments: ["@mailer"]

.. code-block:: xml

Expand Down
2 changes: 1 addition & 1 deletion reference/dic_tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ channel when injecting the logger in a service.
services:
my_service:
class: Fully\Qualified\Loader\Class\Name
arguments: [@logger]
arguments: ["@logger"]
tags:
- { name: monolog.logger, channel: acme }

Expand Down