diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php index eef56db..71863c8 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php +++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php @@ -181,8 +181,7 @@ protected function buildLazyLoadItselfMethod() { protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php index f06722f..494e8db 100644 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php +++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php @@ -10,6 +10,7 @@ use Drupal\Component\ProxyBuilder\ProxyBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Definition; /** * Replaces all services with a lazy flag. @@ -20,11 +21,20 @@ class ProxyServicesPass implements CompilerPassInterface { * {@inheritdoc} */ public function process(ContainerBuilder $container) { - foreach ($container->getDefinitions() as $definition) { + foreach ($container->getDefinitions() as $service_id => $definition) { if ($definition->isLazy()) { + // Copy the existing definition to a new entry. + $definition->setLazy(FALSE); + // Ensure that the service is accessible. + $definition->setPublic(TRUE); + $new_service_id = 'drupal.proxy_service.' . $service_id; + $container->setDefinition($new_service_id, $definition); + $proxy_class = ProxyBuilder::buildProxyClassName($definition->getClass()); if (class_exists($proxy_class)) { - $definition->setClass($proxy_class); + $proxy_definition = new Definition($proxy_class); + $proxy_definition->setArguments(['service_container', $new_service_id]); + } } } diff --git a/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php b/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php index 7e1fcec..9f2dd9e 100644 --- a/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php +++ b/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php b/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php index 78cfa04..f5d0899 100644 --- a/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Cron.php b/core/lib/Drupal/Core/ProxyClass/Cron.php index 28c1876..57f484d 100644 --- a/core/lib/Drupal/Core/ProxyClass/Cron.php +++ b/core/lib/Drupal/Core/ProxyClass/Cron.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php index 148afd2..2fdc139 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php index 4e4f08c..2e2791a 100644 --- a/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php +++ b/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php copy to core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php index 148afd2..4bf88f5 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator. + * Contains Drupal\Core\ProxyClass\Extension\RequiredModuleUninstallValidator. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\Entity { +namespace Drupal\Core\ProxyClass\Extension { /** - * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator. + * Provides a proxy class for \Drupal\Core\Extension\RequiredModuleUninstallValidator. * * @see \Drupal\Component\ProxyBuilder */ - class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface + class RequiredModuleUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstal protected $serviceId; /** - * @var \Drupal\Core\Entity\ContentUninstallValidator + * @var \Drupal\Core\Extension\RequiredModuleUninstallValidator */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/ProxyClass/Field/FieldModuleUninstallValidator.php similarity index 64% copy from core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php copy to core/lib/Drupal/Core/ProxyClass/Field/FieldModuleUninstallValidator.php index 148afd2..8a0b949 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/lib/Drupal/Core/ProxyClass/Field/FieldModuleUninstallValidator.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator. + * Contains Drupal\Core\ProxyClass\Field\FieldModuleUninstallValidator. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\Entity { +namespace Drupal\Core\ProxyClass\Field { /** - * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator. + * Provides a proxy class for \Drupal\Core\Field\FieldModuleUninstallValidator. * * @see \Drupal\Component\ProxyBuilder */ - class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface + class FieldModuleUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstal protected $serviceId; /** - * @var \Drupal\Core\Entity\ContentUninstallValidator + * @var \Drupal\Core\Field\FieldModuleUninstallValidator */ protected $service; @@ -47,16 +47,15 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; } - public function validate($module) + public function validate($module_name) { - return $this->lazyLoadItself()->validate($module); + return $this->lazyLoadItself()->validate($module_name); } public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation) diff --git a/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php b/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php index e8d559f..d250001 100644 --- a/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php +++ b/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php index 25439bd..ef2320d 100644 --- a/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php +++ b/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php b/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php index 9666c0a..0a1644b 100644 --- a/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php +++ b/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php b/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php index acd8996..5b4dc36 100644 --- a/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php +++ b/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php b/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php index 2776ef2..13b391e 100644 --- a/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php +++ b/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php b/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php index 451c5c1..a6516ee 100644 --- a/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php +++ b/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php b/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php index b9b194c..ea0e7dd 100644 --- a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php +++ b/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php b/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php index b7647e2..4e9cba4 100644 --- a/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php +++ b/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php b/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php index ca9ae49..53277c7 100644 --- a/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php +++ b/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php b/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php index 03a274d..a7aea17 100644 --- a/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php +++ b/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php b/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php index 51f57d8..092d8ad 100644 --- a/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php +++ b/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/modules/book/src/ProxyClass/BookUninstallValidator.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php copy to core/modules/book/src/ProxyClass/BookUninstallValidator.php index 148afd2..85ed47b 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/modules/book/src/ProxyClass/BookUninstallValidator.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator. + * Contains Drupal\book\ProxyClass\BookUninstallValidator. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\Entity { +namespace Drupal\book\ProxyClass { /** - * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator. + * Provides a proxy class for \Drupal\book\BookUninstallValidator. * * @see \Drupal\Component\ProxyBuilder */ - class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface + class BookUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstal protected $serviceId; /** - * @var \Drupal\Core\Entity\ContentUninstallValidator + * @var \Drupal\book\BookUninstallValidator */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/modules/field/src/ProxyClass/FieldUninstallValidator.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php copy to core/modules/field/src/ProxyClass/FieldUninstallValidator.php index 148afd2..75e24e1 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/modules/field/src/ProxyClass/FieldUninstallValidator.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator. + * Contains Drupal\field\ProxyClass\FieldUninstallValidator. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\Entity { +namespace Drupal\field\ProxyClass { /** - * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator. + * Provides a proxy class for \Drupal\field\FieldUninstallValidator. * * @see \Drupal\Component\ProxyBuilder */ - class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface + class FieldUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstal protected $serviceId; /** - * @var \Drupal\Core\Entity\ContentUninstallValidator + * @var \Drupal\field\FieldUninstallValidator */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/modules/filter/src/ProxyClass/FilterUninstallValidator.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php copy to core/modules/filter/src/ProxyClass/FilterUninstallValidator.php index 148afd2..92b8d9e 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/modules/filter/src/ProxyClass/FilterUninstallValidator.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator. + * Contains Drupal\filter\ProxyClass\FilterUninstallValidator. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\Entity { +namespace Drupal\filter\ProxyClass { /** - * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator. + * Provides a proxy class for \Drupal\filter\FilterUninstallValidator. * * @see \Drupal\Component\ProxyBuilder */ - class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface + class FilterUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstal protected $serviceId; /** - * @var \Drupal\Core\Entity\ContentUninstallValidator + * @var \Drupal\filter\FilterUninstallValidator */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/modules/forum/src/ProxyClass/ForumUninstallValidator.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php copy to core/modules/forum/src/ProxyClass/ForumUninstallValidator.php index 148afd2..4cee29a 100644 --- a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php +++ b/core/modules/forum/src/ProxyClass/ForumUninstallValidator.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator. + * Contains Drupal\forum\ProxyClass\ForumUninstallValidator. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\Entity { +namespace Drupal\forum\ProxyClass { /** - * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator. + * Provides a proxy class for \Drupal\forum\ForumUninstallValidator. * * @see \Drupal\Component\ProxyBuilder */ - class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface + class ForumUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstal protected $serviceId; /** - * @var \Drupal\Core\Entity\ContentUninstallValidator + * @var \Drupal\forum\ForumUninstallValidator */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php b/core/modules/language/src/ProxyClass/LanguageConverter.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php copy to core/modules/language/src/ProxyClass/LanguageConverter.php index b9b194c..4b501cd 100644 --- a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php +++ b/core/modules/language/src/ProxyClass/LanguageConverter.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\ParamConverter\MenuLinkPluginConverter. + * Contains Drupal\language\ProxyClass\LanguageConverter. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\ParamConverter { +namespace Drupal\language\ProxyClass { /** - * Provides a proxy class for \Drupal\Core\ParamConverter\MenuLinkPluginConverter. + * Provides a proxy class for \Drupal\language\LanguageConverter. * * @see \Drupal\Component\ProxyBuilder */ - class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface + class LanguageConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConver protected $serviceId; /** - * @var \Drupal\Core\ParamConverter\MenuLinkPluginConverter + * @var \Drupal\language\LanguageConverter */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php b/core/modules/node/src/ProxyClass/ParamConverter/NodePreviewConverter.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php copy to core/modules/node/src/ProxyClass/ParamConverter/NodePreviewConverter.php index b9b194c..49b6018 100644 --- a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php +++ b/core/modules/node/src/ProxyClass/ParamConverter/NodePreviewConverter.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\ParamConverter\MenuLinkPluginConverter. + * Contains Drupal\node\ProxyClass\ParamConverter\NodePreviewConverter. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\ParamConverter { +namespace Drupal\node\ProxyClass\ParamConverter { /** - * Provides a proxy class for \Drupal\Core\ParamConverter\MenuLinkPluginConverter. + * Provides a proxy class for \Drupal\node\ParamConverter\NodePreviewConverter. * * @see \Drupal\Component\ProxyBuilder */ - class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface + class NodePreviewConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConver protected $serviceId; /** - * @var \Drupal\Core\ParamConverter\MenuLinkPluginConverter + * @var \Drupal\node\ParamConverter\NodePreviewConverter */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php b/core/modules/views_ui/src/ProxyClass/ViewUIConverter.php similarity index 69% copy from core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php copy to core/modules/views_ui/src/ProxyClass/ViewUIConverter.php index b9b194c..8e525cb 100644 --- a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php +++ b/core/modules/views_ui/src/ProxyClass/ViewUIConverter.php @@ -2,21 +2,21 @@ /** * @file - * Contains Drupal\Core\ProxyClass\ParamConverter\MenuLinkPluginConverter. + * Contains ui\ParamConverter\ProxyClass\ViewUIConverter. */ /** * This file is generated via core/scripts/generate-proxy-class.php. */ -namespace Drupal\Core\ProxyClass\ParamConverter { +namespace ui\ParamConverter\ProxyClass { /** - * Provides a proxy class for \Drupal\Core\ParamConverter\MenuLinkPluginConverter. + * Provides a proxy class for \Drupal\views_ui\ParamConverter\ViewUIConverter. * * @see \Drupal\Component\ProxyBuilder */ - class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface + class ViewUIConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -27,7 +27,7 @@ class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConver protected $serviceId; /** - * @var \Drupal\Core\ParamConverter\MenuLinkPluginConverter + * @var \Drupal\views_ui\ParamConverter\ViewUIConverter */ protected $service; @@ -47,8 +47,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php index 95069f8..d04227e 100644 --- a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php +++ b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php @@ -282,8 +282,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service; diff --git a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php index 1c39d7a..b8458f9 100644 --- a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php @@ -108,8 +108,7 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte protected function lazyLoadItself() { if (!isset($this->service)) { - $method_name = 'get' . \Symfony\Component\DependencyInjection\Container::camelize($this->serviceId) . 'Service'; - $this->service = $this->container->$method_name(false); + $this->service = $this->container->get($this->serviceId); } return $this->service;