[PSR-2 Compliance] The Great @codingStandardsIgnoreFile Massacre

orlangur · orlangur · commit c87c521bb066 · 2017-04-22T22:46:01.000-04:00
- apply manual fixes to make PHPMD happy
diff --git a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
@@ -28,7 +28,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      *
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
@@ -28,7 +28,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      *
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php b/app/code/Magento/Catalog/Test/Unit/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\System\Config\Backend\Catalog\Url\Rewrite;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SuffixTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/CatalogRule/Model/ResourceModel/ReadHandler.php
@@ -41,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php
@@ -41,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Relation/Store/SaveHandler.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Relation/Store/SaveHandler.php
@@ -42,6 +42,7 @@ public function __construct(
      * @param array $arguments
      * @return object
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Relation/Store/SaveHandler.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Relation/Store/SaveHandler.php
@@ -42,6 +42,7 @@ public function __construct(
      * @param array $arguments
      * @return object
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
@@ -6,6 +6,10 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Helper;
 
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Framework\DataObject;
+
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -19,27 +23,21 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected $_imageHelperMock;
 
     /**
-     * @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_productMock;
 
     protected function setUp()
     {
         $this->_imageHelperMock = $this->getMock(\Magento\Catalog\Helper\Image::class, [], [], '', false);
-        $this->_productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
+        $this->_productMock = $this->getMock(Product::class, [], [], '', false);
 
         $this->_model = new \Magento\ConfigurableProduct\Helper\Data($this->_imageHelperMock);
     }
 
     public function testGetAllowAttributes()
     {
-        $typeInstanceMock = $this->getMock(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::class,
-            [],
-            [],
-            '',
-            false
-        );
+        $typeInstanceMock = $this->getMock(Configurable::class, [], [], '', false);
         $typeInstanceMock->expects($this->once())
             ->method('getConfigurableAttributes')
             ->with($this->_productMock);
@@ -93,39 +91,14 @@ public function testGetOptions(array $expected, array $data)
      */
     public function getOptionsDataProvider()
     {
-        $currentProductMock = $this->getMock(
-            \Magento\Catalog\Model\Product::class,
-            ['getTypeInstance', '__wakeup'],
-            [],
-            '',
-            false
-        );
-        $provider = [];
-        $provider[] = [
-            [],
-            [
-                'allowed_products' => [],
-                'current_product_mock' => $currentProductMock,
-            ],
-        ];
+        $currentProductMock = $this->getMock(Product::class, ['getTypeInstance', '__wakeup'], [], '', false);
+        $provider = [[[], ['allowed_products' => [], 'current_product_mock' => $currentProductMock]]];
 
         $attributesCount = 3;
         $attributes = [];
         for ($i = 1; $i < $attributesCount; $i++) {
-            $attribute = $this->getMock(
-                \Magento\Framework\DataObject::class,
-                ['getProductAttribute'],
-                [],
-                '',
-                false
-            );
-            $productAttribute = $this->getMock(
-                \Magento\Framework\DataObject::class,
-                ['getId', 'getAttributeCode'],
-                [],
-                '',
-                false
-            );
+            $attribute = $this->getMock(DataObject::class, ['getProductAttribute'], [], '', false);
+            $productAttribute = $this->getMock(DataObject::class, ['getId', 'getAttributeCode'], [], '', false);
             $productAttribute->expects($this->any())
                 ->method('getId')
                 ->will($this->returnValue('attribute_id_' . $i));
@@ -137,13 +110,7 @@ public function getOptionsDataProvider()
                 ->will($this->returnValue($productAttribute));
             $attributes[] = $attribute;
         }
-        $typeInstanceMock = $this->getMock(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::class,
-            [],
-            [],
-            '',
-            false
-        );
+        $typeInstanceMock = $this->getMock(Configurable::class, [], [], '', false);
         $typeInstanceMock->expects($this->any())
             ->method('getConfigurableAttributes')
             ->will($this->returnValue($attributes));
@@ -153,7 +120,7 @@ public function getOptionsDataProvider()
         $allowedProducts = [];
         for ($i = 1; $i <= 2; $i++) {
             $productMock = $this->getMock(
-                \Magento\Catalog\Model\Product::class,
+                Product::class,
                 ['getData', 'getImage', 'getId', '__wakeup', 'getMediaGalleryImages'],
                 [],
                 '',
@@ -261,7 +228,7 @@ private function getImagesCollection()
             ->getMock();
 
         $items = [
-            new \Magento\Framework\DataObject([
+            new DataObject([
                 'file' => 'test_file'
             ]),
         ];
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -30,6 +30,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class CreatePost extends \Magento\Customer\Controller\AbstractAccount
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
@@ -13,6 +13,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class SaveTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/app/code/Magento/Directory/Model/Country.php b/app/code/Magento/Directory/Model/Country.php
@@ -15,6 +15,7 @@
  * @method \Magento\Directory\Model\Country setCountryId(string $value)
  *
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Country extends \Magento\Framework\Model\AbstractModel
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payment/Method/Billing/AbstractAgreementStub.php b/app/code/Magento/Paypal/Test/Unit/Model/Payment/Method/Billing/AbstractAgreementStub.php
@@ -22,6 +22,7 @@ public function getCode()
     /**
      * @param object $quote
      * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _isAvailable($quote)
     {
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
@@ -7,6 +7,10 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ */
 class ObserverTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -85,9 +85,7 @@ protected function _construct()
                             params.form_key = FORM_KEY;
                         }
                         new Ajax.Updater("rating_detail", "' .
-            $this->getUrl(
-                'review/product/ratingItems'
-            ) .
+            $this->getUrl('review/product/ratingItems') .
             '", {
                 parameters:params, 
                 evalScripts: true,  
@@ -101,9 +99,7 @@ protected function _construct()
                             $("product_id").value = response.id;
 
                             $("product_name").innerHTML = \'<a href="' .
-            $this->getUrl(
-                'catalog/product/edit'
-            ) .
+            $this->getUrl('catalog/product/edit') .
             'id/\' + response.id + \'" target="_blank">\' + response.name + \'</a>\';
                         } else if ( response.message ) {
                             alert(response.message);
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
@@ -18,7 +18,7 @@
 use Magento\Sales\Model\ValidatorResultMerger;
 
 /**
- * Class RefundInvoice
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RefundInvoice implements RefundInvoiceInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php b/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
@@ -61,6 +61,7 @@ public function __construct(
      * @param array $packages
      * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return \Magento\Sales\Model\ValidatorResultInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function validate(
         $order,
@@ -73,18 +74,10 @@ public function validate(
         array $packages = [],
         \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface $arguments = null
     ) {
-        $orderValidationResult = $this->orderValidator->validate(
-            $order,
-            [
-                CanShip::class
-            ]
-        );
+        $orderValidationResult = $this->orderValidator->validate($order, [CanShip::class]);
         $shipmentValidationResult = $this->shipmentValidator->validate(
             $shipment,
-            [
-                QuantityValidator::class,
-                TrackValidator::class
-            ]
+            [QuantityValidator::class, TrackValidator::class]
         );
 
         return $this->validatorResultMerger->merge($orderValidationResult, $shipmentValidationResult);
diff --git a/app/code/Magento/Sales/Setup/UpgradeData.php b/app/code/Magento/Sales/Setup/UpgradeData.php
@@ -10,7 +10,7 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 
 /**
- * Data upgrade script
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UpgradeData implements \Magento\Framework\Setup\UpgradeDataInterface
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
+use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Framework\App\ActionFlag;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 
@@ -51,12 +54,12 @@ class CaptureTest extends \PHPUnit_Framework_TestCase
     protected $helperMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultRedirectFactoryMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultForwardFactoryMock;
 
@@ -103,27 +106,15 @@ protected function setUp()
             ->setMethods([])
             ->getMock();
 
-        $this->actionFlagMock = $this->getMockBuilder(\Magento\Framework\App\ActionFlag::class)
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
+        $this->actionFlagMock = $this->getMock(ActionFlag::class, [], [], '', false);
 
         $this->helperMock = $this->getMockBuilder(\Magento\Backend\Helper\Data::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
 
-        $this->resultRedirectFactoryMock = $this->getMockBuilder(
-            \Magento\Backend\Model\View\Result\RedirectFactory::class
-        )->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
-        $this->resultForwardFactoryMock = $this->getMockBuilder(
-            \Magento\Backend\Model\View\Result\ForwardFactory::class
-        )->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
+        $this->resultRedirectFactoryMock = $this->getMock(RedirectFactory::class, ['create'], [], '', false);
+        $this->resultForwardFactoryMock = $this->getMock(ForwardFactory::class, ['create'], [], '', false);
 
         $contextMock = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
@@ -41,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
@@ -41,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
@@ -42,6 +42,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
@@ -43,6 +43,7 @@ class Renderer extends \Magento\Backend\Block\Template
      * @param TaxHelper $taxHelper
      * @param ItemPriceRenderer $itemPriceRenderer
      * @param array $data
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
@@ -58,6 +58,7 @@ public function collect(
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return array|null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
@@ -61,6 +61,7 @@ public function collect(
      * @param Address\Total $total
      * @return null
      * @codeCoverageIgnore
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
diff --git a/app/code/Magento/Theme/Model/Design/Config/Validator.php b/app/code/Magento/Theme/Model/Design/Config/Validator.php
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Column.php b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
diff --git a/app/code/Magento/Wishlist/Observer/CustomerLogout.php b/app/code/Magento/Wishlist/Observer/CustomerLogout.php
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Mtf/App/State/NotificationTimeHandler.php b/dev/tests/functional/tests/app/Magento/Analytics/Mtf/App/State/NotificationTimeHandler.php
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(`
`28`	`28`	`* @param \Magento\Framework\Event\Observer $observer`
`29`	`29`	`* @return $this`
`30`	`30`	`*`
`31`		`- * @SuppressWarnings(PHPMD.UnusedLocalVariable)`
	`31`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`32`	`32`	`*/`
`33`	`33`	`public function execute(\Magento\Framework\Event\Observer $observer)`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\Catalog\Test\Unit\Model\System\Config\Backend\Catalog\Url\Rewrite;`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`10`	`+ */`
`8`	`11`	`class SuffixTest extends \PHPUnit_Framework_TestCase`
`9`	`12`	`{`
`10`	`13`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public function __construct(`
`41`	`41`	`* @param array $arguments`
`42`	`42`	`* @return array`
`43`	`43`	`* @throws \Exception`
	`44`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`44`	`45`	`*/`
`45`	`46`	`public function execute($entityType, $entityData, $arguments = [])`
`46`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function __construct(`
`42`	`42`	`* @param array $arguments`
`43`	`43`	`* @return object`
`44`	`44`	`* @throws \Exception`
	`45`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`45`	`46`	`*/`
`46`	`47`	`public function execute($entity, $arguments = [])`
`47`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`33`	`+ * @SuppressWarnings(PHPMD.TooManyFields)`
`33`	`34`	`*/`
`34`	`35`	`class CreatePost extends \Magento\Customer\Controller\AbstractAccount`
`35`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`16`	`+ * @SuppressWarnings(PHPMD.TooManyFields)`
`16`	`17`	`*/`
`17`	`18`	`class SaveTest extends \PHPUnit_Framework_TestCase`
`18`	`19`	`{`