diff --git a/core/modules/options/lib/Drupal/options/Plugin/views/argument/NumberListField.php b/core/modules/options/lib/Drupal/options/Plugin/views/argument/NumberListField.php
index b0a03df..b1a9475 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/views/argument/NumberListField.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/views/argument/NumberListField.php
@@ -7,11 +7,11 @@
 
 namespace Drupal\options\Plugin\views\argument;
 
+use Drupal\Core\Entity\EntityManager;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Component\Annotation\PluginID;
-use Drupal\field\FieldStorageController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -60,7 +60,12 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('plugin.manager.entity')
+    );
   }
 
   /**
diff --git a/core/modules/options/lib/Drupal/options/Plugin/views/argument/TextListField.php b/core/modules/options/lib/Drupal/options/Plugin/views/argument/TextListField.php
index a60fa97..0de4057 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/views/argument/TextListField.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/views/argument/TextListField.php
@@ -7,11 +7,11 @@
 
 namespace Drupal\options\Plugin\views\argument;
 
+use Drupal\Core\Entity\EntityManager;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\argument\String;
 use Drupal\Component\Annotation\PluginID;
-use Drupal\field\FieldStorageController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -60,7 +60,12 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('plugin.manager.entity')
+    );
   }
 
   /**
diff --git a/core/modules/options/lib/Drupal/options/Plugin/views/filter/ListField.php b/core/modules/options/lib/Drupal/options/Plugin/views/filter/ListField.php
index dbb6a3e..4c28b55 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/views/filter/ListField.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/views/filter/ListField.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\options\Plugin\views\filter;
 
+use Drupal\Core\Entity\EntityManager;
 use Drupal\views\Plugin\views\filter\ManyToOne;
 use Drupal\Component\Annotation\PluginID;
-use Drupal\field\FieldStorageController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -49,7 +49,12 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('plugin.manager.entity'));
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('plugin.manager.entity')
+    );
   }
 
   /**