Security update for Core, with self-updated composer

[yaffs-website] / web / core / lib / Drupal / Core / DependencyInjection / YamlFileLoader.php

diff --git a/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
index da1c08c2f5f9cbb32c1537f33dd9e7a3cdeec4c7..d999450b0a8f24db333e8ecb299d9b1106b2387b 100644 (file)
--- a/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -168,21 +168,10 @@ class YamlFileLoader
             $definition->setShared($service['shared']);
         }
 
-        if (isset($service['scope'])) {
-            if ('request' !== $id) {
-                @trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
-            }
-            $definition->setScope($service['scope'], false);
-        }
-
         if (isset($service['synthetic'])) {
             $definition->setSynthetic($service['synthetic']);
         }
 
-        if (isset($service['synchronized'])) {
-            $definition->setSynchronized($service['synchronized'], 'request' !== $id);
-        }
-
         if (isset($service['lazy'])) {
             $definition->setLazy($service['lazy']);
         }
@@ -213,15 +202,15 @@ class YamlFileLoader
         }
 
         if (isset($service['factory_class'])) {
-            $definition->setFactoryClass($service['factory_class']);
+            $definition->setFactory($service['factory_class']);
         }
 
         if (isset($service['factory_method'])) {
-            $definition->setFactoryMethod($service['factory_method']);
+            $definition->setFactory($service['factory_method']);
         }
 
         if (isset($service['factory_service'])) {
-            $definition->setFactoryService($service['factory_service']);
+            $definition->setFactory($service['factory_service']);
         }
 
         if (isset($service['file'])) {