From 973a74ad93a5b9f19893c2e70679257d603ff715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Thu, 20 Feb 2020 22:02:08 +0100
Subject: [PATCH] Issue #3114785 by slootjes, longwave: [Symfony 5] Update
deprecated short factory configurators in Yaml
---
core/core.api.php | 4 +--
core/core.services.yml | 28 +++++++++----------
core/modules/contact/contact.services.yml | 2 +-
.../dynamic_page_cache.services.yml | 2 +-
core/modules/jsonapi/jsonapi.services.yml | 2 +-
core/modules/migrate/migrate.services.yml | 4 +--
.../page_cache/page_cache.services.yml | 2 +-
core/modules/rest/rest.services.yml | 2 +-
.../module_cachebin.services.yml | 2 +-
core/modules/toolbar/toolbar.services.yml | 2 +-
core/modules/update/update.services.yml | 2 +-
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/core/core.api.php b/core/core.api.php
index 3725ccb46479..4bf631025939 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -477,7 +477,7 @@
* class: Drupal\Core\Cache\CacheBackendInterface
* tags:
* - { name: cache.bin }
- * factory: cache_factory:get
+ * factory: ['@cache_factory', 'get']
* arguments: [nameofbin]
* @endcode
* See the @link container Services topic @endlink for more on defining
@@ -772,7 +772,7 @@
* class: Drupal\Core\Cache\CacheBackendInterface
* tags:
* - { name: cache.bin }
- * factory: cache_factory:get
+ * factory: ['@cache_factory', 'get']
* arguments: [entity]
* @endcode
*
diff --git a/core/core.services.yml b/core/core.services.yml
index d587c55d9c78..cde2ebaac6b0 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -212,55 +212,55 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.memory }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [static]
cache.bootstrap:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [bootstrap]
cache.config:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [config]
cache.default:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [default]
cache.entity:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [entity]
cache.menu:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [menu]
cache.render:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [render]
cache.data:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [data]
cache.discovery:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [discovery]
cache_router_rebuild_subscriber:
class: Drupal\Core\EventSubscriber\CacheRouterRebuildSubscriber
@@ -419,7 +419,7 @@ services:
logger.channel_base:
abstract: true
class: Drupal\Core\Logger\LoggerChannel
- factory: logger.factory:get
+ factory: ['@logger.factory', 'get']
logger.channel.default:
parent: logger.channel_base
arguments: ['system']
@@ -434,7 +434,7 @@ services:
arguments: ['cron']
logger.channel.file:
class: Drupal\Core\Logger\LoggerChannel
- factory: logger.factory:get
+ factory: ['@logger.factory', 'get']
arguments: ['file']
logger.channel.form:
parent: logger.channel_base
@@ -480,7 +480,7 @@ services:
arguments: ['@service_container']
http_client:
class: GuzzleHttp\Client
- factory: http_client_factory:fromOptions
+ factory: ['@http_client_factory', 'fromOptions']
http_client_factory:
class: Drupal\Core\Http\ClientFactory
arguments: ['@http_handler_stack']
@@ -698,7 +698,7 @@ services:
arguments: ['@service_container']
app.root:
class: SplString
- factory: app.root.factory:get
+ factory: ['@app.root.factory', 'get']
tags:
- { name: parameter_service }
app.root.factory:
@@ -707,7 +707,7 @@ services:
public: false
site.path:
class: SplString
- factory: site.path.factory:get
+ factory: ['@site.path.factory', 'get']
tags:
- { name: parameter_service }
site.path.factory:
diff --git a/core/modules/contact/contact.services.yml b/core/modules/contact/contact.services.yml
index cec2c57e05df..fef18ce78ca0 100644
--- a/core/modules/contact/contact.services.yml
+++ b/core/modules/contact/contact.services.yml
@@ -9,5 +9,5 @@ services:
arguments: ['@plugin.manager.mail', '@language_manager', '@logger.channel.contact', '@string_translation', '@entity_type.manager']
logger.channel.contact:
class: Drupal\Core\Logger\LoggerChannel
- factory: logger.factory:get
+ factory: ['@logger.factory', 'get']
arguments: ['contact']
diff --git a/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml b/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml
index 241999233dbe..2d1aea97c6c1 100644
--- a/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml
+++ b/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml
@@ -3,7 +3,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [dynamic_page_cache]
dynamic_page_cache_subscriber:
class: Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber
diff --git a/core/modules/jsonapi/jsonapi.services.yml b/core/modules/jsonapi/jsonapi.services.yml
index ab41e429df4a..0894d3dc4de3 100644
--- a/core/modules/jsonapi/jsonapi.services.yml
+++ b/core/modules/jsonapi/jsonapi.services.yml
@@ -138,7 +138,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [jsonapi_normalizations]
# Route filter.
diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml
index 5ada988d1bcf..f18a22babf28 100644
--- a/core/modules/migrate/migrate.services.yml
+++ b/core/modules/migrate/migrate.services.yml
@@ -7,7 +7,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [migrate]
plugin.manager.migrate.source:
class: Drupal\migrate\Plugin\MigrateSourcePluginManager
@@ -25,7 +25,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [discovery_migration]
plugin.manager.migration:
class: Drupal\migrate\Plugin\MigrationPluginManager
diff --git a/core/modules/page_cache/page_cache.services.yml b/core/modules/page_cache/page_cache.services.yml
index 35b899a1e346..308eb454e5f1 100644
--- a/core/modules/page_cache/page_cache.services.yml
+++ b/core/modules/page_cache/page_cache.services.yml
@@ -9,5 +9,5 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [page]
diff --git a/core/modules/rest/rest.services.yml b/core/modules/rest/rest.services.yml
index 5ffb8ded9652..868a048f9205 100644
--- a/core/modules/rest/rest.services.yml
+++ b/core/modules/rest/rest.services.yml
@@ -6,7 +6,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [rest]
rest.resource_routes:
class: Drupal\rest\Routing\ResourceRoutes
diff --git a/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml b/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml
index 8e1427463bfe..efecad1683d6 100644
--- a/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml
+++ b/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml
@@ -3,5 +3,5 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache.backend.database:get
+ factory: ['@cache.backend.database', 'get']
arguments: [module_cachebin]
diff --git a/core/modules/toolbar/toolbar.services.yml b/core/modules/toolbar/toolbar.services.yml
index 44ef6e254334..a2cceff403d7 100644
--- a/core/modules/toolbar/toolbar.services.yml
+++ b/core/modules/toolbar/toolbar.services.yml
@@ -3,7 +3,7 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
- factory: cache_factory:get
+ factory: ['@cache_factory', 'get']
arguments: [toolbar]
toolbar.page_cache_request_policy.allow_toolbar_path:
class: Drupal\toolbar\PageCache\AllowToolbarPath
diff --git a/core/modules/update/update.services.yml b/core/modules/update/update.services.yml
index 767a1d1f3018..197e3d5f1d39 100644
--- a/core/modules/update/update.services.yml
+++ b/core/modules/update/update.services.yml
@@ -15,7 +15,7 @@ services:
arguments: ['@config.factory', '@http_client']
update.root:
class: SplString
- factory: update.root.factory:get
+ factory: ['@update.root.factory', 'get']
tags:
- { name: parameter_service }
update.root.factory:
--
GitLab