From c9a6c9c6ce1fa02fc0654ae256655cd699935d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Thu, 3 Sep 2020 22:46:27 +0200 Subject: [PATCH] Migrate Yaml config for DI calls to new syntax From https://symfony.com/blog/new-in-symfony-4-4-dependency-injection-improvements-part-2 > [It is] more concise, and easier to read/write. --- components/dependency_injection.rst | 2 +- service_container/calls.rst | 2 +- service_container/injection_types.rst | 4 ++-- service_container/optional_dependencies.rst | 2 +- service_container/parent_services.rst | 2 +- session/database.rst | 12 +++++------- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/components/dependency_injection.rst b/components/dependency_injection.rst index 0d842e9c415..486f89e599d 100644 --- a/components/dependency_injection.rst +++ b/components/dependency_injection.rst @@ -259,7 +259,7 @@ config files: newsletter_manager: class: NewsletterManager calls: - - [setMailer, ['@mailer']] + - setMailer: ['@mailer'] .. code-block:: xml diff --git a/service_container/calls.rst b/service_container/calls.rst index 46f25456400..c3797cb8917 100644 --- a/service_container/calls.rst +++ b/service_container/calls.rst @@ -40,7 +40,7 @@ To configure the container to call the ``setLogger`` method, use the ``calls`` k App\Service\MessageGenerator: # ... calls: - - [setLogger, ['@logger']] + - setLogger: ['@logger'] .. code-block:: xml diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst index 77098c0b9fb..983d2311b49 100644 --- a/service_container/injection_types.rst +++ b/service_container/injection_types.rst @@ -150,7 +150,7 @@ In order to use this type of injection, don't forget to configure it: app.newsletter_manager: class: App\Mail\NewsletterManager calls: - - [withMailer, ['@mailer'], true] + - withMailer: !returns_clone ['@mailer'] .. code-block:: xml @@ -244,7 +244,7 @@ that accepts the dependency:: app.newsletter_manager: class: App\Mail\NewsletterManager calls: - - [setMailer, ['@mailer']] + - setMailer: ['@mailer'] .. code-block:: xml diff --git a/service_container/optional_dependencies.rst b/service_container/optional_dependencies.rst index 3593934c5c3..ca702176341 100644 --- a/service_container/optional_dependencies.rst +++ b/service_container/optional_dependencies.rst @@ -68,7 +68,7 @@ call if the service exists and remove the method call if it does not: services: App\Newsletter\NewsletterManager: calls: - - [setLogger, ['@?logger']] + - setLogger: ['@?logger'] .. code-block:: xml diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst index ee04e377238..2e2202f7d71 100644 --- a/service_container/parent_services.rst +++ b/service_container/parent_services.rst @@ -72,7 +72,7 @@ duplicated service definitions: abstract: true arguments: ['@doctrine.orm.entity_manager'] calls: - - [setLogger, ['@logger']] + - setLogger: ['@logger'] App\Repository\DoctrineUserRepository: # extend the App\Repository\BaseDoctrineRepository service diff --git a/session/database.rst b/session/database.rst index 9e2777efc24..8766ab9f2a8 100644 --- a/session/database.rst +++ b/session/database.rst @@ -30,15 +30,13 @@ First, define a Symfony service for the connection to the Redis server: # you can also use \RedisArray, \RedisCluster or \Predis\Client classes class: Redis calls: - - method: connect - arguments: - - '%env(REDIS_HOST)%' - - '%env(int:REDIS_PORT)%' + - connect: + - '%env(REDIS_HOST)%' + - '%env(int:REDIS_PORT)%' # uncomment the following if your Redis server requires a password - # - method: auth - # arguments: - # - '%env(REDIS_PASSWORD)%' + # - auth: + # - '%env(REDIS_PASSWORD)%' .. code-block:: xml