Skip to content

Commit 749518c

Browse files
committed
[PSR-2 Compliance] Fix #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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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
*/

0 commit comments

Comments
 (0)