Skip to content

Commit 60435c2

Browse files
committed
Merge remote-tracking branch 'origin/imported-magento-magento2-31970' into 2.4-develop-pr126
2 parents 4b01d69 + 1f2883a commit 60435c2

File tree

7 files changed

+342
-419
lines changed

7 files changed

+342
-419
lines changed

app/code/Magento/Store/etc/di.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
<preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
7171
<type name="Magento\Framework\App\ActionInterface">
7272
<plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck"/>
73-
<plugin name="eventDispatch" type="Magento\Framework\App\Action\Plugin\EventDispatchPlugin"/>
74-
<plugin name="actionFlagNoDispatch" type="Magento\Framework\App\Action\Plugin\ActionFlagNoDispatchPlugin"/>
7573
</type>
7674
<type name="Magento\Framework\Url\SecurityInfo">
7775
<plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>

dev/tests/integration/testsuite/Magento/Framework/App/ControllerActionTest.php

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)