Merge remote-tracking branch 'origin/MAGETWO-26762' into MAGETWO-34995

Author: vpaladiychuk

app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php

@@ -8,15 +8,6 @@
 
 class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
 {
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context
-    ) {
-        parent::__construct($context);
-    }
-
     /**
      * Administrator logout action
      *

app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php

@@ -8,17 +8,6 @@
 
 class ChangeLocale extends \Magento\Backend\Controller\Adminhtml\Index
 {
-    /**
-     * Constructor
-     *
-     * @param \Magento\Backend\App\Action\Context $context
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context
-    ) {
-        parent::__construct($context);
-    }
-
     /**
      * Change locale action
      *

app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php

@@ -8,14 +8,6 @@
 
 class Index extends \Magento\Backend\Controller\Adminhtml\Index
 {
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     */
-    public function __construct(\Magento\Backend\App\Action\Context $context)
-    {
-        parent::__construct($context);
-    }
-
     /**
      * Admin area entry point
      * Always redirects to the startup page url

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -9,14 +9,6 @@
 
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
 {
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     */
-    public function __construct(\Magento\Backend\App\Action\Context $context)
-    {
-        parent::__construct($context);
-    }
-
     /**
      * Saving edited user information
      *

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -10,15 +10,6 @@
  */
 class Category extends \Magento\Backend\App\Action
 {
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context
-    ) {
-        parent::__construct($context);
-    }
-
     /**
      * Initialize requested category and put it into registry.
      * Root category can be returned, if inappropriate store/category is specified

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php

@@ -8,23 +8,6 @@
 
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
-    /**
-     * Constructor
-     *
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Cache\FrontendInterface $attributeLabelCache
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Cache\FrontendInterface $attributeLabelCache,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
-    ) {
-        parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
-    }
-
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
      */

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php

@@ -6,28 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
-use Magento\Backend\App\Action;
-use Magento\Framework\View\Result\PageFactory;
-
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
-    /**
-     * Constructor
-     *
-     * @param Action\Context $context
-     * @param \Magento\Framework\Cache\FrontendInterface $attributeLabelCache
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param PageFactory $resultPageFactory
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Cache\FrontendInterface $attributeLabelCache,
-        \Magento\Framework\Registry $coreRegistry,
-        PageFactory $resultPageFactory
-    ) {
-        parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
-    }
-
     /**
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php

@@ -8,17 +8,6 @@
 
 class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
 {
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
-    ) {
-        parent::__construct($context, $productBuilder);
-    }
-
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
      */

app/code/Magento/Catalog/Controller/Index/Index.php

@@ -5,21 +5,8 @@
  */
 namespace Magento\Catalog\Controller\Index;
 
-use Magento\Framework\App\Action\Context;
-
 class Index extends \Magento\Framework\App\Action\Action
 {
-    /**
-     * Constructor
-     *
-     * @param Context $context
-     */
-    public function __construct(
-        Context $context
-    ) {
-        parent::__construct($context);
-    }
-
     /**
      * Index action
      *

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php

@@ -42,8 +42,9 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->resultRedirect);
 
+        $additionalParams = ['resultRedirectFactory' => $resultRedirectFactory];
         $this->action = new \Magento\Catalog\Controller\Adminhtml\Product\MassStatus(
-            $this->initContext($resultRedirectFactory),
+            $this->initContext($additionalParams),
             $productBuilder,
             $this->priceProcessor
         );