[PSR-2 Compliance] The Great @codingStandardsIgnoreFile Massacre

.php_cs.dist

@@ -8,29 +8,16 @@
  * Pre-commit hook installation:
  * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
  */
-$finder = PhpCsFixer\Finder::create()
-    ->name('*.phtml')
-    ->exclude('dev/tests/functional/generated')
-    ->exclude('dev/tests/functional/var')
-    ->exclude('dev/tests/functional/vendor')
-    ->exclude('dev/tests/integration/tmp')
-    ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/Cm')
-    ->exclude('lib/internal/Credis')
-    ->exclude('lib/internal/Less')
-    ->exclude('lib/internal/LinLibertineFont')
-    ->exclude('pub/media')
-    ->exclude('pub/static')
-    ->exclude('setup/vendor')
-    ->exclude('var');
 
 return PhpCsFixer\Config::create()
-    ->setFinder($finder)
+    ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'concat_space' => ['spacing' => 'one'],
         'include' => true,
+        'is_null' => ['use_yoda_style' => false],
+        'method_separation' => true,
         'new_with_braces' => true,
         'no_empty_statement' => true,
         'no_extra_consecutive_blank_lines' => true,
@@ -46,4 +33,19 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'standardize_not_equals' => true,
         'ternary_operator_spaces' => true,
-    ]);
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->name('*.phtml')
+            ->exclude('dev/tests/functional/generated')
+            ->exclude('dev/tests/functional/var')
+            ->exclude('dev/tests/functional/vendor')
+            ->exclude('dev/tests/integration/tmp')
+            ->exclude('dev/tests/integration/var')
+            ->exclude('generated')
+            ->exclude('lib/internal/LinLibertineFont')
+            ->exclude('pub/media')
+            ->exclude('pub/static')
+            ->exclude('setup/vendor')
+            ->exclude('var')
+    );

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

@@ -6,8 +6,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
@@ -39,9 +37,8 @@ public function __construct(
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
-            'Read Details'
-        ) . '</a>' : '';
+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">'
+            . __('Read Details') . '</a>' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',

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

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Block;
 
 /**

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

@@ -7,7 +7,6 @@
 
 use Magento\Framework\Notification\MessageInterface;
 use Magento\Framework\Notification\NotifierInterface;
-use Magento\AdminNotification\Model\InboxInterface;
 
 /**
  * AdminNotification Inbox model

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

@@ -4,21 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * AdminNotification Inbox model
  *
  * @author      Magento Core Team <[email protected]>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
 class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**
      * Add remove filter
      *
-     * @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+     * @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|AbstractCollection
      */
     protected function _initSelect()
     {

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

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Test class for \Magento\AdminNotification\Block\ToolbarEntry
  */
@@ -53,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();
 

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

@@ -6,8 +6,8 @@
 
 namespace Magento\AdminNotification\Test\Unit\Model;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

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

@@ -5,10 +5,10 @@
  */
 namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
 
-use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 
 class GetFilter extends ExportController
 {

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

@@ -5,10 +5,10 @@
  */
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
-use Magento\Store\Model\Store;
-use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\Store\Model\Store;
 
 /**
  * Export Advanced Pricing

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

@@ -8,7 +8,6 @@
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\Framework\App\ResourceConnection;
 
 /**
  * Class AdvancedPricing
@@ -68,8 +67,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
         ValidatorInterface::ERROR_INVALID_TIER_PRICE_TYPE => 'Value for \'tier_price_value_type\' ' .
             'attribute contains incorrect value, acceptable values are Fixed, Discount',
         ValidatorInterface::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete',
-        ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL =>
-            'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format',
+        ValidatorInterface::ERROR_INVALID_ATTRIBUTE_DECIMAL
+            => 'Value for \'%s\' attribute contains incorrect value, acceptable values are in decimal format',
     ];
 
     /**

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

@@ -6,7 +6,7 @@
 namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
 
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
-use \Magento\Framework\Validator\AbstractValidator;
+use Magento\Framework\Validator\AbstractValidator;
 
 class Validator extends AbstractValidator implements RowValidatorInterface
 {

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

@@ -6,8 +6,8 @@
 namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
 
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
-use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
 
 class Website extends AbstractImportValidator implements RowValidatorInterface
 {
@@ -85,6 +85,7 @@ public function isValid($value)
      */
     public function getAllWebsitesValue()
     {
-        return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']';
+        return AdvancedPricing::VALUE_ALL_WEBSITES
+            . ' [' . $this->websiteModel->getBaseCurrency()->getCurrencyCode() . ']';
     }
 }

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

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Export;
 
-use \Magento\Store\Model\Store;
+use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD)

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

