[PSR-2 Compliance] Fix magento#8612: Hundreds of PHPCS-based static t…

…ests violations in mainline - apply automatic PHP-CS-FIXER fixes to make PHPCS happy - Step 0. Install php-cs-fixer globally: composer global require friendsofphp/php-cs-fixer:2.1.0 - Step 1. Remove outdated php-cs-fixer config: rm .php_cs - Step 2. Execute tool: ~/.composer/vendor/bin/php-cs-fixer fix . --rules=no_extra_consecutive_blank_lines,method_separation -v - Step 3. Reset changed fixture file to not break related unit test: git checkout HEAD -- lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php - Step 4. Restore outdated php-cs-fixer config: git checkout HEAD -- .php_cs
orlangur · Feb 26, 2017 · 74f3a5a · 74f3a5a
1 parent 74fbb73
commit 74f3a5a
Show file tree

Hide file tree

Showing 436 changed files with 799 additions and 931 deletions.
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
-
 /**
  * Adminhtml dashboard sales statistics bar
  *

diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -11,7 +11,6 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
-
 class Totals extends \Magento\Backend\Block\Dashboard\Bar
 {
     /**

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
@@ -65,7 +65,7 @@ protected function _prepareForm()
                     'required' => true
                 ]
             );
-            $renderer = $this->getLayout()->createBlock(
+            $renderer = $this->getLayout()->createBlock(
                  \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
             );
             $field->setRenderer($renderer);

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
@@ -9,7 +9,6 @@
  */
 namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
 
-
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**

diff --git a/app/code/Magento/Backend/Service/V1/ModuleService.php b/app/code/Magento/Backend/Service/V1/ModuleService.php
@@ -15,6 +15,7 @@ class ModuleService implements ModuleServiceInterface
      * @var \Magento\Framework\Module\ModuleListInterface
      */
     protected $moduleList;
