magento#28050 Get rid of ActionInterface plugins

lbajsarowicz · May 8, 2020 · 47daeaa · 47daeaa
1 parent 6b6f428
commit 47daeaa
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 211 deletions.
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
@@ -65,9 +65,6 @@
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
     <type name="Magento\Framework\App\ActionInterface">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck"/>
-        <plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\LoadDesignPlugin"/>
-        <plugin name="eventDispatch"  type="Magento\Framework\App\Action\Plugin\EventDispatchPlugin"/>
-        <plugin name="actionFlagNoDispatch"  type="Magento\Framework\App\Action\Plugin\ActionFlagNoDispatchPlugin"/>
     </type>
     <type name="Magento\Framework\Url\SecurityInfo">
         <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>

diff --git a/...rk/App/Action/Plugin/LoadDesignPlugin.php → ...Magento/Theme/Plugin/LoadDesignPlugin.php b/...rk/App/Action/Plugin/LoadDesignPlugin.php → ...Magento/Theme/Plugin/LoadDesignPlugin.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\Action\Plugin;
+namespace Magento\Theme\Plugin;
 
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Config\Dom\ValidationException;

diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
@@ -309,4 +309,7 @@
             <argument name="cache" xsi:type="object">configured_design_cache</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
+    </type>
 </config>
diff --git a/lib/internal/Magento/Framework/App/Action/Plugin/ActionFlagNoDispatchPlugin.php b/lib/internal/Magento/Framework/App/Action/Plugin/ActionFlagNoDispatchPlugin.php
diff --git a/lib/internal/Magento/Framework/App/Action/Plugin/EventDispatchPlugin.php b/lib/internal/Magento/Framework/App/Action/Plugin/EventDispatchPlugin.php