Skip to content

Commit 749518c

Browse files
orlangurorlangur
committed
[PSR-2 Compliance] Fix magento#8612: Hundreds of PHPCS-based static tests 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/friendsofphp/php-cs-fixer/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
1 parent 8d379e6 commit 749518c

File tree

435 files changed

+826
-958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+826
-958
lines changed

‎app/code/Magento/Backend/Block/Dashboard/Sales.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\Backend\Block\Dashboard;
77

8-
98
/**
109
* Adminhtml dashboard sales statistics bar
1110
*

‎app/code/Magento/Backend/Block/Dashboard/Totals.php

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212
namespace Magento\Backend\Block\Dashboard;
1313

14-
1514
class Totals extends \Magento\Backend\Block\Dashboard\Bar
1615
{
1716
/**

‎app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function _prepareForm()
6565
'required' => true
6666
]
6767
);
68-
$renderer = $this->getLayout()->createBlock(
68+
$renderer = $this->getLayout()->createBlock(
6969
\Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
7070
);
7171
$field->setRenderer($renderer);

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
1111

12-
1312
class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1413
{
1514
/**

‎app/code/Magento/Backend/Service/V1/ModuleService.php

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class ModuleService implements ModuleServiceInterface
1515
* @var \Magento\Framework\Module\ModuleListInterface
1616
*/
1717
protected $moduleList;
18+
1819
/**
1920
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
2021
*/

‎app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function setUp()
4848
->disableOriginalConstructor()
4949
->getMock();
5050
$objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
51-
$context = $objectHelper->getObject(
51+
$context = $objectHelper->getObject(
5252
\Magento\Backend\App\Action\Context::class,
5353
[
5454
'objectManager' => $this->objectManagerMock,
@@ -58,7 +58,7 @@ protected function setUp()
5858
]
5959
);
6060

61-
$this->controller = $objectHelper->getObject(
61+
$this->controller = $objectHelper->getObject(
6262
\Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles::class,
6363
['context' => $context,]
6464
);

‎app/code/Magento/Backup/Model/Config/Backend/Cron.php

-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ class Cron extends \Magento\Framework\App\Config\Value
2323
/** @var \Magento\Framework\App\Config\ValueFactory */
2424
protected $_configValueFactory;
2525

26-
2726
/** @var string */
2827
protected $_runModelPath = '';
2928

30-
3129
/**
3230
* @param \Magento\Framework\Model\Context $context
3331
* @param \Magento\Framework\Registry $registry

‎app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\Braintree\Controller\Adminhtml\Payment;
77

8-
98
/**
109
* Class GetNonce
1110
*/

‎app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class DateRangeTest extends \PHPUnit_Framework_TestCase
3939
*/
4040
private $filterModifierMock;
4141

42-
4342
/**
4443
* @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
4544
*/

‎app/code/Magento/Bundle/Model/Link.php

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public function setId($id)
4343
return $this->setData(self::KEY_ID, $id);
4444
}
4545

46-
4746
/**
4847
* {@inheritdoc}
4948
*/

‎app/code/Magento/Bundle/Model/Option.php

+1
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,6 @@ public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionI
294294
{
295295
return $this->_setExtensionAttributes($extensionAttributes);
296296
}
297+
297298
//@codeCoverageIgnoreEnd
298299
}

‎app/code/Magento/Bundle/Model/Source/Option/Type.php

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public function toOptionArray()
7878
}
7979

8080
//@codeCoverageIgnoreStart
81+
8182
/**
8283
* {@inheritdoc}
8384
*/
@@ -136,5 +137,6 @@ public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtens
136137
{
137138
return $this->_setExtensionAttributes($extensionAttributes);
138139
}
140+
139141
//@codeCoverageIgnoreEnd
140142
}

‎app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function setUp()
5151
->will($this->returnValue($this->layout));
5252

