Issue #2937010 by longwave, andypost, neclimdul, alexpott, Charlie ChX... (9cd6d558) · Commits · project / drupal

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

+1 −55

Changes for core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php: 1 added line, 55 removed lines.
Original line number	Diff line number	Diff line
		<?php

		// phpcs:ignoreFile Portions of this file are a direct copy of
		// \Symfony\Component\DependencyInjection\Container.

		namespace Drupal\Core\DependencyInjection;

		use Symfony\Component\DependencyInjection\Alias;
		use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
		use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
		use Symfony\Component\DependencyInjection\Definition;
		use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
		use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;

		/**
		@@ -21,11 +17,6 @@
		*/
		class ContainerBuilder extends SymfonyContainerBuilder {

		/**
		* @var \Doctrine\Instantiator\InstantiatorInterface\|null
		*/
		private $proxyInstantiator;

		/**
		* {@inheritdoc}
		*/
		@@ -34,33 +25,6 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) {
		$this->setResourceTracking(FALSE);
		}

		/**
		* Retrieves the currently set proxy instantiator or instantiates one.
		*
		* @return InstantiatorInterface
		*/
		private function getProxyInstantiator()
		{
		if (!$this->proxyInstantiator) {
		$this->proxyInstantiator = new RealServiceInstantiator();
		}

		return $this->proxyInstantiator;
		}

		/**
		* A 1to1 copy of parent::shareService.
		*
		* @todo https://www.drupal.org/project/drupal/issues/2937010 Since Symfony
		* 3.4 this is not a 1to1 copy.
		*/
		protected function shareService(Definition $definition, $service, $id, array &$inlineServices)
		{
		if ($definition->isShared()) {
		$this->services[$lowerId = strtolower($id)] = $service;
		}
		}

		/**
		* Overrides Symfony\Component\DependencyInjection\ContainerBuilder::set().
		*
		@@ -87,7 +51,7 @@ public function set($id, $service) {
		/**
		* {@inheritdoc}
		*/
		public function register($id, $class = null): Definition {
		public function register($id, $class = NULL): Definition {
		if (strtolower($id) !== $id) {
		throw new \InvalidArgumentException("Service ID names must be lowercase: $id");
		}
		@@ -118,24 +82,6 @@ public function setParameter($name, $value) {
		parent::setParameter($name, $value);
		}

		/**
		* A 1to1 copy of parent::callMethod.
		*
		* @todo https://www.drupal.org/project/drupal/issues/2937010 Since Symfony
		* 3.4 this is not a 1to1 copy.
		*/
		protected function callMethod($service, $call, array &$inlineServices = array()) {
		$services = self::getServiceConditionals($call[1]);

		foreach ($services as $s) {
		if (!$this->has($s)) {
		return;
		}
		}

		call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->resolveValue($call[1])));
		}

		/**
		* {@inheritdoc}
		*/