diff --git a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php index 1d147c1c8f..2dadb2b139 100644 --- a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php +++ b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php @@ -432,7 +432,7 @@ protected function dumpValue($value) { } elseif (is_object($value)) { // Drupal specific: Instantiated objects have a _serviceId parameter. - @trigger_error('_serviceId is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Use \Drupal\Core\DrupalKernelInterface::getServiceIdMapping() instead. See https://www.drupal.org/node/3292540', E_USER_DEPRECATED); + @trigger_error('_serviceId is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Use DrupalKernelInterface::getServiceIdMapping() instead. See https://www.drupal.org/node/3292540', E_USER_DEPRECATED); if (isset($value->_serviceId)) { return $this->getReferenceCall($value->_serviceId); } diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php index 77402f9287..f0dd68794d 100644 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php +++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php @@ -10,7 +10,7 @@ * * @deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. The _serviceId * property is no longer part of the container. Use - * \Drupal\Core\DrupalKernelInterface::getServiceIdMapping instead. + * DrupalKernelInterface::getServiceIdMapping() instead. * * @see https://www.drupal.org/node/3292540 * @see \Drupal\Core\DependencyInjection\DependencySerializationTrait diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index d72297f4e5..29a79b9d53 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -579,7 +579,7 @@ public function testGetServiceDefinitionForObject() { $this->containerBuilder->getDefinitions()->willReturn($services); $this->expectException(RuntimeException::class); - $this->expectDeprecation('_serviceId is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. See https://www.drupal.org/project/drupal/issues/2531564.'); + $this->expectDeprecation('_serviceId is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Use DrupalKernelInterface::getServiceIdMapping() instead. See https://www.drupal.org/node/3292540'); $this->dumper->getArray(); } @@ -603,7 +603,7 @@ public function testGetServiceDefinitionForObjectServiceId() { $this->containerBuilder->getDefinitions()->willReturn($services); $this->containerBuilder->getDefinition('foo')->willReturn($services['foo']); $this->containerBuilder->getDefinition('bar')->willReturn($services['bar']); - $this->expectDeprecation('_serviceId is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. See https://www.drupal.org/project/drupal/issues/2531564.'); + $this->expectDeprecation('_serviceId is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Use DrupalKernelInterface::getServiceIdMapping() instead. See https://www.drupal.org/node/3292540'); $a = $this->dumper->getArray(); $this->assertEquals( $this->serializeDefinition([