Skip to content

Commit 4dc56e0

Browse files
committed
[PSR-2 Compliance] The Great @codingStandardsIgnoreFile Massacre
- apply automatic php-cs-fixer fixes to make PHPCS happy - Step 0. Execute tool: ./vendor/bin/php-cs-fixer fix . -v
1 parent b51681c commit 4dc56e0

File tree

4,576 files changed

+6903
-8962
lines changed

Some content is hidden

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

4,576 files changed

+6903
-8962
lines changed

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* See COPYING.txt for license details.
77
*/
88

9-
109
namespace Magento\AdminNotification\Block\Grid\Renderer;
1110

1211
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
87
namespace Magento\AdminNotification\Block;
98

109
/**

app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use Magento\Framework\Notification\MessageInterface;
99
use Magento\Framework\Notification\NotifierInterface;
10-
use Magento\AdminNotification\Model\InboxInterface;
1110

1211
/**
1312
* AdminNotification Inbox model

app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
87
/**
98
* AdminNotification Inbox model
109
*

app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
87
/**
98
* Test class for \Magento\AdminNotification\Block\ToolbarEntry
109
*/

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
namespace Magento\AdminNotification\Test\Unit\Model;
88

9-
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
109
use Magento\Framework\Config\ConfigOptionsListConstants;
10+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1111

1212
/**
1313
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
77

8-
use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
9-
use Magento\Framework\Controller\ResultFactory;
108
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
119
use Magento\Catalog\Model\Product as CatalogProduct;
10+
use Magento\Framework\Controller\ResultFactory;
11+
use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
1212

1313
class GetFilter extends ExportController
1414
{

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Model\Export;
77

8-
use Magento\Store\Model\Store;
9-
use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
108
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
119
use Magento\Catalog\Model\Product as CatalogProduct;
10+
use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
11+
use Magento\Store\Model\Store;
1212

1313
/**
1414
* Export Advanced Pricing

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
99
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
1010
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
11-
use Magento\Framework\App\ResourceConnection;
1211

1312
/**
1413
* Class AdvancedPricing
@@ -68,8 +67,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
6867
ValidatorInterface::ERROR_INVALID_TIER_PRICE_TYPE => 'Value for \'tier_price_value_type\' ' .
6968
'attribute contains incorrect value, acceptable values are Fixed, Discount',
7069
ValidatorInterface::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete',
71-
ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL =>
72-
'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format',
70+
ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL => 'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format',
7371
];
7472

7573
/**

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
77

88
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
9-
use \Magento\Framework\Validator\AbstractValidator;
9+
use Magento\Framework\Validator\AbstractValidator;
1010

1111
class Validator extends AbstractValidator implements RowValidatorInterface
1212
{

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
77

88
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
9-
use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
109
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
10+
use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
1111

1212
class Website extends AbstractImportValidator implements RowValidatorInterface
1313
{
@@ -85,6 +85,6 @@ public function isValid($value)
8585
*/
8686
public function getAllWebsitesValue()
8787
{
88-
return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']';
88+
return AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $this->websiteModel->getBaseCurrency()->getCurrencyCode() . ']';
8989
}
9090
}

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Export;
77

8-
use \Magento\Store\Model\Store;
8+
use Magento\Store\Model\Store;
99

