diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php index 8244320..3e2766f 100644 --- a/core/lib/Drupal/Core/CoreServiceProvider.php +++ b/core/lib/Drupal/Core/CoreServiceProvider.php @@ -14,7 +14,6 @@ use Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass; use Drupal\Core\DependencyInjection\Compiler\RegisterLazyRouteEnhancers; use Drupal\Core\DependencyInjection\Compiler\RegisterLazyRouteFilters; -use Drupal\Core\DependencyInjection\Compiler\DependencySerializationTraitPass; use Drupal\Core\DependencyInjection\Compiler\StackedKernelPass; use Drupal\Core\DependencyInjection\Compiler\StackedSessionHandlerPass; use Drupal\Core\DependencyInjection\Compiler\RegisterStreamWrappersPass; @@ -93,8 +92,6 @@ public function register(ContainerBuilder $container) { // Register plugin managers. $container->addCompilerPass(new PluginManagerPass()); - - $container->addCompilerPass(new DependencySerializationTraitPass()); } /** diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php deleted file mode 100644 index 2bb0b70..0000000 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php +++ /dev/null @@ -1,33 +0,0 @@ -getDefinitions() as $service_id => $definition) { - // Only add the property to services that are public (as private services - // can not be reloaded through Container::get()) and are objects. - if (!$definition->hasTag('parameter_service') && $definition->isPublic()) { - $definition->setProperty('_serviceId', $service_id); - } - } - } - -} diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php index ce692b5..e3de645 100644 --- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php +++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php @@ -45,11 +45,6 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER) { throw new \InvalidArgumentException("Service ID names must be lowercase: $id"); } SymfonyContainer::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)) { - $this->services[$id]->_serviceId = $id; - } } /** diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php index 0df17c4..bb1e51f 100644 --- a/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php @@ -35,7 +35,6 @@ public function testSet() { $container = new ContainerBuilder(); $class = new BarClass(); $container->set('bar', $class); - $this->assertEquals('bar', $class->_serviceId); } /** @@ -47,7 +46,6 @@ public function testSetException() { $container = new ContainerBuilder(); $class = new BarClass(); $container->set('Bar', $class); - $this->assertNotEquals('bar', $class->_serviceId); } /**