Update to Drupal 8.2.0. For more information, see https://www.drupal.org/project/drupal/releases/8.2.0

core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Core\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Registers the authentication_providers container parameter.
+ */
+class AuthenticationProviderPass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(ContainerBuilder $container) {
+    $authentication_providers = [];
+    foreach ($container->findTaggedServiceIds('authentication_provider') as $service_id => $attributes) {
+      $authentication_provider = $attributes[0]['provider_id'];
+      if ($provider_tag = $container->getDefinition($service_id)->getTag('_provider')) {
+        $authentication_providers[$authentication_provider] = $provider_tag[0]['provider'];
+      }
+    }
+    $container->setParameter('authentication_providers', $authentication_providers);
+  }
+
+}

core/lib/Drupal/Core/DependencyInjection/Compiler/CorsCompilerPass.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\Core\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Provides a compiler pass which disables the CORS middleware in case disabled.
+ *
+ * @see core.services.yml
+ */
+class CorsCompilerPass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(ContainerBuilder $container) {
+    $enabled = FALSE;
+
+    if ($cors_config = $container->getParameter('cors.config')) {
+      $enabled = !empty($cors_config['enabled']);
+    }
+
+    // Remove the CORS middleware completly in case it was not enabled.
+    if (!$enabled) {
+      $container->removeDefinition('http_middleware.cors');
+    }
+  }
+
+}

core/lib/Drupal/Core/DependencyInjection/Container.php

@@ -14,7 +14,7 @@ class Container extends DrupalContainer {
    * {@inheritdoc}
    */
   public function set($id, $service, $scope = ContainerInterface::SCOPE_CONTAINER) {
-     parent::set($id, $service, $scope);
+    parent::set($id, $service, $scope);
 
     // Ensure that the _serviceId property is set on synthetic services as well.
     if (isset($this->services[$id]) && is_object($this->services[$id]) && !isset($this->services[$id]->_serviceId)) {

core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php

@@ -7,11 +7,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBu
 use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
 
 /**
  * Drupal's dependency injection container builder.
@@ -35,129 +31,6 @@ class ContainerBuilder extends SymfonyContainerBuilder {
     parent::__construct($parameterBag);
   }
 
-  /**
-   * Creates a service for a service definition.
-   *
-   * Overrides the parent implementation, but just changes one line about
-   * deprecations, see below.
-   *
-   * @param \Symfony\Component\DependencyInjection\Definition $definition
-   * @param string $id
-   * @param bool|true $tryProxy
-   *
-   * @return mixed|object
-   */
-  public function createService(Definition $definition, $id, $tryProxy = true)
-  {
-    if ($definition->isSynthetic()) {
-      throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
-    }
-
-    if ($definition->isDeprecated()) {
-      // Suppress deprecation warnings when a service is marked as
-      // 'deprecated: %service_id%-no-warning'
-      if ($definition->getDeprecationMessage($id) != ($id . '-no-warning')) {
-        @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED);
-      }
-    }
-
-    if ($tryProxy && $definition->isLazy()) {
-      $container = $this;
-
-      $proxy = $this
-        ->getProxyInstantiator()
-        ->instantiateProxy(
-          $container,
-          $definition,
-          $id, function () use ($definition, $id, $container) {
-          return $container->createService($definition, $id, false);
-        }
-        );
-      $this->shareService($definition, $proxy, $id);
-
-      return $proxy;
-    }
-
-    $parameterBag = $this->getParameterBag();
-
-    if (null !== $definition->getFile()) {
-      require_once $parameterBag->resolveValue($definition->getFile());
-    }
-
-    $arguments = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments())));
-
-    if (null !== $factory = $definition->getFactory()) {
-      if (is_array($factory)) {
-        $factory = array($this->resolveServices($parameterBag->resolveValue($factory[0])), $factory[1]);
-      } elseif (!is_string($factory)) {
-        throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
-      }
-
-      $service = call_user_func_array($factory, $arguments);
-
-      if (!$definition->isDeprecated() && is_array($factory) && is_string($factory[0])) {
-        $r = new \ReflectionClass($factory[0]);
-
-        if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
-          @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED);
-        }
-      }
-    } elseif (null !== $definition->getFactoryMethod(false)) {
-      if (null !== $definition->getFactoryClass(false)) {
-        $factory = $parameterBag->resolveValue($definition->getFactoryClass(false));
-      } elseif (null !== $definition->getFactoryService(false)) {
-        $factory = $this->get($parameterBag->resolveValue($definition->getFactoryService(false)));
-      } else {
-        throw new RuntimeException(sprintf('Cannot create service "%s" from factory method without a factory service or factory class.', $id));
-      }
-
-      $service = call_user_func_array(array($factory, $definition->getFactoryMethod(false)), $arguments);
-    } else {
-      $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
-
-      $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
-
-      if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
-        // Skip deprecation notices for deprecations which opt out.
-        @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);
-      }
-    }
-
-    if ($tryProxy || !$definition->isLazy()) {
-      // share only if proxying failed, or if not a proxy
-      $this->shareService($definition, $service, $id);
-    }
-
-    foreach ($definition->getMethodCalls() as $call) {
-      $this->callMethod($service, $call);
-    }
-
-    $properties = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getProperties())));
-    foreach ($properties as $name => $value) {
-      $service->$name = $value;
-    }
-
-    if ($callable = $definition->getConfigurator()) {
-      if (is_array($callable)) {
-        $callable[0] = $parameterBag->resolveValue($callable[0]);
-
-        if ($callable[0] instanceof Reference) {
-          $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
-        } elseif ($callable[0] instanceof Definition) {
-          $callable[0] = $this->createService($callable[0], null);
-        }
-      }
-
-      if (!is_callable($callable)) {
-        throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
-      }
-
-      call_user_func($callable, $service);
-    }
-
-    return $service;
-  }
-
   /**
    * Retrieves the currently set proxy instantiator or instantiates one.
    *

core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php

@@ -4,7 +4,7 @@
 namespace Drupal\Core\DependencyInjection;
 
 use Drupal\Component\FileCache\FileCacheFactory;
-use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Serialization\Yaml;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
@@ -111,7 +111,16 @@ class YamlFileLoader
             throw new InvalidArgumentException(sprintf('The "services" key should contain an array in %s. Check your YAML syntax.', $file));
         }
 
+        // Some extensions split up their dependencies into multiple files.
+        if (isset($content['_provider'])) {
+            $provider = $content['_provider'];
+        }
+        else {
+            $basename = basename($file);
+            list($provider, ) = explode('.', $basename, 2);
+        }
         foreach ($content['services'] as $id => $service) {
+            $service['tags'][] = ['name' => '_provider', 'provider' => $provider];
             $this->parseDefinition($id, $service, $file);
         }
     }