Code Review changes: Add sortOrder to plugin, avoid returning value from beforeDispatch

lbajsarowicz · lbajsarowicz · commit 611ceb44e0b4 · 2020-02-08T23:12:50.000+01:00
diff --git a/app/code/Magento/Backend/App/Action/Plugin/LoadDesignPlugin.php b/app/code/Magento/Backend/App/Action/Plugin/LoadDesignPlugin.php
@@ -34,13 +34,11 @@ public function __construct(DesignLoader $designLoader)
      * Initiates design before dispatching Backend Actions.
      *
      * @param AbstractAction $backendAction
-     * @param array $args
-     * @return array
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeDispatch(AbstractAction $backendAction, ...$args)
+    public function beforeDispatch(AbstractAction $backendAction)
     {
         $this->designLoader->load();
-        return $args;
     }
 }
diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -62,7 +62,7 @@
     <type name="Magento\Backend\App\AbstractAction">
         <plugin name="adminAuthentication" type="Magento\Backend\App\Action\Plugin\Authentication" sortOrder="100"/>
         <plugin name="adminMassactionKey" type="Magento\Backend\App\Action\Plugin\MassactionKey" sortOrder="11"/>
-        <plugin name="adminLoadDesign" type="Magento\Backend\App\Action\Plugin\LoadDesignPlugin"/>
+        <plugin name="adminLoadDesign" type="Magento\Backend\App\Action\Plugin\LoadDesignPlugin" sortOrder="101"/>
     </type>
     <type name="Magento\Store\App\Response\Redirect">
         <arguments>

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,11 @@ public function __construct(DesignLoader $designLoader)`
`34`	`34`	`* Initiates design before dispatching Backend Actions.`
`35`	`35`	`*`
`36`	`36`	`* @param AbstractAction $backendAction`
`37`		`- * @param array $args`
`38`		`- * @return array`
	`37`	`+ * @return void`
`39`	`38`	`* @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`40`	`39`	`*/`
`41`		`- public function beforeDispatch(AbstractAction $backendAction, ...$args)`
	`40`	`+ public function beforeDispatch(AbstractAction $backendAction)`
`42`	`41`	`{`
`43`	`42`	`$this->designLoader->load();`
`44`		`- return $args;`
`45`	`43`	`}`
`46`	`44`	`}`