[PSR-2 Compliance] The Great @codingStandardsIgnoreFile Massacre

- apply automatic PHPCBF fixes to make PHPCS happy - Step 0. Install phpcs globally: composer global require squizlabs/php_codesniffer:2.8.0 - Step 1. Execute tool to fix PSR-2 violations in PHP files: ~/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf --standard=PSR2 --extensions=php --ignore=generated/*,vendor/*,var/* .
magento · Apr 23, 2017 · c619404 · c619404
1 parent 4dc56e0
commit c619404
Show file tree

Hide file tree

Showing 247 changed files with 1,808 additions and 1,114 deletions.
diff --git a/app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php b/app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php
@@ -51,7 +51,8 @@ public function testGetLatestUnreadNotifications()
 
         // 1. Create mocks
         $notificationList = $this->getMockBuilder(
-            \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class)
+            \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
 

diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
@@ -147,9 +147,9 @@ protected function _renderItemCssClass($menuItem, $level)
         $isLast = 0 == $level && (bool)$this->getMenuModel()->isLast($menuItem) ? 'last' : '';
         $output = ($this->menuItemChecker->isItemActive(
             $this->getActiveItemModel(),
-                $menuItem,
-                $level
-            ) ? '_current _active' : '') .
+            $menuItem,
+            $level
+        ) ? '_current _active' : '') .
             ' ' .
             ($menuItem->hasChildren() ? 'parent' : '') .
             ' ' .

diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -51,7 +51,8 @@ protected function _construct()
     public function getRobotsDefaultCustomInstructions()
     {
         return trim((string)$this->_scopeConfig->getValue(
-            self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+            self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         ));
     }
 

diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -64,7 +64,7 @@ protected function _prepareForm()
                 ]
             );
             $renderer = $this->getLayout()->createBlock(
-                 \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
+                \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
             );
             $field->setRenderer($renderer);
         } else {

diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
@@ -322,7 +322,8 @@ public function testGetTotals()
         );
 
         $this->assertEquals(
-            new \Magento\Framework\DataObject(['test1' => '3', 'test2' => '2']), $this->_block->getTotals()
+            new \Magento\Framework\DataObject(['test1' => '3', 'test2' => '2']),
+            $this->_block->getTotals()
         );
     }
 

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php
@@ -76,8 +76,7 @@ public function testExecute()
 
         $messageManager->expects($this->once())
             ->method('addSuccess')
-            ->with('The JavaScript/CSS cache has been cleaned.'
-        );
+            ->with('The JavaScript/CSS cache has been cleaned.');
 
         $valueMap = [
             [\Magento\Framework\View\Asset\MergeService::class, $mergeService],

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php
@@ -23,18 +23,31 @@ protected function assertExecute($controllerName, $blockName)
         $outPut = "data";
         $resultRawMock = $this->getMock(
             \Magento\Framework\Controller\Result\Raw::class,
-            ['setContents'], [], '', false);
+            ['setContents'],
+            [],
+            '',
+            false
+        );
         $resultRawFactoryMock = $this->getMock(
             \Magento\Framework\Controller\Result\RawFactory::class,
-            ['create'], [], '', false
+            ['create'],
+            [],
+            '',
+            false
         );
         $layoutFactoryMock = $this->getMock(
             \Magento\Framework\View\LayoutFactory::class,
-            ['create'], [], '', false
+            ['create'],
+            [],
+            '',
+            false
         );
         $layoutMock = $this->getMock(
             \Magento\Framework\View\Layout::class,
-            ['createBlock', 'toHtml'], [], '', false
+            ['createBlock', 'toHtml'],
+            [],
+            '',
+            false
         );
         $layoutFactoryMock->expects($this->once())->method('create')->will($this->returnValue($layoutMock));
         $layoutMock->expects($this->once())->method('createBlock')->with($blockName)->will($this->returnSelf());

diff --git a/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php b/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php
@@ -89,7 +89,8 @@ protected function setUp()
             \Magento\Framework\Data\Form\FormKey::class,
             ['getFormKey'],
             [],
-            '', false
+            '',
+            false
         );
         $this->_formKey->expects($this->any())->method('getFormKey')->will($this->returnValue('salt'));
 

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -840,8 +840,7 @@ public function getOptionsByIds($optionIds, $product)
         $usedOptions = $product->getData($this->_keyUsedOptions);
         $usedOptionsIds = $product->getData($this->_keyUsedOptionsIds);
 
-        if (
-            !$usedOptions
+        if (!$usedOptions
             || $this->serializer->serialize($usedOptionsIds) != $this->serializer->serialize($optionIds)
         ) {
             $usedOptions = $this->_bundleOption

diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
@@ -63,8 +63,8 @@ public function testSetOption()
         $this->product->expects($this->atLeastOnce())
             ->method('getPreconfiguredValues')
             ->will($this->returnValue(
-                new \Magento\Framework\DataObject(['bundle_option' => [15 => 315, 16 => 316]]))
-            );
+                new \Magento\Framework\DataObject(['bundle_option' => [15 => 315, 16 => 316]])
+            ));
 
         $option = $this->getMock(\Magento\Bundle\Model\Option::class, [], [], '', false);
         $option->expects($this->any())->method('getId')->will($this->returnValue(15));

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -134,7 +134,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->selectionCollection = $this->getMockBuilder(
-            \Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
+            \Magento\Bundle\Model\ResourceModel\Selection\Collection::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
         $this->product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
@@ -149,13 +150,25 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->bundleSelectionMock = $this->getMock(
-            \Magento\Bundle\Model\SelectionFactory::class, ['create'], [], '', false
+            \Magento\Bundle\Model\SelectionFactory::class,
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->bundleFactoryMock = $this->getMock(
-            \Magento\Bundle\Model\ResourceModel\BundleFactory::class, ['create'], [], '', false
+            \Magento\Bundle\Model\ResourceModel\BundleFactory::class,
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->optionCollectionFactoryMock = $this->getMock(
-            \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class, ['create'], [], '', false
+            \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class,
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class, [], [], '', false);
         $this->metadataPoolMock = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
@@ -321,7 +334,11 @@ public function testAddChildNonExistingOption()
             ->will($this->returnValue(null));
 
         $optionsCollectionMock = $this->getMock(
-            \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
+            \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
+            [],
+            [],
+            '',
+            false
         );
         $optionsCollectionMock->expects($this->once())
             ->method('setIdFilter')
@@ -505,7 +522,11 @@ public function testAddChildCouldNotSave()
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
         $optionsCollectionMock = $this->getMock(
-            \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
+            \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
+            [],
+            [],
+            '',
+            false
         );
         $optionsCollectionMock->expects($this->once())
             ->method('setIdFilter')
@@ -576,7 +597,11 @@ public function testAddChild()
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
         $optionsCollectionMock = $this->getMock(
-            \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
+            \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
+            [],
+            [],
+            '',
+            false
         );
         $optionsCollectionMock->expects($this->once())
             ->method('setIdFilter')

diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
@@ -119,7 +119,8 @@ function ($type) {
             \Magento\Bundle\Pricing\Adjustment\SelectionPriceListProviderInterface::class
         )->getMock();
 
-        $this->model = (new ObjectManager($this))->getObject(\Magento\Bundle\Pricing\Adjustment\Calculator::class,
+        $this->model = (new ObjectManager($this))->getObject(
+            \Magento\Bundle\Pricing\Adjustment\Calculator::class,
             [
                 'calculator' => $this->baseCalculator,
                 'amountFactory' => $this->amountFactory,
@@ -586,7 +587,8 @@ public function testGetOptionsAmount($searchMin, $useRegularPrice)
 
         $result = $calculatorMock->getOptionsAmount(
             $this->saleableItem,
-            $exclude, $searchMin,
+            $exclude,
+            $searchMin,
             $amount,
             $useRegularPrice
         );

diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php
@@ -106,8 +106,7 @@ public function testCalculateDiscountWithDefaultAmount()
                     $this->getPriceMock(20),
                     $this->getPriceMock(40),
                 ]
-            )
-        );
+            ));
         $this->assertEquals(20, $this->calculator->calculateDiscount($this->productMock));
     }
 
@@ -122,13 +121,12 @@ public function testCalculateDiscountWithCustomAmount()
         $this->priceInfoMock->expects($this->once())
             ->method('getPrices')
             ->will($this->returnValue(
-                    [
+                [
                         $this->getPriceMock(30),
                         $this->getPriceMock(20),
                         $this->getPriceMock(40),
                     ]
-                )
-            );
+            ));
         $this->assertEquals(10, $this->calculator->calculateDiscount($this->productMock, 50));
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -85,7 +85,8 @@ protected function _prepareLayout()
         $addUrl = $this->getUrl("*/*/add", ['_current' => false, 'id' => null, '_query' => false]);
         if ($this->getStore()->getId() == Store::DEFAULT_STORE_ID) {
             $this->addChild(
-                'add_sub_button', \Magento\Backend\Block\Widget\Button::class,
+                'add_sub_button',
+                \Magento\Backend\Block\Widget\Button::class,
                 [
                     'label' => __('Add Subcategory'),
                     'onclick' => "addNew('" . $addUrl . "', false)",
@@ -97,7 +98,8 @@ protected function _prepareLayout()
 
             if ($this->canAddRootCategory()) {
                 $this->addChild(
-                    'add_root_button', \Magento\Backend\Block\Widget\Button::class,
+                    'add_root_button',
+                    \Magento\Backend\Block\Widget\Button::class,
                     [
                         'label' => __('Add Root Category'),
                         'onclick' => "addNew('" . $addUrl . "', true)",

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -24,7 +24,8 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
     protected function _prepareLayout()
     {
         $accordion = $this->getLayout()->createBlock(
-            \Magento\Backend\Block\Widget\Accordion::class)->setId('productAlerts');
+            \Magento\Backend\Block\Widget\Accordion::class
+        )->setId('productAlerts');
         /* @var $accordion \Magento\Backend\Block\Widget\Accordion */
 
         $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -311,7 +311,8 @@ public function getOptionValues()
                     $value['checkboxScopeTitle'] = $this->getCheckboxScopeHtml(
                         $option->getOptionId(),
                         'title',
-                        $option->getStoreTitle() === null);
+                        $option->getStoreTitle() === null
+                    );
                     $value['scopeTitleDisabled'] = $option->getStoreTitle() === null ? 'disabled' : null;
                 }
 
@@ -372,7 +373,8 @@ public function getOptionValues()
                         $value['checkboxScopePrice'] = $this->getCheckboxScopeHtml(
                             $option->getOptionId(),
                             'price',
-                            $option->getStorePrice() === null);
+                            $option->getStorePrice() === null
+                        );
                         $value['scopePriceDisabled'] = $option->getStorePrice() === null ? 'disabled' : null;
                     }
                 }

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -124,16 +124,16 @@ public function getAfterElementHtml()
         $newCategoryCaption = __('New Category');
 
         $button = $this->_layout->createBlock(
-             \Magento\Backend\Block\Widget\Button::class
+            \Magento\Backend\Block\Widget\Button::class
         )->setData(
-                [
+            [
                     'id' => 'add_category_button',
                     'label' => $newCategoryCaption,
                     'title' => $newCategoryCaption,
                     'onclick' => 'jQuery("#new-category").modal("openModal")',
                     'disabled' => $this->getDisabled(),
                 ]
-            );
+        );
         $return = <<<HTML
     <input id="{$htmlId}-suggest" placeholder="$suggestPlaceholder" />
     <script>

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -49,7 +49,8 @@ protected function _validateProducts()
         if (!is_array($productIds)) {
             $error = __('Please select products for attributes update.');
         } elseif (!$this->_objectManager->create(
-            \Magento\Catalog\Model\Product::class)->isProductsHasSku($productIds)) {
+            \Magento\Catalog\Model\Product::class
+        )->isProductsHasSku($productIds)) {
             $error = __('Please make sure to define SKU values for all processed products.');
         }
 

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -56,7 +56,8 @@ protected function setUp()
         );
 
         $this->requestMock = $this->getMockBuilder(
-            \Magento\Framework\App\RequestInterface::class)
+            \Magento\Framework\App\RequestInterface::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -65,12 +66,14 @@ protected function setUp()
             ->will($this->returnValue($this->requestMock));
 
         $this->urlBuilderMock = $this->getMockBuilder(
-            \Magento\Framework\UrlInterface::class)
+            \Magento\Framework\UrlInterface::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->storeManagerMock = $this->getMockBuilder(
-            \Magento\Store\Model\StoreManagerInterface::class)
+            \Magento\Store\Model\StoreManagerInterface::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
 

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/AbstractProductTest.php
@@ -123,7 +123,9 @@ public function testGetProductPriceHtml()
             ->will($this->returnValue($expectedPriceHtml));
 
         $this->assertEquals($expectedPriceHtml, $this->block->getProductPriceHtml(
-            $product, 'price_code', 'zone_code'
+            $product,
+            'price_code',
+            'zone_code'
         ));
     }
 

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
@@ -80,8 +80,7 @@ public function testGetIdentities()
                     ['product', $product],
                     ['current_category', $category],
                 ]
-            )
-        );
+            ));
         $this->assertEquals(['cat_p_1', 'cat_c_1'], $this->view->getIdentities());
     }
 }