X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FController%2FControllerBase.php;h=68c2655a576f6064009da4a091e7e5f5dcb0098e;hb=refs%2Fheads%2Fd864;hp=c0d0cdd964b10149a1a4b38919bd113a7d24bc64;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website diff --git a/web/core/lib/Drupal/Core/Controller/ControllerBase.php b/web/core/lib/Drupal/Core/Controller/ControllerBase.php index c0d0cdd96..68c2655a5 100644 --- a/web/core/lib/Drupal/Core/Controller/ControllerBase.php +++ b/web/core/lib/Drupal/Core/Controller/ControllerBase.php @@ -9,6 +9,7 @@ use Drupal\Core\Routing\RedirectDestinationTrait; use Drupal\Core\Routing\UrlGeneratorTrait; use Drupal\Core\StringTranslation\StringTranslationTrait; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Messenger\MessengerTrait; /** * Utility base class for thin controllers. @@ -35,6 +36,7 @@ abstract class ControllerBase implements ContainerInjectionInterface { use LinkGeneratorTrait; use LoggerChannelTrait; + use MessengerTrait; use RedirectDestinationTrait; use StringTranslationTrait; use UrlGeneratorTrait; @@ -91,7 +93,7 @@ abstract class ControllerBase implements ContainerInjectionInterface { /** * The state service. * - * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface + * @var \Drupal\Core\State\StateInterface */ protected $stateService; @@ -220,7 +222,7 @@ abstract class ControllerBase implements ContainerInjectionInterface { * needs to be the same across development, production, etc. environments * (for example, the system maintenance message) should use config() instead. * - * @return \Drupal\Core\KeyValueStore\KeyValueStoreInterface + * @return \Drupal\Core\State\StateInterface */ protected function state() { if (!$this->stateService) {