diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php index c497c14..bffc23f 100644 --- a/core/lib/Drupal/Core/Controller/ControllerBase.php +++ b/core/lib/Drupal/Core/Controller/ControllerBase.php @@ -31,46 +31,64 @@ abstract class ControllerBase { /** + * The entity manager. + * * @var \Drupal\Core\Entity\EntityManager */ protected $entityManager; /** + * The language manager. + * * @var \Drupal\Core\Language\LanguageManager */ protected $languageManager; /** + * The translation manager. + * * @var \Drupal\Core\StringTranslation\TranslationInterface */ protected $translationManager; /** + * The configuration factory. + * * @var \Drupal\Core\Config\Config */ protected $configFactory; /** + * The key-value storage. + * * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface */ - protected $kv; + protected $keyValue; /** + * The url generator. + * * @var \Drupal\Core\Routing\UrlGeneratorInterface */ protected $urlGenerator; /** + * The current user service. + * * @var \Drupal\Core\Session\AccountInterface */ protected $currentUser; /** + * The state service. + * * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface */ protected $stateService; /** + * The module handler. + * * @var \Drupal\Core\Extension\ModuleHandlerInterface */ protected $moduleHandler; @@ -134,10 +152,10 @@ protected function config($name) { * @return \Drupal\Core\KeyValueStore\KeyValueStoreInterface */ protected function keyValue($collection) { - if (!$this->kv) { - $this->kv = $this->container()->get('keyvalue')->get($collection); + if (!$this->keyValue) { + $this->keyValue = $this->container()->get('keyvalue')->get($collection); } - return $this->kv; + return $this->keyValue; } /**