diff --git a/book/doctrine.rst b/book/doctrine.rst index 145667324c5..41b23c9ee1f 100644 --- a/book/doctrine.rst +++ b/book/doctrine.rst @@ -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 diff --git a/book/service_container.rst b/book/service_container.rst index 917eb0264e0..adda1817822 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/components/dependency_injection/factories.rst b/components/dependency_injection/factories.rst index 0a9aa94adff..be9b8a9dee1 100644 --- a/components/dependency_injection/factories.rst +++ b/components/dependency_injection/factories.rst @@ -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 diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst index 7ef0dcc34a1..3d9edede13b 100644 --- a/components/dependency_injection/introduction.rst +++ b/components/dependency_injection/introduction.rst @@ -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 diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst index cd2a79537cf..469d4306385 100644 --- a/components/dependency_injection/parentservices.rst +++ b/components/dependency_injection/parentservices.rst @@ -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 @@ -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%" @@ -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%" @@ -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 diff --git a/components/dependency_injection/tags.rst b/components/dependency_injection/tags.rst index 4fd7e5de25f..9e0e7ac70df 100644 --- a/components/dependency_injection/tags.rst +++ b/components/dependency_injection/tags.rst @@ -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: @@ -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: diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst index dd1aba49358..f7ef8032e95 100644 --- a/components/dependency_injection/types.rst +++ b/components/dependency_injection/types.rst @@ -43,7 +43,7 @@ service container configuration: # ... newsletter_manager: class: NewsletterManager - arguments: [@my_mailer] + arguments: ["@my_mailer"] .. code-block:: xml @@ -119,7 +119,7 @@ accepts the dependency:: newsletter_manager: class: NewsletterManager calls: - - [ setMailer, [ @my_mailer ] ] + - [setMailer, ["@my_mailer"]] .. code-block:: xml @@ -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 diff --git a/cookbook/configuration/pdo_session_storage.rst b/cookbook/configuration/pdo_session_storage.rst index ba9c490f6a2..b11ff924b4b 100644 --- a/cookbook/configuration/pdo_session_storage.rst +++ b/cookbook/configuration/pdo_session_storage.rst @@ -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 @@ -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 diff --git a/cookbook/doctrine/multiple_entity_managers.rst b/cookbook/doctrine/multiple_entity_managers.rst index 73707e4fc97..3fc5c5c46df 100644 --- a/cookbook/doctrine/multiple_entity_managers.rst +++ b/cookbook/doctrine/multiple_entity_managers.rst @@ -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: diff --git a/cookbook/event_dispatcher/before_after_filters.rst b/cookbook/event_dispatcher/before_after_filters.rst index c8b5260ed6e..3ea82f65a95 100755 --- a/cookbook/event_dispatcher/before_after_filters.rst +++ b/cookbook/event_dispatcher/before_after_filters.rst @@ -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 } @@ -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 } diff --git a/cookbook/logging/monolog.rst b/cookbook/logging/monolog.rst index 9c837db0dde..5531ab62a67 100644 --- a/cookbook/logging/monolog.rst +++ b/cookbook/logging/monolog.rst @@ -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 } diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst index d66054f6815..56006a447d4 100644 --- a/cookbook/security/custom_authentication_provider.rst +++ b/cookbook/security/custom_authentication_provider.rst @@ -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 diff --git a/cookbook/security/securing_services.rst b/cookbook/security/securing_services.rst index bc5b8422a44..810b83fc9b6 100644 --- a/cookbook/security/securing_services.rst +++ b/cookbook/security/securing_services.rst @@ -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 diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst index c77f5c9d9eb..9960a032183 100644 --- a/cookbook/security/voters.rst +++ b/cookbook/security/voters.rst @@ -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 diff --git a/cookbook/web_services/php_soap_extension.rst b/cookbook/web_services/php_soap_extension.rst index d629f907c9d..246f3b64fbc 100644 --- a/cookbook/web_services/php_soap_extension.rst +++ b/cookbook/web_services/php_soap_extension.rst @@ -62,7 +62,7 @@ a ``HelloService`` object properly: services: hello_service: class: Acme\SoapBundle\Services\HelloService - arguments: [@mailer] + arguments: ["@mailer"] .. code-block:: xml diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index 5188362b9c6..9f1a7045f7b 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -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 }