Make session classes to be instantiated configurable via DI

Author: schmengler

Plugin/SectionLoadControllerPlugin.php

@@ -3,10 +3,8 @@
 
 namespace IntegerNet\SessionUnblocker\Plugin;
 
-use \Magento\Framework\Session\Generic as GenericSession;
-use \Magento\Customer\Model\Session as CustomerSession;
-use \Magento\Framework\Message\Session as MessageSession;
-use \Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\Session\Generic as GenericSession;
+use Magento\Framework\Session\SessionManagerInterface;
 
 /**
  * We are writing this plugin to make sure sessions are all loaded before
@@ -25,10 +23,7 @@ class SectionLoadControllerPlugin
 {
     /**
      * @param GenericSession $genericSession
-     * @param CustomerSession $customerSession
-     * @param MessageSession $messageSession
-     * @param CatalogSession $catalogSession
-     * @param GenericSession $reviewSession
+     * @param SessionManagerInterface[] $additionalSessions
      *
      * Disabling 3 PHPCS rules because:
      * 1 - We are well aware that we normally shouldn't call Sessions without
@@ -43,10 +38,7 @@ class SectionLoadControllerPlugin
      */
     public function __construct(
         GenericSession $genericSession,
-        CustomerSession $customerSession,
-        MessageSession $messageSession,
-        CatalogSession $catalogSession,
-        GenericSession $reviewSession //virtualType
+        array $additionalSessions = []
     ) {
         /*
          * This is earliest moment where we can close the session,

etc/di.xml

@@ -10,7 +10,12 @@
 
     <type name="IntegerNet\SessionUnblocker\Plugin\SectionLoadControllerPlugin">
         <arguments>
-            <argument name="reviewSession" xsi:type="object">Magento\Review\Model\Session</argument>
+            <argument name="additionalSessions" xsi:type="array">
+                <item name="customerSession" xsi:type="object">Magento\Customer\Model\Session</item>
+                <item name="messageSession" xsi:type="object">Magento\Framework\Message\Session</item>
+                <item name="catalogSession" xsi:type="object">Magento\Catalog\Model\Session</item>
+                <item name="reviewSession" xsi:type="object">Magento\Review\Model\Session</item>
+            </argument>
         </arguments>
     </type>
 </config>