diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index a951bdd..5024147 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityFormController;
 use Drupal\Core\Entity\EntityControllerInterface;
-use Drupal\Core\CacheDecorator\AliasManagerCacheDecorator;
+use Drupal\Core\Path\AliasManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -19,14 +19,21 @@
 class MenuLinkFormController extends EntityFormController implements EntityControllerInterface {
 
   /**
+   * The path alias manager.
+   *
+   * @var \Drupal\Core\Path\AliasManagerInterface
+   */
+  protected $pathAliasManager;
+
+  /**
    * Constructs a new MenuLinkFormController object.
    *
    * @param string $operation
    *   The name of the current operation.
-   * @param \Drupal\user\TempStoreFactory $temp_store_factory
-   *   The factory for the temp store object.
+   * @param \Drupal\Core\Path\AliasManagerInterface $path_alias_manager
+   *   The path alias manager.
    */
-  public function __construct($operation, AliasManagerCacheDecorator $path_alias_manager) {
+  public function __construct($operation, AliasManagerInterface $path_alias_manager) {
     parent::__construct($operation);
 
     $this->pathAliasManager = $path_alias_manager;
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
index a66d8d5..a8af957 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
@@ -37,12 +37,21 @@ class MenuLinkStorageController extends DatabaseStorageController {
   protected static $routerItemFields = array();
 
   /**
+   * The route provider service.
+   *
    * @var \Symfony\Cmf\Component\Routing\RouteProviderInterface
    */
   protected $routeProvider;
 
   /**
    * Overrides DatabaseStorageController::__construct().
+   *
+   * @param string $entityType
+   *   The entity type for which the instance is created.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection to be used.
+   * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider
+   *   The route provider service.
    */
   public function __construct($entityType, Connection $database, RouteProviderInterface $route_provider) {
     parent::__construct($entityType, $database);
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index 6a5da02..8ee10d9 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -39,6 +39,15 @@ class UserStorageController extends DatabaseStorageController {
 
   /**
    * Constructs a new UserStorageController object.
+   *
+   * @param string $entityType
+   *   The entity type for which the instance is created.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection to be used.
+   * @param \Drupal\Core\Password\PasswordInterface $password
+   *   The password hashing service.
+   * @param \Drupal\user\UserDataInterface $user_data
+   *   The user data service.
    */
   public function __construct($entity_type, Connection $database, PasswordInterface $password, UserDataInterface $user_data) {
     parent::__construct($entity_type, $database);
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
index a24185b..4a0566e 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
@@ -20,6 +20,8 @@
 class ViewAddFormController extends ViewFormControllerBase implements EntityControllerInterface {
 
   /**
+   * The wizard plugin manager.
+   *
    * @var \Drupal\views\Plugin\ViewsPluginManager
    */
   protected $wizardManager;
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 4957790..0b7a497 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -55,7 +55,7 @@ public function __construct($operation, TempStoreFactory $temp_store_factory, Re
   }
 
   /**
-   * Implements \Drupal\Core\Entity\EntityControllerInterface::createInstance().
+   * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, $entity_type, $operation = NULL) {
     return new static(