DI compile issue

magespecialist · Sep 1, 2017 · bf02923 · bf02923
1 parent 33341ff
commit bf02923
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 18 deletions.
diff --git a/Controller/Adminhtml/Authy/Authpost.php b/Controller/Adminhtml/Authy/Authpost.php
@@ -74,7 +74,6 @@ public function __construct(
         Authy $authy,
         TfaSessionInterface $tfaSession,
         TrustedManagerInterface $trustedManager,
-        EventInterface $event,
         TfaInterface $tfa
     ) {
         parent::__construct($context);
@@ -83,7 +82,7 @@ public function __construct(
         $this->pageFactory = $pageFactory;
         $this->tfaSession = $tfaSession;
         $this->trustedManager = $trustedManager;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
         $this->authy = $authy;
     }
 

diff --git a/Controller/Adminhtml/Authy/Verifyonetouch.php b/Controller/Adminhtml/Authy/Verifyonetouch.php
@@ -73,7 +73,6 @@ public function __construct(
         TrustedManagerInterface $trustedManager,
         TfaSessionInterface $tfaSession,
         TfaInterface $tfa,
-        EventInterface $event,
         Authy $authy,
         Session $session
     ) {
@@ -84,7 +83,7 @@ public function __construct(
         $this->tfa = $tfa;
         $this->trustedManager = $trustedManager;
         $this->tfaSession = $tfaSession;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/Controller/Adminhtml/Authy/Verifypost.php b/Controller/Adminhtml/Authy/Verifypost.php
@@ -68,16 +68,15 @@ public function __construct(
         TfaInterface $tfa,
         TfaSessionInterface $tfaSession,
         Authy $authy,
-        PageFactory $pageFactory,
-        EventInterface $event
+        PageFactory $pageFactory
     ) {
         parent::__construct($context);
         $this->pageFactory = $pageFactory;
         $this->session = $session;
         $this->tfa = $tfa;
         $this->authy = $authy;
         $this->tfaSession = $tfaSession;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/Controller/Adminhtml/Duo/Authpost.php b/Controller/Adminhtml/Duo/Authpost.php
@@ -67,7 +67,6 @@ public function __construct(
         PageFactory $pageFactory,
         DuoSecurity $duoSecurity,
         TfaSessionInterface $tfaSession,
-        EventInterface $event,
         TfaInterface $tfa
     ) {
         parent::__construct($context);
@@ -76,7 +75,7 @@ public function __construct(
         $this->pageFactory = $pageFactory;
         $this->tfaSession = $tfaSession;
         $this->duoSecurity = $duoSecurity;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/Controller/Adminhtml/Google/Authpost.php b/Controller/Adminhtml/Google/Authpost.php
@@ -73,7 +73,6 @@ public function __construct(
         Google $google,
         TfaSessionInterface $tfaSession,
         TrustedManagerInterface $trustedManager,
-        EventInterface $event,
         TfaInterface $tfa
     ) {
         parent::__construct($context);
@@ -83,7 +82,7 @@ public function __construct(
         $this->google = $google;
         $this->tfaSession = $tfaSession;
         $this->trustedManager = $trustedManager;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/Controller/Adminhtml/Google/Configurepost.php b/Controller/Adminhtml/Google/Configurepost.php
@@ -66,7 +66,6 @@ public function __construct(
         PageFactory $pageFactory,
         Google $google,
         TfaSessionInterface $tfaSession,
-        EventInterface $event,
         TfaInterface $tfa
     ) {
         parent::__construct($context);
@@ -75,7 +74,7 @@ public function __construct(
         $this->pageFactory = $pageFactory;
         $this->google = $google;
         $this->tfaSession = $tfaSession;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/Controller/Adminhtml/U2f/Authpost.php b/Controller/Adminhtml/U2f/Authpost.php
@@ -71,7 +71,6 @@ public function __construct(
         TfaSessionInterface $tfaSession,
         TrustedManagerInterface $trustedManager,
         U2fKey $u2fKey,
-        EventInterface $event,
         Action\Context $context
     ) {
         parent::__construct($context);
@@ -82,7 +81,7 @@ public function __construct(
         $this->jsonFactory = $jsonFactory;
         $this->tfaSession = $tfaSession;
         $this->trustedManager = $trustedManager;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/Controller/Adminhtml/U2f/Configurepost.php b/Controller/Adminhtml/U2f/Configurepost.php
@@ -66,7 +66,6 @@ public function __construct(
         JsonFactory $jsonFactory,
         TfaSessionInterface $tfaSession,
         U2fKey $u2fKey,
-        EventInterface $event,
         Action\Context $context
     ) {
         parent::__construct($context);
@@ -76,7 +75,7 @@ public function __construct(
         $this->u2fKey = $u2fKey;
         $this->jsonFactory = $jsonFactory;
         $this->tfaSession = $tfaSession;
-        $this->event = $event;
+        $this->event = $context->getEventManager();
     }
 
     /**

diff --git a/etc/module.xml b/etc/module.xml
@@ -21,7 +21,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MSP_TwoFactorAuth" setup_version="2.0.6">
+    <module name="MSP_TwoFactorAuth" setup_version="2.0.7">
         <sequence>
             <module name="MSP_SecuritySuiteCommon"/>
             <module name="Magento_User"/>