1010
/**
1111
* @SuppressWarnings(PHPMD)

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator;
88

9-
use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
9+
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
1010

1111
/**
1212
* @SuppressWarnings(PHPMD)

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator;
88

9-
use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
9+
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
1010

1111
/**
1212
* Class TierPriceTypeTest.

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing;
77

8-
use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator as Validator;
9-
use \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
8+
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator as Validator;
9+
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
1010

1111
class ValidatorTest extends \PHPUnit_Framework_TestCase
1212
{

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import;
88

9-
use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
10-
use \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
11-
use \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
9+
use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
10+
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
11+
use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
1212

1313
/**
1414
* @SuppressWarnings(PHPMD)

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Indexer\Product\Price\Plugin;
88

9-
use \Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import as Import;
9+
use Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import as Import;
1010

1111
class ImportTest extends \PHPUnit_Framework_TestCase
1212
{

app/code/Magento/Analytics/Cron/SignUp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
99
use Magento\Analytics\Model\Connector;
10-
use Magento\Framework\FlagManager;
1110
use Magento\Framework\App\Config\ReinitableConfigInterface;
1211
use Magento\Framework\App\Config\Storage\WriterInterface;
12+
use Magento\Framework\FlagManager;
1313

1414
/**
1515
* Class SignUp

app/code/Magento/Analytics/Cron/Update.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
use Magento\Analytics\Model\Connector;
99
use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
10-
use Magento\Framework\FlagManager;
1110
use Magento\Framework\App\Config\ReinitableConfigInterface;
1211
use Magento\Framework\App\Config\Storage\WriterInterface;
12+
use Magento\Framework\FlagManager;
1313

1414
/**
1515
* Class Update

app/code/Magento/Analytics/Model/Condition/CanViewNotification.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
namespace Magento\Analytics\Model\Condition;
77

8-
use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
98
use Magento\Analytics\Model\NotificationTime;
109
use Magento\Framework\Intl\DateTimeFactory;
10+
use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
1111

1212
/**
1313
* Class CanViewNotification

app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
namespace Magento\Analytics\Model\Connector\Http\Client;
77

88
use Magento\Analytics\Model\Connector\Http\ConverterInterface;
9-
use Psr\Log\LoggerInterface;
10-
use Magento\Framework\HTTP\Adapter\CurlFactory;
119
use Magento\Analytics\Model\Connector\Http\ResponseFactory;
10+
use Magento\Framework\HTTP\Adapter\CurlFactory;
11+
use Psr\Log\LoggerInterface;
1212

1313
/**
1414
* A CURL HTTP client.

app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
namespace Magento\Analytics\Model\Connector;
77

88
use Magento\Analytics\Model\AnalyticsToken;
9-
use Magento\Framework\HTTP\ZendClient;
9+
use Magento\Analytics\Model\Connector\Http\ResponseResolver;
1010
use Magento\Config\Model\Config;
11-
use Psr\Log\LoggerInterface;
11+
use Magento\Framework\HTTP\ZendClient;
1212
use Magento\Store\Model\Store;
13-
use Magento\Analytics\Model\Connector\Http\ResponseResolver;
13+
use Psr\Log\LoggerInterface;
1414

1515
/**
1616
* Command notifies MBI about that data collection was finished.

app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ReSignUp implements ResponseHandlerInterface
1919
* @var AnalyticsToken
2020
*/
2121
private $analyticsToken;
22-
22+
2323
/**
2424
* @var SubscriptionHandler
2525
*/

app/code/Magento/Analytics/Model/Connector/SignUpCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Magento\Analytics\Model\Connector\Http\ResponseResolver;
1010
use Magento\Analytics\Model\IntegrationManager;
1111
use Magento\Config\Model\Config;
12-
use Psr\Log\LoggerInterface;
1312
use Magento\Framework\HTTP\ZendClient;
1413
use Magento\Store\Model\Store;
14+
use Psr\Log\LoggerInterface;
1515

