Use setter injection for optional security token storage

contao · Jul 17, 2017 · 37b9d7c · 37b9d7c
1 parent 9e53148
commit 37b9d7c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/src/Picker/AbstractPickerProvider.php b/src/Picker/AbstractPickerProvider.php
@@ -35,12 +35,10 @@ abstract class AbstractPickerProvider implements PickerProviderInterface
      * Constructor.
      *
      * @param FactoryInterface      $menuFactory
-     * @param TokenStorageInterface $tokenStorage
      */
-    public function __construct(FactoryInterface $menuFactory, TokenStorageInterface $tokenStorage)
+    public function __construct(FactoryInterface $menuFactory)
     {
         $this->menuFactory = $menuFactory;
-        $this->tokenStorage = $tokenStorage;
     }
 
     /**
@@ -70,6 +68,16 @@ public function createMenuItem(PickerConfig $config)
         );
     }
 
+    /**
+     * Setter injection for the security token storage.
+     * 
+     * @param TokenStorageInterface $tokenStorage
+     */
+    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    {
+        $this->tokenStorage = $tokenStorage;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Picker/FilePickerProvider.php b/src/Picker/FilePickerProvider.php
@@ -28,11 +28,6 @@ class FilePickerProvider extends AbstractPickerProvider implements DcaPickerProv
 {
     use FrameworkAwareTrait;
 
-    /**
-     * @var ContaoFrameworkInterface
-     */
-    private $framework;
-
     /**
      * @var string
      */
@@ -42,13 +37,11 @@ class FilePickerProvider extends AbstractPickerProvider implements DcaPickerProv
      * Constructor.
      *
      * @param FactoryInterface         $menuFactory
-     * @param TokenStorageInterface    $tokenStorage
-     * @param ContaoFrameworkInterface $framework
      * @param string                   $uploadPath
      */
-    public function __construct(FactoryInterface $menuFactory, TokenStorageInterface $tokenStorage, $uploadPath)
+    public function __construct(FactoryInterface $menuFactory, $uploadPath)
     {
-        parent::__construct($menuFactory, $tokenStorage);
+        parent::__construct($menuFactory);
 
         $this->uploadPath = $uploadPath;
     }

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -171,7 +171,8 @@ services:
         public: false
         arguments:
             - "@knp_menu.factory"
-            - "@security.token_storage"
+        calls:
+            - [setTokenStorage, ["@security.token_storage"]]
         tags:
             - { name: contao.picker_provider, priority: 192 }
 
@@ -180,8 +181,9 @@ services:
         public: false
         arguments:
             - "@knp_menu.factory"
-            - "@security.token_storage"
             - "%contao.upload_path%"
+        calls:
+            - [setTokenStorage, ["@security.token_storage"]]
         tags:
             - { name: contao.picker_provider, priority: 160 }
 
@@ -190,7 +192,8 @@ services:
         public: false
         arguments:
             - "@knp_menu.factory"
-            - "@security.token_storage"
+        calls:
+            - [setTokenStorage, ["@security.token_storage"]]
         tags:
             - { name: contao.picker_provider }