+
     /**
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
      */

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
@@ -48,7 +48,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $context = $objectHelper->getObject(
+        $context = $objectHelper->getObject(
             \Magento\Backend\App\Action\Context::class,
             [
                 'objectManager' => $this->objectManagerMock,
@@ -58,7 +58,7 @@ protected function setUp()
             ]
         );
 
-        $this->controller = $objectHelper->getObject(
+        $this->controller = $objectHelper->getObject(
             \Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles::class,
             ['context' => $context,]
         );

diff --git a/app/code/Magento/Backup/Model/Config/Backend/Cron.php b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
@@ -23,11 +23,9 @@ class Cron extends \Magento\Framework\App\Config\Value
     /** @var \Magento\Framework\App\Config\ValueFactory */
     protected $_configValueFactory;
 
-
     /** @var string */
     protected $_runModelPath = '';
 
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry

diff --git a/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php b/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Braintree\Controller\Adminhtml\Payment;
 
-
 /**
  * Class GetNonce
  */

diff --git a/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
@@ -39,7 +39,6 @@ class DateRangeTest extends \PHPUnit_Framework_TestCase
      */
     private $filterModifierMock;
 
-
     /**
      * @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
      */

diff --git a/app/code/Magento/Bundle/Model/Link.php b/app/code/Magento/Bundle/Model/Link.php
@@ -43,7 +43,6 @@ public function setId($id)
         return $this->setData(self::KEY_ID, $id);
     }
 
-
     /**
      * {@inheritdoc}
      */

diff --git a/app/code/Magento/Bundle/Model/Option.php b/app/code/Magento/Bundle/Model/Option.php
@@ -294,5 +294,6 @@ public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionI
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Bundle/Model/Source/Option/Type.php b/app/code/Magento/Bundle/Model/Source/Option/Type.php
@@ -78,6 +78,7 @@ public function toOptionArray()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * {@inheritdoc}
      */
@@ -136,5 +137,6 @@ public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtens
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
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
@@ -51,7 +51,7 @@ protected function setUp()
             ->will($this->returnValue($this->layout));
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->block = $objectManagerHelper->getObject(
+        $this->block = $objectManagerHelper->getObject(
             \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option::class,
             ['registry' => $registry, 'context' => $context]
         );
@@ -74,7 +74,7 @@ public function testSetOption()
         $otherOption = $this->getMock(\Magento\Bundle\Model\Option::class, [], [], '', false);
         $otherOption->expects($this->any())->method('getId')->will($this->returnValue(16));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Catalog\Model\Product::class,
             ['getSelectionId', '__wakeup'],
             [],

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -135,7 +135,7 @@ protected function setUp()
             ->setMethods(['appendSelections'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->selectionCollection = $this->getMockBuilder(
+        $this->selectionCollection = $this->getMockBuilder(
             \Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -150,13 +150,13 @@ protected function setUp()
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->bundleSelectionMock = $this->getMock(
+        $this->bundleSelectionMock = $this->getMock(
             \Magento\Bundle\Model\SelectionFactory::class, ['create'], [], '', false
         );
-        $this->bundleFactoryMock = $this->getMock(
+        $this->bundleFactoryMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\BundleFactory::class, ['create'], [], '', false
         );
-        $this->optionCollectionFactoryMock = $this->getMock(
+        $this->optionCollectionFactoryMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class, ['create'], [], '', false
         );
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class, [], [], '', false);
@@ -173,7 +173,7 @@ protected function setUp()
         $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->model = $helper->getObject(
+        $this->model = $helper->getObject(
 
             LinkManagement::class,
             [
@@ -322,7 +322,7 @@ public function testAddChildNonExistingOption()
             ->method('getId')
             ->will($this->returnValue(null));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
         );
         $optionsCollectionMock->expects($this->once())
@@ -377,7 +377,7 @@ public function testAddChildLinkedProductIsComposite()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
             [],
             [],
@@ -439,7 +439,7 @@ public function testAddChildProductAlreadyExistsInOption()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
             [],
             [],
@@ -488,7 +488,6 @@ public function testAddChildCouldNotSave()
             ->with($this->linkField)
             ->willReturn($this->linkField);
 
-
         $linkedProductMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
         $linkedProductMock->expects($this->any())->method('getId')->will($this->returnValue(13));
         $linkedProductMock->expects($this->once())->method('isComposite')->will($this->returnValue(false));
@@ -507,7 +506,7 @@ public function testAddChildCouldNotSave()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
         );
         $optionsCollectionMock->expects($this->once())
@@ -578,7 +577,7 @@ public function testAddChild()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
         );
         $optionsCollectionMock->expects($this->once())
@@ -663,7 +662,7 @@ public function testSaveChild()
         $this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $store->expects($this->any())->method('getId')->will($this->returnValue(0));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Bundle\Model\Selection::class,
             [
                 'save',
@@ -737,7 +736,7 @@ public function testSaveChildFailedToSave()
         $this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $store->expects($this->any())->method('getId')->will($this->returnValue(0));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Bundle\Model\Selection::class,
             [
                 'save',
@@ -831,7 +830,7 @@ public function testSaveChildWithInvalidId()
             ->with($linkedProductSku)
             ->will($this->returnValue($linkedProductMock));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Bundle\Model\Selection::class,
             [
                 'getId',

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -1816,7 +1816,6 @@ public function testIsVirtual()
      * @param int $getSelectionsIdsIndex
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-
     protected function getSelectionsByIdsMock($selectionIds, $productMock, $getSelectionsIndex, $getSelectionsIdsIndex)
     {
         $usedSelectionsMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)

diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php
@@ -43,29 +43,29 @@ class DiscountCalculatorTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->productMock = $this->getMock(
+        $this->productMock = $this->getMock(
             \Magento\Catalog\Model\Product::class,
             [],
             [],
             '',
             false
         );
-        $this->priceInfoMock = $this->getMock(
+        $this->priceInfoMock = $this->getMock(
             \Magento\Framework\Pricing\PriceInfo\Base::class,
             ['getPrice', 'getPrices'],
             [],
             '',
             false
         );
-        $this->finalPriceMock = $this->getMock(
+        $this->finalPriceMock = $this->getMock(
             \Magento\Catalog\Pricing\Price\FinalPrice::class,
             [],
             [],
             '',
             false
         );
-        $this->priceMock = $this->getMockForAbstractClass(
-            \Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
+        $this->priceMock = $this->getMockForAbstractClass(
+            \Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
         );
         $this->calculator = new \Magento\Bundle\Pricing\Price\DiscountCalculator();
     }

diff --git a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
@@ -7,7 +7,6 @@
 
 class SocketFactory
 {
-
     /**
      * @return \Zend\Http\Client\Adapter\Socket
      */

diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
@@ -7,7 +7,6 @@
 
 class SocketFactoryTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testCreate()
     {
         $factory = new \Magento\CacheInvalidate\Model\SocketFactory();

diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
@@ -23,7 +23,6 @@ public function __construct(
         $this->resLogFactory = $resLogFactory;
     }
 
-
     /**
      * Reset Attempts For Backend
      *

diff --git a/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
@@ -29,7 +29,6 @@ public function getProductOptions(
         $requiredOnly = false
     );
 
-
     /**
      * Get custom option for a specific product
      *

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
@@ -25,7 +25,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
      */
     protected function _prepareLayout()
     {
-        $accordion = $this->getLayout()->createBlock(
+        $accordion = $this->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Accordion::class)->setId('productAlerts');
         /* @var $accordion \Magento\Backend\Block\Widget\Accordion */
 

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Sign up for an alert when the product price changes grid
  *

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Sign up for an alert when the product price changes grid
  *

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
@@ -125,7 +125,7 @@ public function getAfterElementHtml()
         $selectorOptions = $this->_jsonEncoder->encode($this->_getSelectorOptions());
         $newCategoryCaption = __('New Category');
 
-        $button = $this->_layout->createBlock(
+        $button = $this->_layout->createBlock(
              \Magento\Backend\Block\Widget\Button::class
         )->setData(
                 [

diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
@@ -104,6 +104,7 @@ public function __construct(
             $data
         );
     }
+
     // @codingStandardsIgnoreEnd
 
     /**

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Block\Product\View\Options\Type;
 
-
 /**
  * Product options text type block
  *

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -50,7 +50,7 @@ protected function _validateProducts()
         $productIds = $this->attributeHelper->getProductIds();
         if (!is_array($productIds)) {
             $error = __('Please select products for attributes update.');
-        } elseif (!$this->_objectManager->create(
+        } elseif (!$this->_objectManager->create(
             \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/Controller/Adminhtml/Product/AlertsPriceGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-
 class AlertsPriceGrid extends AbstractProductGrid
 {
     /**

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
@@ -34,6 +34,7 @@ public function __construct(
         $this->resultRawFactory = $resultRawFactory;
         $this->layoutFactory = $layoutFactory;
     }
+
     /**
      * Get specified tab grid
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
      */
     namespace Magento\Backend\Block\Dashboard;
     /**
      * Adminhtml dashboard sales statistics bar
      *
@@ Expand Down @@