@@ -6,7 +6,7 @@
 
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator;
 
-use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
 
 /**
  * @SuppressWarnings(PHPMD)

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

@@ -6,7 +6,7 @@
 
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator;
 
-use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
 
 /**
  * Class TierPriceTypeTest.

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

@@ -5,8 +5,8 @@
  */
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing;
 
-use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator as Validator;
-use \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator as Validator;
+use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
 
 class ValidatorTest extends \PHPUnit_Framework_TestCase
 {

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

@@ -6,9 +6,9 @@
 
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import;
 
-use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
-use \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
-use \Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
+use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
+use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
 
 /**
  * @SuppressWarnings(PHPMD)

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

@@ -6,7 +6,7 @@
 
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Indexer\Product\Price\Plugin;
 
-use \Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import as Import;
+use Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin\Import as Import;
 
 class ImportTest extends \PHPUnit_Framework_TestCase
 {

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

@@ -7,9 +7,9 @@
 
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
 use Magento\Analytics\Model\Connector;
-use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
 
 /**
  * Class SignUp

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

@@ -7,9 +7,9 @@
 
 use Magento\Analytics\Model\Connector;
 use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
-use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
 
 /**
  * Class Update

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

@@ -5,9 +5,9 @@
  */
 namespace Magento\Analytics\Model\Condition;
 
-use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
 use Magento\Analytics\Model\NotificationTime;
 use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
 
 /**
  * Class CanViewNotification

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

@@ -6,9 +6,9 @@
 namespace Magento\Analytics\Model\Connector\Http\Client;
 
 use Magento\Analytics\Model\Connector\Http\ConverterInterface;
-use Psr\Log\LoggerInterface;
-use Magento\Framework\HTTP\Adapter\CurlFactory;
 use Magento\Analytics\Model\Connector\Http\ResponseFactory;
+use Magento\Framework\HTTP\Adapter\CurlFactory;
+use Psr\Log\LoggerInterface;
 
 /**
  * A CURL HTTP client.

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

@@ -6,11 +6,11 @@
 namespace Magento\Analytics\Model\Connector;
 
 use Magento\Analytics\Model\AnalyticsToken;
-use Magento\Framework\HTTP\ZendClient;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
 use Magento\Config\Model\Config;
-use Psr\Log\LoggerInterface;
+use Magento\Framework\HTTP\ZendClient;
 use Magento\Store\Model\Store;
-use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Psr\Log\LoggerInterface;
 
 /**
  * Command notifies MBI about that data collection was finished.

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

@@ -19,7 +19,7 @@ class ReSignUp implements ResponseHandlerInterface
      * @var AnalyticsToken
      */
     private $analyticsToken;
-    
+
     /**
      * @var SubscriptionHandler
      */

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

@@ -9,9 +9,9 @@
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
 use Magento\Analytics\Model\IntegrationManager;
 use Magento\Config\Model\Config;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class SignUpCommand

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

@@ -6,11 +6,11 @@
 
 namespace Magento\Analytics\Model;
 
+use Magento\Config\Model\Config as SystemConfig;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Integration\Api\IntegrationServiceInterface;
-use Magento\Config\Model\Config as SystemConfig;
-use Magento\Integration\Model\Integration;
 use Magento\Integration\Api\OauthServiceInterface;
+use Magento\Integration\Model\Integration;
 
 /**
  * Class IntegrationManager

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

@@ -6,8 +6,8 @@
 namespace Magento\Analytics\Model\Plugin;
 
 use Magento\Analytics\Model\SubscriptionStatusProvider;
-use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
 
 /**
  * Class BaseUrlConfigPlugin

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

@@ -7,8 +7,8 @@
 namespace Magento\Analytics\ReportXml;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class ConnectionFactory