1616
/**
1717
* Class SignUpCommand

app/code/Magento/Analytics/Model/IntegrationManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
namespace Magento\Analytics\Model;
88

9+
use Magento\Config\Model\Config as SystemConfig;
910
use Magento\Framework\Exception\NoSuchEntityException;
1011
use Magento\Integration\Api\IntegrationServiceInterface;
11-
use Magento\Config\Model\Config as SystemConfig;
12-
use Magento\Integration\Model\Integration;
1312
use Magento\Integration\Api\OauthServiceInterface;
13+
use Magento\Integration\Model\Integration;
1414

1515
/**
1616
* Class IntegrationManager

app/code/Magento/Analytics/Model/Plugin/BaseUrlConfigPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
namespace Magento\Analytics\Model\Plugin;
77

88
use Magento\Analytics\Model\SubscriptionStatusProvider;
9-
use Magento\Framework\FlagManager;
109
use Magento\Framework\App\Config\Storage\WriterInterface;
10+
use Magento\Framework\FlagManager;
1111

1212
/**
1313
* Class BaseUrlConfigPlugin

app/code/Magento/Analytics/ReportXml/ConnectionFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace Magento\Analytics\ReportXml;
88

99
use Magento\Framework\App\ResourceConnection;
10-
use Magento\Framework\ObjectManagerInterface;
1110
use Magento\Framework\DB\Adapter\AdapterInterface;
11+
use Magento\Framework\ObjectManagerInterface;
1212

1313
/**
1414
* Class ConnectionFactory

app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace Magento\Analytics\ReportXml\DB\Assembler;
88

9+
use Magento\Analytics\ReportXml\DB\ConditionResolver;
910
use Magento\Analytics\ReportXml\DB\NameResolver;
1011
use Magento\Analytics\ReportXml\DB\SelectBuilder;
11-
use Magento\Analytics\ReportXml\DB\ConditionResolver;
1212

1313
/**
1414
* Class FilterAssembler

app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace Magento\Analytics\ReportXml\DB\Assembler;
88

99
use Magento\Analytics\ReportXml\DB\ColumnsResolver;
10-
use Magento\Analytics\ReportXml\DB\SelectBuilder;
1110
use Magento\Analytics\ReportXml\DB\NameResolver;
11+
use Magento\Analytics\ReportXml\DB\SelectBuilder;
1212
use Magento\Framework\App\ResourceConnection;
1313

1414
/**
@@ -57,8 +57,7 @@ public function assemble(SelectBuilder $selectBuilder, $queryConfig)
5757
{
5858
$selectBuilder->setFrom(
5959
[
60-
$this->nameResolver->getAlias($queryConfig['source']) =>
61-
$this->resourceConnection
60+
$this->nameResolver->getAlias($queryConfig['source']) => $this->resourceConnection
6261
->getTableName($this->nameResolver->getName($queryConfig['source'])),
6362
]
6463
);

app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
namespace Magento\Analytics\ReportXml\DB\Assembler;
88

9+
use Magento\Analytics\ReportXml\DB\ColumnsResolver;
10+
use Magento\Analytics\ReportXml\DB\ConditionResolver;
911
use Magento\Analytics\ReportXml\DB\NameResolver;
1012
use Magento\Analytics\ReportXml\DB\SelectBuilder;
11-
use Magento\Analytics\ReportXml\DB\ConditionResolver;
12-
use Magento\Analytics\ReportXml\DB\ColumnsResolver;
1313
use Magento\Framework\App\ResourceConnection;
1414

1515
/**

app/code/Magento/Analytics/Setup/InstallData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
namespace Magento\Analytics\Setup;
88

9+
use Magento\Analytics\Model\NotificationTime;
910
use Magento\Framework\Setup\InstallDataInterface;
1011
use Magento\Framework\Setup\ModuleContextInterface;
1112
use Magento\Framework\Setup\ModuleDataSetupInterface;
12-
use Magento\Analytics\Model\NotificationTime;
1313

1414
/**
1515
* @codeCoverageIgnore

app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ public function testExecute()
113113
*/
114114
public function testExecuteWithException(\Exception $exception)
115115
{
116-
117116
$this->resultFactoryMock
118117
->expects($this->once())
119118
->method('create')

app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Subscription/PostponeTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
namespace Magento\Analytics\Test\Unit\Controller\Adminhtml\Subscription;
88

99
use Magento\Analytics\Controller\Adminhtml\Subscription\Postpone;
10-
use Magento\Framework\App\Request\Http;
10+
use Magento\Analytics\Model\NotificationTime;
1111
use Magento\Framework\Controller\Result\Json;
1212
use Magento\Framework\Controller\ResultFactory;
13-
use Magento\Framework\Intl\DateTimeFactory;
14-
use Psr\Log\LoggerInterface;
15-
use Magento\Analytics\Model\NotificationTime;
1613
use Magento\Framework\Exception\LocalizedException;
14+
use Magento\Framework\Intl\DateTimeFactory;
1715
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
16+
use Psr\Log\LoggerInterface;
1817

1918
/**
2019
* Class PostponeTest

app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
namespace Magento\Analytics\Test\Unit\Model\Condition;
88

99
use Magento\Analytics\Model\Condition\CanViewNotification;
10-
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1110
use Magento\Analytics\Model\NotificationTime;
1211
use Magento\Framework\Intl\DateTimeFactory;
12+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1313

1414
/**
1515
* Class CanViewNotificationTest

0 commit comments

Comments
 (0)