5353
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
54-
$this->block = $objectManagerHelper->getObject(
54+
$this->block = $objectManagerHelper->getObject(
5555
\Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option::class,
5656
['registry' => $registry, 'context' => $context]
5757
);
@@ -74,7 +74,7 @@ public function testSetOption()
7474
$otherOption = $this->getMock(\Magento\Bundle\Model\Option::class, [], [], '', false);
7575
$otherOption->expects($this->any())->method('getId')->will($this->returnValue(16));
7676

77-
$selection = $this->getMock(
77+
$selection = $this->getMock(
7878
\Magento\Catalog\Model\Product::class,
7979
['getSelectionId', '__wakeup'],
8080
[],

‎app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php

+13-14
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function setUp()
135135
->setMethods(['appendSelections'])
136136
->disableOriginalConstructor()
137137
->getMock();
138-
$this->selectionCollection = $this->getMockBuilder(
138+
$this->selectionCollection = $this->getMockBuilder(
139139
\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
140140
->disableOriginalConstructor()
141141
->getMock();
@@ -150,13 +150,13 @@ protected function setUp()
150150
->setMethods(['create'])
151151
->disableOriginalConstructor()
152152
->getMock();
153-
$this->bundleSelectionMock = $this->getMock(
153+
$this->bundleSelectionMock = $this->getMock(
154154
\Magento\Bundle\Model\SelectionFactory::class, ['create'], [], '', false
155155
);
156-
$this->bundleFactoryMock = $this->getMock(
156+
$this->bundleFactoryMock = $this->getMock(
157157
\Magento\Bundle\Model\ResourceModel\BundleFactory::class, ['create'], [], '', false
158158
);
159-
$this->optionCollectionFactoryMock = $this->getMock(
159+
$this->optionCollectionFactoryMock = $this->getMock(
160160
\Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class, ['create'], [], '', false
161161
);
162162
$this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class, [], [], '', false);
@@ -173,7 +173,7 @@ protected function setUp()
173173
$this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
174174
->disableOriginalConstructor()
175175
->getMock();
176-
$this->model = $helper->getObject(
176+
$this->model = $helper->getObject(
177177

178178
LinkManagement::class,
179179
[
@@ -322,7 +322,7 @@ public function testAddChildNonExistingOption()
322322
->method('getId')
323323
->will($this->returnValue(null));
324324

325-
$optionsCollectionMock = $this->getMock(
325+
$optionsCollectionMock = $this->getMock(
326326
\Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
327327
);
328328
$optionsCollectionMock->expects($this->once())
@@ -377,7 +377,7 @@ public function testAddChildLinkedProductIsComposite()
377377
->getMock();
378378
$option->expects($this->once())->method('getId')->will($this->returnValue(1));
379379

380-
$optionsCollectionMock = $this->getMock(
380+
$optionsCollectionMock = $this->getMock(
381381
\Magento\Bundle\Model\ResourceModel\Option\Collection::class,
382382
[],
383383
[],
@@ -439,7 +439,7 @@ public function testAddChildProductAlreadyExistsInOption()
439439
->getMock();
440440
$option->expects($this->once())->method('getId')->will($this->returnValue(1));
441441

442-
$optionsCollectionMock = $this->getMock(
442+
$optionsCollectionMock = $this->getMock(
443443
\Magento\Bundle\Model\ResourceModel\Option\Collection::class,
444444
[],
445445
[],
@@ -488,7 +488,6 @@ public function testAddChildCouldNotSave()
488488
->with($this->linkField)
489489
->willReturn($this->linkField);
490490

491-
492491
$linkedProductMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
493492
$linkedProductMock->expects($this->any())->method('getId')->will($this->returnValue(13));
494493
$linkedProductMock->expects($this->once())->method('isComposite')->will($this->returnValue(false));
@@ -507,7 +506,7 @@ public function testAddChildCouldNotSave()
507506
->getMock();
508507
$option->expects($this->once())->method('getId')->will($this->returnValue(1));
509508

510-
$optionsCollectionMock = $this->getMock(
509+
$optionsCollectionMock = $this->getMock(
511510
\Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
512511
);
513512
$optionsCollectionMock->expects($this->once())
@@ -578,7 +577,7 @@ public function testAddChild()
578577
->getMock();
579578
$option->expects($this->once())->method('getId')->will($this->returnValue(1));
580579

581-
$optionsCollectionMock = $this->getMock(
580+
$optionsCollectionMock = $this->getMock(
582581
\Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
583582
);
584583
$optionsCollectionMock->expects($this->once())
@@ -663,7 +662,7 @@ public function testSaveChild()
663662
$this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
664663
$store->expects($this->any())->method('getId')->will($this->returnValue(0));
665664

666-
$selection = $this->getMock(
665+
$selection = $this->getMock(
667666
\Magento\Bundle\Model\Selection::class,
668667
[
669668
'save',
@@ -737,7 +736,7 @@ public function testSaveChildFailedToSave()
737736
$this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
738737
$store->expects($this->any())->method('getId')->will($this->returnValue(0));
739738

740-
$selection = $this->getMock(
739+
$selection = $this->getMock(
741740
\Magento\Bundle\Model\Selection::class,
742741
[
743742
'save',
@@ -831,7 +830,7 @@ public function testSaveChildWithInvalidId()
831830
->with($linkedProductSku)
832831
->will($this->returnValue($linkedProductMock));
833832

834-
$selection = $this->getMock(
833+
$selection = $this->getMock(
835834
\Magento\Bundle\Model\Selection::class,
836835
[
837836
'getId',

‎app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,6 @@ public function testIsVirtual()
18341834
* @param int $getSelectionsIdsIndex
18351835
* @return \PHPUnit_Framework_MockObject_MockObject
18361836
*/
1837-
18381837
protected function getSelectionsByIdsMock($selectionIds, $productMock, $getSelectionsIndex, $getSelectionsIdsIndex)
18391838
{
18401839
$usedSelectionsMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)

‎app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@ class DiscountCalculatorTest extends \PHPUnit_Framework_TestCase
4343
*/
4444
protected function setUp()
4545
{
46-
$this->productMock = $this->getMock(
46+
$this->productMock = $this->getMock(
4747
\Magento\Catalog\Model\Product::class,
4848
[],
4949
[],
5050
'',
5151
false
5252
);
53-
$this->priceInfoMock = $this->getMock(
53+
$this->priceInfoMock = $this->getMock(
5454
\Magento\Framework\Pricing\PriceInfo\Base::class,
5555
['getPrice', 'getPrices'],
5656
[],
5757
'',
5858
false
5959
);
60-
$this->finalPriceMock = $this->getMock(
60+
$this->finalPriceMock = $this->getMock(
6161
\Magento\Catalog\Pricing\Price\FinalPrice::class,
6262
[],
6363
[],
6464
'',
6565
false
6666
);
67-
$this->priceMock = $this->getMockForAbstractClass(
68-
\Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
67+
$this->priceMock = $this->getMockForAbstractClass(
68+
\Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
6969
);
7070
$this->calculator = new \Magento\Bundle\Pricing\Price\DiscountCalculator();
7171
}

‎app/code/Magento/CacheInvalidate/Model/SocketFactory.php

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
class SocketFactory
99
{
10-
1110
/**
1211
* @return \Zend\Http\Client\Adapter\Socket
1312
*/

‎app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
class SocketFactoryTest extends \PHPUnit_Framework_TestCase
99
{
10-
1110
public function testCreate()
1211
{
1312
$factory = new \Magento\CacheInvalidate\Model\SocketFactory();

‎app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public function __construct(
2323
$this->resLogFactory = $resLogFactory;
2424
}
2525

26-
2726
/**
2827
* Reset Attempts For Backend
2928
*

‎app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public function getProductOptions(
2929
$requiredOnly = false
3030
);
3131

32-
3332
/**
3433
* Get custom option for a specific product
3534
*

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
2525
*/
2626
protected function _prepareLayout()
2727
{
28-
$accordion = $this->getLayout()->createBlock(
28+
$accordion = $this->getLayout()->createBlock(
2929
\Magento\Backend\Block\Widget\Accordion::class)->setId('productAlerts');
3030
/* @var $accordion \Magento\Backend\Block\Widget\Accordion */
3131

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
87
/**
98
* Sign up for an alert when the product price changes grid
109
*

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
87
/**
98
* Sign up for an alert when the product price changes grid
109
*

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function getAfterElementHtml()
125125
$selectorOptions = $this->_jsonEncoder->encode($this->_getSelectorOptions());
126126
$newCategoryCaption = __('New Category');
127127

128-
$button = $this->_layout->createBlock(
128+
$button = $this->_layout->createBlock(
129129
\Magento\Backend\Block\Widget\Button::class
130130
)->setData(
131131
[

‎app/code/Magento/Catalog/Block/Product/View.php

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public function __construct(
104104
$data
105105
);
106106
}
107+
107108
// @codingStandardsIgnoreEnd
108109

109110
/**

‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\Catalog\Block\Product\View\Options\Type;
77

8-
98
/**
109
* Product options text type block
1110
*

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function _validateProducts()
5050
$productIds = $this->attributeHelper->getProductIds();
5151
if (!is_array($productIds)) {
5252
$error = __('Please select products for attributes update.');
53-
} elseif (!$this->_objectManager->create(
53+
} elseif (!$this->_objectManager->create(
5454
\Magento\Catalog\Model\Product::class)->isProductsHasSku($productIds)) {
5555
$error = __('Please make sure to define SKU values for all processed products.');
5656
}

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
namespace Magento\Catalog\Controller\Adminhtml\Product;
88

9-
109
class AlertsPriceGrid extends AbstractProductGrid
1110
{
1211
/**

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public function __construct(
3434
$this->resultRawFactory = $resultRawFactory;
3535
$this->layoutFactory = $layoutFactory;
3636
}
37+
3738
/**
3839
* Get specified tab grid
3940
*

0 commit comments

Comments
 (0)